Received-SPF: pass (google.com: domain of linux-nfs+bounces-2910-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
MIME-Version: 1.0
From: "NeilBrown" <neilb@suse.de>
To: Chuck Lever <chuck.lever@oracle.com>, Jeff Layton <jlayton@kernel.org>,
 Olga Kornievskaia <kolga@netapp.com>, Dai Ngo <Dai.Ngo@oracle.com>,
 Tom Talpey <tom@talpey.com>
Cc: Petr Vorel <pvorel@suse.cz>, linux-nfs@vger.kernel.org
Date: Mon, 22 Apr 2024 12:09:19 +1000
Subject:
 [PATCH] nfsd: don't fail OP_SETCLIENTID when there are lots of clients.
Message-id: <171375175915.7600.6526208866216039031@noble.neil.brown.name>


The calculation of how many clients the nfs server can manage is only an
heuristic.  Triggering the laundromat to clean up old clients when we
have more than the heuristic limit is valid, but refusing to create new
clients is not.  Client creation should only fail if there really isn't
enough memory available.

This is not known to have caused a problem is production use, but
testing of lots of clients reports an error and it is not clear that
this error is justified.

Signed-off-by: NeilBrown <neilb@suse.de>
---
 fs/nfsd/nfs4state.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index daf83823ba48..8a40bb6a4a67 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2223,10 +2223,9 @@ static struct nfs4_client *alloc_client(struct xdr_net=
obj name,
 	struct nfs4_client *clp;
 	int i;
=20
-	if (atomic_read(&nn->nfs4_client_count) >=3D nn->nfs4_max_clients) {
+	if (atomic_read(&nn->nfs4_client_count) >=3D nn->nfs4_max_clients)
 		mod_delayed_work(laundry_wq, &nn->laundromat_work, 0);
-		return NULL;
-	}
+
 	clp =3D kmem_cache_zalloc(client_slab, GFP_KERNEL);
 	if (clp =3D=3D NULL)
 		return NULL;
--=20
2.44.0