From patchwork Tue Feb 18 21:28:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13980902 X-Patchwork-Delegate: cel@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3AA011CF5E2; Tue, 18 Feb 2025 21:29:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739914151; cv=none; b=ZRKH8Y2aN6FRxSzPLlrFvP4+nP5OONEeaFABjkq3O5VGJDUa4O2hp4/gcAh7dQbfSEj3ScFyKO+RdWTSzJzQkf0yAatdbu7lgImgCSbnPBzzg82qqsdGRx+6UVfsY+p88Dx/JNXTyrDvvKqWRScx8DMbazr67CxA8kzWDDpc8Cg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739914151; c=relaxed/simple; bh=y6FpShoTcyq9TvI+wxI5f9fccNQwoEQ08LRQ2tXtJpI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=F4M3d6TzP9o4OH+b6jKNvFwaCqNmJypKgOgzAXCzLFo+YxLO+QW7RUTcOtXxQE6qh7ErwG3xlaGHOFyfL0sZ2D/tGgfFljZE6jjTuDmuQyd7/CI3dY1p+fa2EnFR7bTZUxK3NRNgQSXeRukoOlONVGWmjWo18rLdnxqsDX9Aq6I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Z6+jnler; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Z6+jnler" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16EA5C4CEE9; Tue, 18 Feb 2025 21:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739914149; bh=y6FpShoTcyq9TvI+wxI5f9fccNQwoEQ08LRQ2tXtJpI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Z6+jnler8xg+LCEkk0dCVT1PwRDkNwcV/ypBEkQxFOrpzG9GEWbpFuQeYlCD0WbYQ yHpnz7Ljp8XKLHdt+eWzNnkrvyVQ1a0IqmR7ck7wcgzNOSyNpZCA2K0rpOKQe6cLFD IJqTpx4BjOowwjiNg7WLUSICKUa6mDobfJpak1GFU4L8LvcgC3PU27P9CTY/SnP2Po y/y5S4J9ZYlIMcZStvH41mVNeljoBO4lrISSpm+qO+xSl/fkIcPnO4qZhMrNbAjFB9 jRsaNSot30wn2SRc+oziAkRW8RsWqaKyitjdzl3kRqg5qn+oLX3Ovy37xS1YNSFOLf BJNCj4UNu7GJQ== From: Jeff Layton Date: Tue, 18 Feb 2025 16:28:57 -0500 Subject: [PATCH 1/3] nfsd: prevent callback tasks running concurrently Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250218-nfsd-callback-v1-1-14f966967dd8@kernel.org> References: <20250218-nfsd-callback-v1-0-14f966967dd8@kernel.org> In-Reply-To: <20250218-nfsd-callback-v1-0-14f966967dd8@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: Li Lingfeng , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6167; i=jlayton@kernel.org; h=from:subject:message-id; bh=y6FpShoTcyq9TvI+wxI5f9fccNQwoEQ08LRQ2tXtJpI=; b=owEBbAKT/ZANAwAIAQAOaEEZVoIVAcsmYgBntPujHfuf7swQb87Vkt4Cr48VnZwcWLD2Sjsn3 QNX8kINcaeJAjIEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZ7T7owAKCRAADmhBGVaC FQfqD/dncMBobXt2LANC/IOufL8hlasSmBHlXVlI2/ZYXLdb+uEiyX13ZQrqe+ktu/+tH1OXzxr cY7chEgIghQm+GdPkCNJSnJMVBjqpW7TRFsV7gDnU9nNMM/E40FR/i/vb9AL+I4Wrdv69/lpLa3 zb0RxKL2AYMDruuKP0EIWRhfQ2ghiQzYbu6+wQXQUtOsuSvofVdQbwkcXFLmLyahTH2aou2GZxf y0RqmmJPiR5elFTmpL8aRgMlddrZZ6zNtGYrg+OjPEoNMe7deCMXX2MzULLV/wuqO1fhoQ9THVh Cb6fbYG74ddndMqRvfSPPvCMOs1VzFCf6evSdAQhU7IPloqo+/i6kurEanvmGsrdm8IIaeSZCzD 5vnapZLdEcChyx4f/6Jar2wUmfG+HW1GRFSt7idUF3XosZy+hfldnV8Y/+BVKG13s6gK6j+Nx7Q IP+ssZK7FMbLTmdr13NuW7WdB9l9E7v2zmMcn+/WnRsWJPKCzpajgyjZNw2ZBTdkwELMwVGkC4C Ow+SNCu12QKeLUSzCBGym0gj/G+A9WlpiS+KS5rntNskFln/xDNNK/AkkPa9l3k/CNF5TCLUF7U 0OIQzv3H0s1z45um+i9Zafg5cKmxl+lha+ZiPmw7q8j0AgXQugDiRLlm4R5zXd0pBpJhV1Rd4NE O615Rh0TbMYSH X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 The nfsd4_callback workqueue jobs exist to queue backchannel RPCs to rpciod. Because they run in different workqueue contexts, the rpc_task can run concurrently with the workqueue job itself, should it become requeued. This is problematic as there is no locking when accessing the fields in the nfsd4_callback. Add a new unsigned long to nfsd4_callback and declare a new NFSD4_CALLBACK_RUNNING flag to be set in it. When attempting to run a workqueue job, do a test_and_set_bit() on that flag first, and don't queue the workqueue job if it returns true. Clear NFSD4_CALLBACK_RUNNING in nfsd41_destroy_cb(). This also gives us a more reliable mechanism for handling queueing failures in codepaths where we have to take references under spinlocks. We can now do the test_and_set_bit on NFSD4_CALLBACK_RUNNING first, and only take references to the objects if that returns false. Most of the nfsd4_run_cb() callers are converted to use this new flag or the nfsd4_try_run_cb() wrapper. The main exception is the callback channel probe, which has its own synchronization. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4callback.c | 2 ++ fs/nfsd/nfs4layouts.c | 7 ++++--- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4state.c | 14 ++++++++++---- fs/nfsd/state.h | 9 +++++++++ 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index ae4b7b6df47ff054db197bd2f6083905e4149bee..1f26c811e5f73c2e745ee68d0b6e668d1dd7c704 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -1312,6 +1312,7 @@ static void nfsd41_destroy_cb(struct nfsd4_callback *cb) trace_nfsd_cb_destroy(clp, cb); nfsd41_cb_release_slot(cb); + clear_bit(NFSD4_CALLBACK_RUNNING, &cb->cb_flags); if (cb->cb_ops && cb->cb_ops->release) cb->cb_ops->release(cb); nfsd41_cb_inflight_end(clp); @@ -1632,6 +1633,7 @@ void nfsd4_init_cb(struct nfsd4_callback *cb, struct nfs4_client *clp, cb->cb_msg.rpc_proc = &nfs4_cb_procedures[op]; cb->cb_msg.rpc_argp = cb; cb->cb_msg.rpc_resp = cb; + cb->cb_flags = 0; cb->cb_ops = ops; INIT_WORK(&cb->cb_work, nfsd4_run_cb_work); cb->cb_status = 0; diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index fbfddd3c4c943c34aa3991328eacb5759e311cc4..290271ac424540e4405a5fd0eacc8db9f47603cd 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -344,9 +344,10 @@ nfsd4_recall_file_layout(struct nfs4_layout_stateid *ls) atomic_inc(&ls->ls_stid.sc_file->fi_lo_recalls); trace_nfsd_layout_recall(&ls->ls_stid.sc_stateid); - refcount_inc(&ls->ls_stid.sc_count); - nfsd4_run_cb(&ls->ls_recall); - + if (!test_and_set_bit(NFSD4_CALLBACK_RUNNING, &ls->ls_recall.cb_flags)) { + refcount_inc(&ls->ls_stid.sc_count); + nfsd4_run_cb(&ls->ls_recall); + } out_unlock: spin_unlock(&ls->ls_lock); } diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index f6e06c779d09dacdcea81fb3b4135bf600f6cc63..b397246dae7b7e8c2a0ba436bb3813213cfe4fa2 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1847,7 +1847,7 @@ static void nfsd4_send_cb_offload(struct nfsd4_copy *copy) NFSPROC4_CLNT_CB_OFFLOAD); trace_nfsd_cb_offload(copy->cp_clp, &cbo->co_res.cb_stateid, &cbo->co_fh, copy->cp_count, copy->nfserr); - nfsd4_run_cb(&cbo->co_cb); + nfsd4_try_run_cb(&cbo->co_cb); } /** diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index e806fd97cca972559d1929d37c1a24e760d9d6d8..fabcd979c40695ebcc795cfd2d8a035b7d589a37 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3232,8 +3232,10 @@ static void nfs4_cb_getattr(struct nfs4_cb_fattr *ncf) /* set to proper status when nfsd4_cb_getattr_done runs */ ncf->ncf_cb_status = NFS4ERR_IO; - refcount_inc(&dp->dl_stid.sc_count); - nfsd4_run_cb(&ncf->ncf_getattr); + if (!test_and_set_bit(NFSD4_CALLBACK_RUNNING, &ncf->ncf_getattr.cb_flags)) { + refcount_inc(&dp->dl_stid.sc_count); + nfsd4_run_cb(&ncf->ncf_getattr); + } } static struct nfs4_client *create_client(struct xdr_netobj name, @@ -5422,6 +5424,10 @@ static const struct nfsd4_callback_ops nfsd4_cb_recall_ops = { static void nfsd_break_one_deleg(struct nfs4_delegation *dp) { bool queued; + + if (test_and_set_bit(NFSD4_CALLBACK_RUNNING, &dp->dl_recall.cb_flags)) + return; + /* * We're assuming the state code never drops its reference * without first removing the lease. Since we're in this lease @@ -6910,7 +6916,7 @@ deleg_reaper(struct nfsd_net *nn) clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG) | BIT(RCA4_TYPE_MASK_WDATA_DLG); trace_nfsd_cb_recall_any(clp->cl_ra); - nfsd4_run_cb(&clp->cl_ra->ra_cb); + nfsd4_try_run_cb(&clp->cl_ra->ra_cb); } } @@ -7839,7 +7845,7 @@ nfsd4_lm_notify(struct file_lock *fl) if (queue) { trace_nfsd_cb_notify_lock(lo, nbl); - nfsd4_run_cb(&nbl->nbl_cb); + nfsd4_try_run_cb(&nbl->nbl_cb); } } diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 74d2d7b42676d907bec9159b927aeed223d668c3..dc7105e685b8057ca4e2fcc5ceb85754e96981a2 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -67,6 +67,8 @@ typedef struct { struct nfsd4_callback { struct nfs4_client *cb_clp; struct rpc_message cb_msg; +#define NFSD4_CALLBACK_RUNNING BIT(0) + unsigned long cb_flags; const struct nfsd4_callback_ops *cb_ops; struct work_struct cb_work; int cb_seq_status; @@ -780,6 +782,13 @@ extern void nfsd4_change_callback(struct nfs4_client *clp, struct nfs4_cb_conn * extern void nfsd4_init_cb(struct nfsd4_callback *cb, struct nfs4_client *clp, const struct nfsd4_callback_ops *ops, enum nfsd4_cb_op op); extern bool nfsd4_run_cb(struct nfsd4_callback *cb); + +static inline void nfsd4_try_run_cb(struct nfsd4_callback *cb) +{ + if (!test_and_set_bit(NFSD4_CALLBACK_RUNNING, &cb->cb_flags)) + WARN_ON_ONCE(!nfsd4_run_cb(cb)); +} + extern void nfsd4_shutdown_callback(struct nfs4_client *); extern void nfsd4_shutdown_copy(struct nfs4_client *clp); void nfsd4_async_copy_reaper(struct nfsd_net *nn); From patchwork Tue Feb 18 21:28:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13980901 X-Patchwork-Delegate: cel@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3AA601D0F5A; Tue, 18 Feb 2025 21:29:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739914151; cv=none; b=E+w8w+ub7dv8a+tCMOv4HqjGjh4rodUqo4pchsrYHZiR2DVCCtsosfsVNurMGJb1Ps3FtNDRvct7P3QT3djQ8kKRIHph9maxGqU0Pn40tA26gnSrAL+TQ8Lph//JiTLXHgcRBles430MgyMiIvkFgK4bPniQeD7c8ZC388o09ss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739914151; c=relaxed/simple; bh=E5Md+Ptzgm9++CsnUMh6sg46w21bnm1bBG33zFKPK7I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ufp1j9FFCV/ZA9398eXET3upxmRMCjwWKVxsn7g5ECP0EhJs5Wcs2D63Ugg0mUVHI8SLrLnM/Vv/Mb4q8m0Pzn0UfnQrqgyk01IbC2VaH5Gjo4safi86SDzm0odwaw2Bz1ZlN0wRDr5G0NeXeEaktkhVob+A2l6228YD7pysaLo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MPpuyp+b; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MPpuyp+b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10945C4CEEB; Tue, 18 Feb 2025 21:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739914150; bh=E5Md+Ptzgm9++CsnUMh6sg46w21bnm1bBG33zFKPK7I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MPpuyp+bjAxqqHLqze7OSoXzvI0PEcWbbXbwKGeHVllleuKHoJNO0EbiNZPCpnnOa wjO/iZhinypZJ5xStJjaqlHjc5hJocXbQ1xNJt2Q5RZyFnzYV2YTWRGFtoDkwkF3H2 emg7JvkVxyvAxiD/WsucqiUX+gp4CF6s2dxvcw7SAgBhvU5Nsm2humBZGyPUicGTTw oemXETNOK6BPCjSfkSZ5/X/Nct6zMcG6wbKXy0bV6714tRMqgeezw+59s+vNazGRBI +pDfp1uv2wallrVyK8K2iK0CHMd1NJOItqeYVuLTgBOcpdmeJgINWwV1haFoZ2JMmM PTYkld2JUeOoQ== From: Jeff Layton Date: Tue, 18 Feb 2025 16:28:58 -0500 Subject: [PATCH 2/3] nfsd: eliminate cl_ra_cblist and NFSD4_CLIENT_CB_RECALL_ANY Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250218-nfsd-callback-v1-2-14f966967dd8@kernel.org> References: <20250218-nfsd-callback-v1-0-14f966967dd8@kernel.org> In-Reply-To: <20250218-nfsd-callback-v1-0-14f966967dd8@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: Li Lingfeng , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3279; i=jlayton@kernel.org; h=from:subject:message-id; bh=E5Md+Ptzgm9++CsnUMh6sg46w21bnm1bBG33zFKPK7I=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBntPujXzzuChWe87P68/HF2oM2zFM/dfxV2PtWK zmh13WhuOCJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZ7T7owAKCRAADmhBGVaC FaGbD/oCW05h/vSew8ETTsGjr2mSEI0frQA+n6nYNQrZvmLhiARdVFlQhsLROU9+KkQjIJAN/lt U1rChYZrI615lI4plvcvE9I9svskxTaca5Sa0QbNKunUvB0LtWQaXkN4yIU1aM78Jg9VOE1r+73 DJVGSXtSyp2ZoMeiaEFQSV6qyttkfyQ1S8trehnlC1Iyo8KqC3MNTkr6McAzZEt7+gMbRcApIAi jYKc/BgQkVanXy1y0CCmmq7QEybYHBOxFGz21SpFyh6TwNIuP5ly3c2+UUyBR+jvQ0u/BexNCWS E6ZCpETYISq1VnMZvJoTU+19OtTN/maM9SnhIUC74AmD0nOggJ3FOFeO60X8IEwYmEqrvm1hkW4 zEQvAuqeWurIZYK8jR1mf4GtO1ibJiyMVtRY53QYi7GM14cWU/wUC/OpQQhkTaPBXih7CQyjSxb OzPRSgkXBQPKSa6KjS14oEtPHMWS0+xuY4acLOjcHnrhpPG+795REmAx9QLRKbeQ7cJZxIe4EZ4 IKEpWVRRscWFoqfGfiHQedqQXR0SxAhi9tz8d7tyVXf0W8V37I5POVw8/Pu14g6YOh1aRbV9n+o sOMTlmVMFgLKCiVkJB8+8CPD5xetkbZ1c+20E5Va5UTs9eaP9krC8vgQYKWv/nlQOHl/f8W4jAW wftpEJDbFDdPIDA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 deleg_reaper() will walk the client_lru list and put any suitable entries onto "cblist" using the cl_ra_cblist pointer. It then walks the objects outside the spinlock and queues callbacks for them. None of the operations that deleg_reaper() does outside the nn->client_lock are blocking operations. Just queue their workqueue jobs under the nn->client_lock instead. Also, the NFSD4_CLIENT_CB_RECALL_ANY and NFSD4_CALLBACK_RUNNING flags serve an identical purpose now. Drop the NFSD4_CLIENT_CB_RECALL_ANY flag and just use the one in the callback. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 16 +++------------- fs/nfsd/state.h | 2 -- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index fabcd979c40695ebcc795cfd2d8a035b7d589a37..422439a46ffd03926524b8463cfdabfb866281b3 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3175,7 +3175,6 @@ nfsd4_cb_recall_any_release(struct nfsd4_callback *cb) { struct nfs4_client *clp = cb->cb_clp; - clear_bit(NFSD4_CLIENT_CB_RECALL_ANY, &clp->cl_flags); drop_client(clp); } @@ -6881,7 +6880,6 @@ deleg_reaper(struct nfsd_net *nn) { struct list_head *pos, *next; struct nfs4_client *clp; - LIST_HEAD(cblist); spin_lock(&nn->client_lock); list_for_each_safe(pos, next, &nn->client_lru) { @@ -6893,31 +6891,23 @@ deleg_reaper(struct nfsd_net *nn) continue; if (atomic_read(&clp->cl_delegs_in_recall)) continue; - if (test_bit(NFSD4_CLIENT_CB_RECALL_ANY, &clp->cl_flags)) + if (test_and_set_bit(NFSD4_CALLBACK_RUNNING, &clp->cl_ra->ra_cb.cb_flags)) continue; if (ktime_get_boottime_seconds() - clp->cl_ra_time < 5) continue; if (clp->cl_cb_state != NFSD4_CB_UP) continue; - list_add(&clp->cl_ra_cblist, &cblist); /* release in nfsd4_cb_recall_any_release */ kref_get(&clp->cl_nfsdfs.cl_ref); - set_bit(NFSD4_CLIENT_CB_RECALL_ANY, &clp->cl_flags); clp->cl_ra_time = ktime_get_boottime_seconds(); - } - spin_unlock(&nn->client_lock); - - while (!list_empty(&cblist)) { - clp = list_first_entry(&cblist, struct nfs4_client, - cl_ra_cblist); - list_del_init(&clp->cl_ra_cblist); clp->cl_ra->ra_keep = 0; clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG) | BIT(RCA4_TYPE_MASK_WDATA_DLG); trace_nfsd_cb_recall_any(clp->cl_ra); - nfsd4_try_run_cb(&clp->cl_ra->ra_cb); + nfsd4_run_cb(&clp->cl_ra->ra_cb); } + spin_unlock(&nn->client_lock); } static void diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index dc7105e685b8057ca4e2fcc5ceb85754e96981a2..d1a8f074885aa6576843baf46de3a55de530d8d9 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -454,7 +454,6 @@ struct nfs4_client { #define NFSD4_CLIENT_UPCALL_LOCK (5) /* upcall serialization */ #define NFSD4_CLIENT_CB_FLAG_MASK (1 << NFSD4_CLIENT_CB_UPDATE | \ 1 << NFSD4_CLIENT_CB_KILL) -#define NFSD4_CLIENT_CB_RECALL_ANY (6) unsigned long cl_flags; struct workqueue_struct *cl_callback_wq; @@ -500,7 +499,6 @@ struct nfs4_client { struct nfsd4_cb_recall_any *cl_ra; time64_t cl_ra_time; - struct list_head cl_ra_cblist; }; /* struct nfs4_client_reset From patchwork Tue Feb 18 21:28:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13980903 X-Patchwork-Delegate: cel@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 49EF11D61B7; Tue, 18 Feb 2025 21:29:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739914152; cv=none; b=TzC2Ql7qJ2kSYnHZpXcJpjAJXUGNeHYcqk+R/w2t9Bktj6GbavJwONsx1nGUTKxFLsrIIo9BNV9bvufSJIL6s1O3QoY7kznlWzJVKE5d/l7YwlvCBtE+mayWyV1yFuXOtsgYzAJDm9gOvZEo6B0CwvmhrtXe0h8n06QfxQp3XE0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739914152; c=relaxed/simple; bh=ReRXsXNJmQD4dXv+Zb3a5U4yhOcrKkTYpzeFoSc49Vc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HweIcjcYMCfNR1Yd5rH/vlEx5cu0ZIs0sN4+gYzeTjfUbt7jS+0Fr/Kua92Hvowbpza1Fpi1/HLuPlg6TpMAEAXwexmVJ0Rne3er43HvdGIiUNf/9TDYVZ+dEn+OOoZXfcXR2yqboDW2s0we4gjbV/hQncRfQFOKgVrtgBNAdNc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cuSVORij; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cuSVORij" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A2C1C4CEEC; Tue, 18 Feb 2025 21:29:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739914151; bh=ReRXsXNJmQD4dXv+Zb3a5U4yhOcrKkTYpzeFoSc49Vc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cuSVORijZAhgbhkBYvcJsGGxPe5gKfXjkIC8tSsb+d/2zJJU24S4zpHfUbaOqx301 mKHGxk2e1a8R7RlnZXnDDngWOu59DcWdM9j1qXzWfYo3gRa5YahGFEXy1l35A2D+7J CbSsmUctdsHGRHBpNjtlzeqf8NpC/OQJWGAjL3ecy9nUVYkjNQeKLZ1yXv7MpDY/Zx dbSME4zrdZpcO/X+V1dwB5i3LSWpL04U/mVDwkeuR/pJV+rcg+pioSJmTxl/WKRRoG h0li/fqgGhksxZ4T6TNU9Tzr2KuxeVdwGWa/fxnMdmXVPg+bQczuLxbwOHoBV9F24L 2XDYaxb+FBjHA== From: Jeff Layton Date: Tue, 18 Feb 2025 16:28:59 -0500 Subject: [PATCH 3/3] nfsd: move cb_need_restart flag into cb_flags Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250218-nfsd-callback-v1-3-14f966967dd8@kernel.org> References: <20250218-nfsd-callback-v1-0-14f966967dd8@kernel.org> In-Reply-To: <20250218-nfsd-callback-v1-0-14f966967dd8@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: Li Lingfeng , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3096; i=jlayton@kernel.org; h=from:subject:message-id; bh=ReRXsXNJmQD4dXv+Zb3a5U4yhOcrKkTYpzeFoSc49Vc=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBntPujiwG8OGwdxHvjObLQUjESPO9LVn8dpGxKB erNetxdOr6JAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZ7T7owAKCRAADmhBGVaC FV8BEADHPWIp2iI6ajMePfbpbfMQKcPCClow4ru/Chv29zXJt5nTYkavEVWcULdoJOyUNX8gEhr sXvdxyNPnzo3/eIHwQp0H5p3aPuh0p7KtO1YHIiiQIlyNDNnSlj4ZdvhMbElYbUVR3i85g3y7a3 C9KSzoYQH0ycZXjwxb5qKICr31kaIRnTrzgkfiU79kkot1rf9cLe84j/4ixgkrPTzTsoa+lfW/9 0wmY3yfWBjnBIOL7JfphU+R1vZz8yec60Z1GlwNl7lHKgwltUbSnIDG340w4mRsiyOUT0QhPFl6 pOChmBxFhR4zIuqRQVe5f5k3SXwH3kjltIQeRWncZN2gbItOA3xDo+WK/Lnpglh0ZF/ViEdzYuc WvWsAQEAbzo0vaqcQ3QGTu0YXqAGm8Pl9gk6E+/jlyCE/xnjHDCmxNCMlL8AgPfguVAT8f8xP5W HDzBmHfIaPBeHwRQBsuPMOBN++KXTZVxfNwtyyp5YFPhbmhZ0gH24DgYK2wdAr2KTlVKyLRmBdO pzxLKg1DENK/TOX4nolqUjxUxRh4o4jcKEY/6n4VtH+IdBvKUf9LEdayfCTP46AUulZU7cyW/bZ AN+wVMsivyPu3h6cEfLpRw8HX8/tzRv18600DFGDFjCYU3eKhWA0LjFUZLBgbyssIp7sA9s+wsj jLIfz4dXY3cHteg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Since there is now a cb_flags word, use a new NFSD4_CALLBACK_RESTART flag in that instead of a separate boolean. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4callback.c | 10 ++++------ fs/nfsd/state.h | 2 +- fs/nfsd/trace.h | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 1f26c811e5f73c2e745ee68d0b6e668d1dd7c704..0b94fccbabb49097e23881ab170d38e0eeef90e2 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -1071,7 +1071,7 @@ static void nfsd4_requeue_cb(struct rpc_task *task, struct nfsd4_callback *cb) if (!test_bit(NFSD4_CLIENT_CB_KILL, &clp->cl_flags)) { trace_nfsd_cb_restart(clp, cb); task->tk_status = 0; - cb->cb_need_restart = true; + set_bit(NFSD4_CALLBACK_RESTART, &cb->cb_flags); } } @@ -1475,7 +1475,7 @@ static void nfsd4_cb_release(void *calldata) trace_nfsd_cb_rpc_release(cb->cb_clp); - if (cb->cb_need_restart) + if (test_bit(NFSD4_CALLBACK_RESTART, &cb->cb_flags)) nfsd4_queue_cb(cb); else nfsd41_destroy_cb(cb); @@ -1614,12 +1614,11 @@ nfsd4_run_cb_work(struct work_struct *work) return; } - if (cb->cb_need_restart) { - cb->cb_need_restart = false; - } else { + if (!test_and_clear_bit(NFSD4_CALLBACK_RESTART, &cb->cb_flags)) { if (cb->cb_ops && cb->cb_ops->prepare) cb->cb_ops->prepare(cb); } + cb->cb_msg.rpc_cred = clp->cl_cb_cred; flags = clp->cl_minorversion ? RPC_TASK_NOCONNECT : RPC_TASK_SOFTCONN; rpc_call_async(clnt, &cb->cb_msg, RPC_TASK_SOFT | flags, @@ -1637,7 +1636,6 @@ void nfsd4_init_cb(struct nfsd4_callback *cb, struct nfs4_client *clp, cb->cb_ops = ops; INIT_WORK(&cb->cb_work, nfsd4_run_cb_work); cb->cb_status = 0; - cb->cb_need_restart = false; cb->cb_held_slot = -1; } diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index d1a8f074885aa6576843baf46de3a55de530d8d9..f75b77dceb47c0b3795df9dbf9131b8c0ce4525f 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -68,13 +68,13 @@ struct nfsd4_callback { struct nfs4_client *cb_clp; struct rpc_message cb_msg; #define NFSD4_CALLBACK_RUNNING BIT(0) +#define NFSD4_CALLBACK_RESTART BIT(1) unsigned long cb_flags; const struct nfsd4_callback_ops *cb_ops; struct work_struct cb_work; int cb_seq_status; int cb_status; int cb_held_slot; - bool cb_need_restart; }; struct nfsd4_callback_ops { diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index 49bbd26ffcdb36173047569b8d4b41efdec4880b..00140556d50aab4bab8900fb1890cd920d5124c6 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -1613,7 +1613,7 @@ DECLARE_EVENT_CLASS(nfsd_cb_lifetime_class, __entry->cl_id = clp->cl_clientid.cl_id; __entry->cb = cb; __entry->opcode = cb->cb_ops ? cb->cb_ops->opcode : _CB_NULL; - __entry->need_restart = cb->cb_need_restart; + __entry->need_restart = test_bit(NFSD4_CALLBACK_RESTART, &cb->cb_flags); __assign_sockaddr(addr, &clp->cl_cb_conn.cb_addr, clp->cl_cb_conn.cb_addrlen) ),