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 B160326158B for ; Sat, 5 Sep 2026 21:43:35 +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=1788644616; cv=none; b=Spq6Fpe1ix7aoA6i4dUyMSP7O/akEmlZNQ+Tt/2M05/pLS0lVEQ8kUWYP81Lg/5xzKdtEoosY+C2sSC2Ckj9m0r7/C/gAeG6ZPusHwSAo1r53AV2MbuIgV3AugjwsAQk52Mc+ujMfztih2P7MGqXdSFXOlSLTMPVBf6/5HlijwU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788644616; c=relaxed/simple; bh=dOlqVYQrLGyIg7AO3ngS2hN6q5KpFPdX6NH82MpyhL0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pl4FjRj8/4crfJadzrKYXDDSgbhjDuqgU4kA0rgQ9iA3mnBmp/+P2gS6gbkV6glT2P3oNpo6IXc7rfLfxzAf6OeNQy1Na88hOUwKzM2zvCYD388uohh3DrkqJG6X4UM7mWs1sVgEnLo4C0MpXdYEfHzwkCr343ed9entjx0gdLE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iYVeze9T; 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="iYVeze9T" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 171531F00A3F; Sat, 5 Sep 2026 21:43:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788644615; bh=mL4soKRg+7pGGuS9mSUkoTSXklSxwIkDjCkZfN4HIP8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iYVeze9TfsJHv1T1aM1VNbXuHk+XKn+d3uSZaTmQ1dML1jEq04IFXvd7/WrzTHFct aP2H9lfDqtmBNWEVZnzpjA5wFYbFuZw/Ya/IuNtVFt+rCakhHu1OhafUD1AcSFdrqq 67xETzbfXnESHvqKcsygTHCmktOtEr5O05ZHA87uHkx8omLCLyUtdp1L/piJ41wUDY UlNPNsdG/bIouLrF/WRocgLCF6cGX0n38VetH8ndrEASMgy+hjxbgcMVUrr7fjDG/3 ZJ6FfUTYuvPc/C2hXE01aTcGaRcqMJnXPp9X1yvlkXemeJxeToyeHTOIBqFMld7/Ze lr0Qss4BJAVNA== From: Sasha Levin To: stable@vger.kernel.org Cc: Jeff Layton , Chuck Lever , Sasha Levin Subject: [PATCH 6.1.y 2/7] nfsd: lift NFSv4.0 handling out of nfsd4_cb_sequence_done() Date: Sat, 5 Sep 2026 17:43:27 -0400 Message-ID: <20260905214332.701369-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260905214332.701369-1-sashal@kernel.org> References: <2026090302-gulf-kilometer-60be@gregkh> <20260905214332.701369-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jeff Layton [ Upstream commit 6c1cefb84b3dee08e94b6908617f23f3fcc045e9 ] It's a bit strange to call nfsd4_cb_sequence_done() on a callback with no CB_SEQUENCE. Lift the handling of restarting a call into a new helper, and move the handling of NFSv4.0 into nfsd4_cb_done(). Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever Stable-dep-of: 01c5d5f58a5d ("nfsd: RCU-protect cl_cb_session to fix use-after-free on session teardown") Signed-off-by: Sasha Levin --- fs/nfsd/nfs4callback.c | 51 ++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index f9c28ba1d986b..7333068371c14 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -914,6 +914,16 @@ static bool nfsd4_queue_cb(struct nfsd4_callback *cb) return queue_work(callback_wq, &cb->cb_work); } +static void nfsd4_requeue_cb(struct rpc_task *task, struct nfsd4_callback *cb) +{ + struct nfs4_client *clp = cb->cb_clp; + + if (!test_bit(NFSD4_CLIENT_CB_KILL, &clp->cl_flags)) { + task->tk_status = 0; + cb->cb_need_restart = true; + } +} + static void nfsd41_cb_inflight_begin(struct nfs4_client *clp) { atomic_inc(&clp->cl_cb_inflight); @@ -1160,26 +1170,9 @@ static void nfsd4_cb_prepare(struct rpc_task *task, void *calldata) /* Returns true if CB_COMPOUND processing should continue */ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback *cb) { - struct nfs4_client *clp = cb->cb_clp; - struct nfsd4_session *session = clp->cl_cb_session; + struct nfsd4_session *session = cb->cb_clp->cl_cb_session; bool ret = false; - if (!clp->cl_minorversion) { - /* - * If the backchannel connection was shut down while this - * task was queued, we need to resubmit it after setting up - * a new backchannel connection. - * - * Note that if we lost our callback connection permanently - * the submission code will error out, so we don't need to - * handle that case here. - */ - if (RPC_SIGNALLED(task)) - goto requeue; - - return true; - } - if (!cb->cb_holds_slot) goto requeue; @@ -1224,7 +1217,7 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback nfsd41_cb_release_slot(cb); dprintk("%s: freed slot, new seqid=%d\n", __func__, - clp->cl_cb_session->se_cb_seq_nr); + session->se_cb_seq_nr); if (RPC_SIGNALLED(task)) goto requeue; @@ -1234,10 +1227,7 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback rpc_restart_call_prepare(task); goto out; requeue: - if (!test_bit(NFSD4_CLIENT_CB_KILL, &clp->cl_flags)) { - task->tk_status = 0; - cb->cb_need_restart = true; - } + nfsd4_requeue_cb(task, cb); return false; } @@ -1246,8 +1236,21 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata) struct nfsd4_callback *cb = calldata; struct nfs4_client *clp = cb->cb_clp; - if (!nfsd4_cb_sequence_done(task, cb)) + if (!clp->cl_minorversion) { + /* + * If the backchannel connection was shut down while this + * task was queued, we need to resubmit it after setting up + * a new backchannel connection. + * + * Note that if we lost our callback connection permanently + * the submission code will error out, so we don't need to + * handle that case here. + */ + if (RPC_SIGNALLED(task)) + nfsd4_requeue_cb(task, cb); + } else if (!nfsd4_cb_sequence_done(task, cb)) { return; + } if (cb->cb_status) { WARN_ON_ONCE(task->tk_status); -- 2.53.0