From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D6ED4F7998; Tue, 9 Jun 2026 17:48:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781027297; cv=none; b=AX6t7LcXczmStqtRN7DTAZ0P97p0dUPpz2WVWH4HgYYdwCo5u6QxD8mRd/nm4hUgozGl2IwwGtJYkgIU7cgL2zvRRLAwHaYT2ORcF7Ku+AvWT4VmhnQavF2qe5UdBOiIhGPjHwosjWMoePk8Jt2GbKLVKB/sKO7kAcjgTv8zEok= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781027297; c=relaxed/simple; bh=837ntEQAfNm8vgCsD7lCToH/PeBWJVyRMgHmiH3X4lM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=skd6ZlzTCCpEELr1jbeOT87Dn0CYuJik9jz+bLdj5GFANNA89a7BNj9K4xtHIyFkkiktKfYOqswsfNgSst5m3dz4wcJfnNJ43MyKRHuvHyEYqx+Oo3ce8GtF+m7j1ggjWvUBjaH8mU7Fzbgn6e/23cGF4TaCY/DkipR2U6HlQYI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ed5qqzTk; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ed5qqzTk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47C4F1F00893; Tue, 9 Jun 2026 17:48:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781027296; bh=z2MG07CGdbK8RrBt2Dmld4oo4PTUdCYx+6jkKRUpyus=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=ed5qqzTkxufcJ1ADfIyxzxrXXDJQny9qKUfHOqayoQk3uGtAOo7I+rBKkvP21Vq/o LL5gnmlqKUjY6UYBrbrvXAyJumWvo8JTlYZt9lwWnRZvKT3C+NHw8ubvmSrpjl92Q9 oJ2O5a2NURt052m5c8heHCSDErgGBncmSF5O0LleFO7oILmnYfRGl/PAk9b8SZt4MK wQEDK/0kHoLmuK996kIhQb/mXS4QmIE9KmJilm/C+jHoPY1e2kdARKhkv3XmvY08D6 RJkL6FgqflMokcggnkeBnpKWuSD6OgevDpr34R0NEx8bLow671T5zgMLVAZnK4XzsR e3fXfylxj5J9Q== From: Jeff Layton Date: Tue, 09 Jun 2026 13:47:36 -0400 Subject: [PATCH 15/19] nfsd: reject reclaim LOCK after RECLAIM_COMPLETE Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260609-nfsd-testing-v1-15-e83acead2ae8@kernel.org> References: <20260609-nfsd-testing-v1-0-e83acead2ae8@kernel.org> In-Reply-To: <20260609-nfsd-testing-v1-0-e83acead2ae8@kernel.org> To: Trond Myklebust , Anna Schumaker , Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Christian Brauner , Benjamin Coddington , Donald Hunter , Lorenzo Bianconi , Qi Zheng , Andrew Morton , Muchun Song Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1341; i=jlayton@kernel.org; h=from:subject:message-id; bh=837ntEQAfNm8vgCsD7lCToH/PeBWJVyRMgHmiH3X4lM=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqKFG8DWvynzKWOTPC9eUtMYP3ufwu6C+uTicXD WYJwut/DXaJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaihRvAAKCRAADmhBGVaC FaMYD/4wUfRmlnO0ClfBqvSXJH/giZDYnMhJ6I4OQtz3vu84GWIHYDi+p+x0vI3x7sbkPkpU3ql a0MR75h8lLbm3LiDgNu92w1cIdCxlalOsc2mI4/oy9oc3BGa9iS5zfvJjF28fzQNe2tVVGJHHb0 x8oWUuGPfsz98MSMB8IT4RWhM5WSJ4l8+0W9py3saOSRoL2ORa62t2OvFWtVNnSP8LtvSPHm0iU E83Qiyy4M0D6kqN5v3NXCLuDJ00MSOKLqKUanmyavHweToA+7F+1LI8claqk4mqgAfzzymMdeyt HTOKoSMa1yu/cI6RwbOJnkXD5QIJxrmBfi0c/mv2IIAgO5Z5sMsvEKplZ5T/wOqUCy/zFHQBBZQ XG1O04Gi5Oa3Uwis7B/kGhgVHB/fQM9FRf6QDDLnfVLk49A5rCBNS2hSDt6opVPBDXbK8l/e4Ii ButzWb51UnRu5hhAshSJSHkkpstr3+CrMECTBBtAge2wRiDzY2DlNa+qyBvR3PUJNUsIpsI23/Z N1IHCNsAT8tA0DBYIp2qZ2OJIAHWfK0C4TtXm26/lz/YLTm88oV5HaTFD07o+Uvjn3+kWuzfJ9E PXbLqUl9WuqaUpNQ04T5M07J2CAotM9rw/CRFZ9G05xHH9dGqpGchFyhBu89siekHpbvRZdaZU7 cCGajoJi1dvTt3A== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 nfsd4_lock() only checks the namespace-wide grace flag when deciding whether to accept a reclaim LOCK. It does not check the per-client NFSD4_CLIENT_RECLAIM_COMPLETE bit. A NFSv4.1+ client that has already sent RECLAIM_COMPLETE can submit lk_reclaim=1 while grace is still active (e.g. lockd holds the grace list open), and the server accepts it instead of returning NFS4ERR_NO_GRACE as required by RFC 8881 section 8.4.2.1. The OPEN path already has the correct two-tier guard via nfs4_check_open_reclaim(). Add the equivalent check to the LOCK path. Fixes: 3b3e7b72239a ("nfsd: reject reclaim request when client has already sent RECLAIM_COMPLETE") Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index fddef6f8db7c..7d96bffd2fd5 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -8552,6 +8552,9 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, status = nfserr_no_grace; if (!locks_in_grace(net) && lock->lk_reclaim) goto out; + if (lock->lk_reclaim && + test_bit(NFSD4_CLIENT_RECLAIM_COMPLETE, &cstate->clp->cl_flags)) + goto out; if (lock->lk_reclaim) flags |= FL_RECLAIM; -- 2.54.0