From patchwork Thu Sep 5 15:30:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13792626 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 66D761990DB; Thu, 5 Sep 2024 15:31:18 +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=1725550278; cv=none; b=bpA5v0zIFgrXjg2W8/qFVkVSAVr3wQfDvlEhgiHhVwokfSYr7x3HD4Q8+3tFljN8n7q0A9O0ZeRKiB4iEShvz2AEfdMnST7Xhtouwj5H2ulhAwe8K2D9litUJd5dN/qOSUqn4MGnrZGvOg06FupeyA+ertt0eL7CRHeZmAvCHJg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725550278; c=relaxed/simple; bh=dMKiKukO1PYUxmEU2utXwHp9VuTrFUzqcOaZ9BE33Ro=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cv5U4L9M6HDacAE0t52fJQL8doc1xlM2f6hTBd+l9R0qwRTAjjMo47NGIg15r2lkkWuBoqCIblUASL8Lc4dgJiH7r1L3xTxp0LH6lgwHkZnDYZN8uR8idVVLagWZ8Ms5bXizhRxvAOsjljRTpdaX49zRDUzVS9XjzDgLRTqtCfc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GYjBvAI+; 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="GYjBvAI+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A075C4CEC7; Thu, 5 Sep 2024 15:31:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725550278; bh=dMKiKukO1PYUxmEU2utXwHp9VuTrFUzqcOaZ9BE33Ro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GYjBvAI+vyg+bUbW/9yiDLQVSvz/rAGa51aWxRbYWoeLDhNnk8iPhvsoFl0Y2k9jg mdGTffEDSHt59lGqnLirWGJtPzO1234D4RDw8PxV5P0GJSROY7W9tSZjvPOn3E/iXL YdoEYLZIi9t8W23BJjQ5a6AP37YsZNcBHdg+lGcZnM9usvIeuzNZCU4Tm/NQ10Y5GA q6jqtO7q8XtdlQgi6dbZAuTjDwFww1nOmlOwtIpJDKtDtO0K4IeWKqNPj0s5/5qUJP yT2oFYD8NX5Okcx8PEbetvfyqHkMOn/oIlVHvWA0ciM2ZpW8X2rG9JpAxGIWw6Jj7d AGWPq26/1Naiw== From: cel@kernel.org To: Cc: , Petr Vorel , sherry.yang@oracle.com, calum.mackay@oracle.com, kernel-team@fb.com, Jeff Layton , Dai Ngo Subject: [PATCH 5.10.y 01/19] nfsd: move reply cache initialization into nfsd startup Date: Thu, 5 Sep 2024 11:30:43 -0400 Message-ID: <20240905153101.59927-2-cel@kernel.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240905153101.59927-1-cel@kernel.org> References: <20240905153101.59927-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Jeff Layton [ Upstream commit f5f9d4a314da88c0a5faa6d168bf69081b7a25ae ] There's no need to start the reply cache before nfsd is up and running, and doing so means that we register a shrinker for every net namespace instead of just the ones where nfsd is running. Move it to the per-net nfsd startup instead. Reported-by: Dai Ngo Signed-off-by: Jeff Layton Stable-dep-of: ed9ab7346e90 ("nfsd: move init of percpu reply_cache_stats counters back to nfsd_init_net") Signed-off-by: Chuck Lever --- fs/nfsd/nfsctl.c | 8 -------- fs/nfsd/nfssvc.c | 10 +++++++++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index f77f00c93172..1c39a4e6294d 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1461,16 +1461,11 @@ static __net_init int nfsd_init_net(struct net *net) nn->nfsd_versions = NULL; nn->nfsd4_minorversions = NULL; nfsd4_init_leases_net(nn); - retval = nfsd_reply_cache_init(nn); - if (retval) - goto out_cache_error; get_random_bytes(&nn->siphash_key, sizeof(nn->siphash_key)); seqlock_init(&nn->writeverf_lock); return 0; -out_cache_error: - nfsd_idmap_shutdown(net); out_idmap_error: nfsd_export_shutdown(net); out_export_error: @@ -1479,9 +1474,6 @@ static __net_init int nfsd_init_net(struct net *net) static __net_exit void nfsd_exit_net(struct net *net) { - struct nfsd_net *nn = net_generic(net, nfsd_net_id); - - nfsd_reply_cache_shutdown(nn); nfsd_idmap_shutdown(net); nfsd_export_shutdown(net); nfsd_netns_free_versions(net_generic(net, nfsd_net_id)); diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 3d4fd40c987b..a68e9904224a 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -427,16 +427,23 @@ static int nfsd_startup_net(struct net *net, const struct cred *cred) ret = nfsd_file_cache_start_net(net); if (ret) goto out_lockd; - ret = nfs4_state_start_net(net); + + ret = nfsd_reply_cache_init(nn); if (ret) goto out_filecache; + ret = nfs4_state_start_net(net); + if (ret) + goto out_reply_cache; + #ifdef CONFIG_NFSD_V4_2_INTER_SSC nfsd4_ssc_init_umount_work(nn); #endif nn->nfsd_net_up = true; return 0; +out_reply_cache: + nfsd_reply_cache_shutdown(nn); out_filecache: nfsd_file_cache_shutdown_net(net); out_lockd: @@ -454,6 +461,7 @@ static void nfsd_shutdown_net(struct net *net) struct nfsd_net *nn = net_generic(net, nfsd_net_id); nfs4_state_shutdown_net(net); + nfsd_reply_cache_shutdown(nn); nfsd_file_cache_shutdown_net(net); if (nn->lockd_up) { lockd_down(net);