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 6CB5D38C2A7 for ; Sat, 5 Sep 2026 14:01:22 +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=1788616891; cv=none; b=V+phTO16bxdVe4ndKnPIUgyIsYLYM3/dpjAlAyRfkSd+y4SVesB+Thag8z6bdtzmKRimi9c4yHQm7an7mdznSOrE2KFyMQJBfl+mi+XkunpPm7iGD/e/qK3dlfSDY0iVy/KiAmla2HAk/GMH3RtyYaEHnZsYh03D5CPxXcrwbfY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788616891; c=relaxed/simple; bh=HqFsjpG1XMYQgE4KeoUuieWtBYPIZf+AAkuwDkmmD1A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Lt2bUs1St/MXuBEqpAINuZ1445Mhk08dFwMO5egMtrx7vxOTb9EdOWKztyk9rzYm1+KJTiI+hAsHxEfErm8gzWwcGPfW17ON6ZhqZnHVACS2wmFO/VwAByV2YgsRY7XfMF26/bGu70k6qvHMdYtxu6Fgy+C0FpzNP63KX2khmwo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AAgxAE6i; 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="AAgxAE6i" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D005A1F00A3D; Sat, 5 Sep 2026 14:01:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788616878; bh=gKqLCkAzCXpJRcVl1CFUaoRNjySV8rkWDNMHGG6d2Us=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AAgxAE6iKbMdIeiri4lVMntXdcETILjGNIba/Y0pbOf4QUlOMVYHOUNModTtEL1Fw H94y3sJlNOnWpYbcQfrY5N5Hj2ZDD5HP+RpfN9OM1vnqRVoh67/4qOj8n+s2EZuuAE PFl1UPD3I6+gDxmUgK2u0bFegfN/iIba9lEhkyV3T1pLQ9bYND9pJWRUpEZNn+kEqc xUsOB0/JfzmegMZnzHzWuGzXPSG+cKFPO6/P2S0QeKExH/52S6b4veb9VcOQVreb80 blrMf38+4h1yamoLjhISPcihd03IASt6y9uk+1ln3r5h8pTiw6w5AQVkFh+0btvyoL LaKQoXbDo/w9g== From: Sasha Levin To: stable@vger.kernel.org Cc: Jeff Layton , Chuck Lever , Sasha Levin Subject: [PATCH 6.1.y] nfsd: fix clock domain mismatch in clients_still_reclaiming() Date: Sat, 5 Sep 2026 10:01:15 -0400 Message-ID: <20260905140115.122085-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026090315-napping-explicit-71f2@gregkh> References: <2026090315-napping-explicit-71f2@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Jeff Layton [ Upstream commit 09ea3eb9a518565f5bca386e81b993ed8825f5e8 ] 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") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Jeff Layton Link: https://patch.msgid.link/20260611-nfsd-testing-v2-12-5b90e276f2d9@kernel.org Signed-off-by: Chuck Lever [ preserved the branch’s boolean fields instead of the upstream flags bitmap ] Signed-off-by: Sasha Levin --- 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 be0c8f1ce4e3e..b95ad49800533 100644 --- a/fs/nfsd/netns.h +++ b/fs/nfsd/netns.h @@ -67,6 +67,7 @@ struct nfsd_net { bool grace_end_forced; bool client_tracking_active; 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 f390716ce3ffe..22fc5434f2561 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5948,7 +5948,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 (READ_ONCE(nn->grace_end_forced)) @@ -8175,6 +8175,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(); nn->grace_ended = false; nn->grace_end_forced = false; nn->client_tracking_active = false; -- 2.53.0