Skip to content

Commit 8a388c1

Browse files
committed
NFSD: Skip sending CB_RECALL_ANY when the backchannel isn't up
NFSD sends CB_RECALL_ANY to clients when the server is low on memory or that client has a large number of delegations outstanding. We've seen cases where NFSD attempts to send CB_RECALL_ANY requests to disconnected clients, and gets confused. These calls never go anywhere if a backchannel transport to the target client isn't available. Before the server can send any backchannel operation, the client has to connect first and then do a BIND_CONN_TO_SESSION. This patch doesn't address the root cause of the confusion, but there's no need to queue up these optional operations if they can't go anywhere. Fixes: 44df6f4 ("NFSD: add delegation reaper to react to low memory condition") Reviewed-by: Jeff Layton <[email protected]> Cc: [email protected] Signed-off-by: Chuck Lever <[email protected]>
1 parent 45de52d commit 8a388c1

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

fs/nfsd/nfs4state.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6861,14 +6861,19 @@ deleg_reaper(struct nfsd_net *nn)
68616861
spin_lock(&nn->client_lock);
68626862
list_for_each_safe(pos, next, &nn->client_lru) {
68636863
clp = list_entry(pos, struct nfs4_client, cl_lru);
6864-
if (clp->cl_state != NFSD4_ACTIVE ||
6865-
list_empty(&clp->cl_delegations) ||
6866-
atomic_read(&clp->cl_delegs_in_recall) ||
6867-
test_bit(NFSD4_CLIENT_CB_RECALL_ANY, &clp->cl_flags) ||
6868-
(ktime_get_boottime_seconds() -
6869-
clp->cl_ra_time < 5)) {
6864+
6865+
if (clp->cl_state != NFSD4_ACTIVE)
6866+
continue;
6867+
if (list_empty(&clp->cl_delegations))
6868+
continue;
6869+
if (atomic_read(&clp->cl_delegs_in_recall))
6870+
continue;
6871+
if (test_bit(NFSD4_CLIENT_CB_RECALL_ANY, &clp->cl_flags))
6872+
continue;
6873+
if (ktime_get_boottime_seconds() - clp->cl_ra_time < 5)
6874+
continue;
6875+
if (clp->cl_cb_state != NFSD4_CB_UP)
68706876
continue;
6871-
}
68726877
list_add(&clp->cl_ra_cblist, &cblist);
68736878

68746879
/* release in nfsd4_cb_recall_any_release */

0 commit comments

Comments
 (0)