Skip to content

Commit 661f09d

Browse files
chucklevergregkh
authored andcommitted
NFSD: Skip sending CB_RECALL_ANY when the backchannel isn't up
commit 8a388c1 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: 44df6f4 ("NFSD: add delegation reaper to react to low memory condition") Reviewed-by: Jeff Layton <jlayton@kernel.org> Cc: stable@vger.kernel.org Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9a81cde commit 661f09d

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

fs/nfsd/nfs4state.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6289,14 +6289,19 @@ deleg_reaper(struct nfsd_net *nn)
62896289
spin_lock(&nn->client_lock);
62906290
list_for_each_safe(pos, next, &nn->client_lru) {
62916291
clp = list_entry(pos, struct nfs4_client, cl_lru);
6292-
if (clp->cl_state != NFSD4_ACTIVE ||
6293-
list_empty(&clp->cl_delegations) ||
6294-
atomic_read(&clp->cl_delegs_in_recall) ||
6295-
test_bit(NFSD4_CLIENT_CB_RECALL_ANY, &clp->cl_flags) ||
6296-
(ktime_get_boottime_seconds() -
6297-
clp->cl_ra_time < 5)) {
6292+
6293+
if (clp->cl_state != NFSD4_ACTIVE)
6294+
continue;
6295+
if (list_empty(&clp->cl_delegations))
6296+
continue;
6297+
if (atomic_read(&clp->cl_delegs_in_recall))
6298+
continue;
6299+
if (test_bit(NFSD4_CLIENT_CB_RECALL_ANY, &clp->cl_flags))
6300+
continue;
6301+
if (ktime_get_boottime_seconds() - clp->cl_ra_time < 5)
6302+
continue;
6303+
if (clp->cl_cb_state != NFSD4_CB_UP)
62986304
continue;
6299-
}
63006305
list_add(&clp->cl_ra_cblist, &cblist);
63016306

63026307
/* release in nfsd4_cb_recall_any_release */

0 commit comments

Comments
 (0)