Skip to content

Commit 14a6b65

Browse files
chucklevergregkh
authored andcommitted
NFSD: Skip sending CB_RECALL_ANY when the backchannel isn't up
commit 8a388c1fabeb6606e16467b23242416c0dbeffad upstream. 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: 44df6f439a17 ("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]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d96587c commit 14a6b65

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
@@ -6247,14 +6247,19 @@ deleg_reaper(struct nfsd_net *nn)
62476247
spin_lock(&nn->client_lock);
62486248
list_for_each_safe(pos, next, &nn->client_lru) {
62496249
clp = list_entry(pos, struct nfs4_client, cl_lru);
6250-
if (clp->cl_state != NFSD4_ACTIVE ||
6251-
list_empty(&clp->cl_delegations) ||
6252-
atomic_read(&clp->cl_delegs_in_recall) ||
6253-
test_bit(NFSD4_CLIENT_CB_RECALL_ANY, &clp->cl_flags) ||
6254-
(ktime_get_boottime_seconds() -
6255-
clp->cl_ra_time < 5)) {
6250+
6251+
if (clp->cl_state != NFSD4_ACTIVE)
6252+
continue;
6253+
if (list_empty(&clp->cl_delegations))
6254+
continue;
6255+
if (atomic_read(&clp->cl_delegs_in_recall))
6256+
continue;
6257+
if (test_bit(NFSD4_CLIENT_CB_RECALL_ANY, &clp->cl_flags))
6258+
continue;
6259+
if (ktime_get_boottime_seconds() - clp->cl_ra_time < 5)
6260+
continue;
6261+
if (clp->cl_cb_state != NFSD4_CB_UP)
62566262
continue;
6257-
}
62586263
list_add(&clp->cl_ra_cblist, &cblist);
62596264

62606265
/* release in nfsd4_cb_recall_any_release */

0 commit comments

Comments
 (0)