Linux NFS development
 help / color / mirror / Atom feed
From: Jeff Layton <jlayton@kernel.org>
To: Chuck Lever <cel@kernel.org>, NeilBrown <neil@brown.name>,
	 Olga Kornievskaia <okorniev@redhat.com>,
	Dai Ngo <Dai.Ngo@oracle.com>,  Tom Talpey <tom@talpey.com>
Cc: Chris Mason <clm@meta.com>,
	linux-nfs@vger.kernel.org,  linux-kernel@vger.kernel.org,
	Jeff Layton <jlayton@kernel.org>
Subject: [PATCH v2 12/21] nfsd: fix clock domain mismatch in clients_still_reclaiming()
Date: Thu, 11 Jun 2026 16:00:55 -0400	[thread overview]
Message-ID: <20260611-nfsd-testing-v2-12-5b90e276f2d9@kernel.org> (raw)
In-Reply-To: <20260611-nfsd-testing-v2-0-5b90e276f2d9@kernel.org>

clients_still_reclaiming() computes a deadline from nn->boot_time
(CLOCK_REALTIME, ~1.7 billion) but compares it against
ktime_get_boottime_seconds() (CLOCK_BOOTTIME, seconds since boot).
The comparison is always false — it would take ~54 years of uptime
for BOOTTIME to exceed the REALTIME-derived deadline.

This means any client can hold the server in grace indefinitely by
sending CLAIM_PREVIOUS OPEN requests, blocking all non-reclaim
operations for all other clients.

Add boot_time_bt (CLOCK_BOOTTIME) alongside the existing boot_time
and use it for the deadline computation. boot_time (CLOCK_REALTIME)
is preserved for its cl_boot clientid-nonce role.

Fixes: 20b7d86f29d3 ("nfsd: use boottime for lease expiry calculation")
Assisted-by: Claude:claude-opus-4-8
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/nfsd/netns.h     | 1 +
 fs/nfsd/nfs4state.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index 5c33c96da28e..03724bef10a7 100644
--- a/fs/nfsd/netns.h
+++ b/fs/nfsd/netns.h
@@ -78,6 +78,7 @@ struct nfsd_net {
 	struct lock_manager nfsd4_manager;
 	unsigned long flags;
 	time64_t boot_time;
+	time64_t boot_time_bt;	/* same instant in CLOCK_BOOTTIME */
 
 	struct dentry *nfsd_client_dir;
 
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3dc0c0f6eb5d..17cb3b0ad956 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -6870,7 +6870,7 @@ bool nfsd4_force_end_grace(struct nfsd_net *nn)
  */
 static bool clients_still_reclaiming(struct nfsd_net *nn)
 {
-	time64_t double_grace_period_end = nn->boot_time +
+	time64_t double_grace_period_end = nn->boot_time_bt +
 					   2 * nn->nfsd4_lease;
 
 	if (test_bit(NFSD_NET_GRACE_END_FORCED, &nn->flags))
@@ -9245,6 +9245,7 @@ static int nfs4_state_create_net(struct net *net)
 	nn->conf_name_tree = RB_ROOT;
 	nn->unconf_name_tree = RB_ROOT;
 	nn->boot_time = ktime_get_real_seconds();
+	nn->boot_time_bt = ktime_get_boottime_seconds();
 	clear_bit(NFSD_NET_GRACE_ENDED, &nn->flags);
 	clear_bit(NFSD_NET_GRACE_END_FORCED, &nn->flags);
 	nn->nfsd4_manager.block_opens = true;

-- 
2.54.0


  parent reply	other threads:[~2026-06-11 20:01 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-11 20:00 [PATCH v2 00/21] nfsd: more bugfixes Jeff Layton
2026-06-11 20:00 ` [PATCH v2 01/21] nfsd: clear opcnt on compound arg release to prevent OOB read Jeff Layton
2026-06-11 20:00 ` [PATCH v2 02/21] nfsd: add missing read barrier to rpc_status_get dumpit seqcount retry Jeff Layton
2026-06-11 20:00 ` [PATCH v2 03/21] nfsd: fix netlink dumpit error handling for rpc_status_get Jeff Layton
2026-06-11 20:00 ` [PATCH v2 04/21] sunrpc: defer rq_argp and rq_resp free until after RCU grace period Jeff Layton
2026-06-11 20:00 ` [PATCH v2 05/21] nfsd: check nfsd4_acl_to_attr() return value in nfsd4_create() Jeff Layton
2026-06-11 20:00 ` [PATCH v2 06/21] nfsd: add filehandle match check to nfsd4_delegreturn() Jeff Layton
2026-06-11 20:00 ` [PATCH v2 07/21] nfsd: validate nseconds in TIME_DELEG decode paths Jeff Layton
2026-06-11 20:00 ` [PATCH v2 08/21] nfsd: remove premature NFS4_OO_CONFIRMED in CLAIM_PREVIOUS path Jeff Layton
2026-06-12 13:36   ` Jeff Layton
2026-06-11 20:00 ` [PATCH v2 09/21] nfsd: fix version mismatch loops in nfsd_acl_init_request() Jeff Layton
2026-06-11 20:00 ` [PATCH v2 10/21] nfsd: fix FL_SLEEP being set unconditionally for all LOCK types Jeff Layton
2026-06-11 20:00 ` [PATCH v2 11/21] nfsd: add fh_want_write() for early-verified SETATTR in nfsd_proc_setattr() Jeff Layton
2026-06-11 20:00 ` Jeff Layton [this message]
2026-06-11 20:00 ` [PATCH v2 13/21] nfsd: use test_and_clear_bit for somebody_reclaimed to prevent lost update Jeff Layton
2026-06-11 20:00 ` [PATCH v2 14/21] nfsd: reject reclaim LOCK after RECLAIM_COMPLETE Jeff Layton
2026-06-11 20:00 ` [PATCH v2 15/21] nfsd: validate sockaddr length per family in listener_set Jeff Layton
2026-06-12 13:37   ` Jeff Layton
2026-06-11 20:00 ` [PATCH v2 16/21] lockd, nfsd: RCU-protect nlmsvc_ops dispatch Jeff Layton
2026-06-11 20:01 ` [PATCH v2 17/21] nfsd: move nfsd_debugfs_init() after nfsd4_init_slabs() in init_nfsd() Jeff Layton
2026-06-11 20:01 ` [PATCH v2 18/21] nfsd: initialize DRC hash table before registering shrinker Jeff Layton
2026-06-11 20:01 ` [PATCH v2 19/21] nfsd: restore rq_status_counter to even on all nfsd_dispatch() exit paths Jeff Layton
2026-06-11 20:01 ` [PATCH v2 20/21] nfsd: reset thread skip index when advancing pools in rpc_status dumpit Jeff Layton
2026-06-11 20:01 ` [PATCH v2 21/21] nfsd: drop the stateid, not the stateowner, on seqid_op replay retry Jeff Layton
2026-06-13 20:30 ` [PATCH v2 00/21] nfsd: more bugfixes Chuck Lever

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260611-nfsd-testing-v2-12-5b90e276f2d9@kernel.org \
    --to=jlayton@kernel.org \
    --cc=Dai.Ngo@oracle.com \
    --cc=cel@kernel.org \
    --cc=clm@meta.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=neil@brown.name \
    --cc=okorniev@redhat.com \
    --cc=tom@talpey.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox