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 F3E8A32FA2B; Thu, 18 Jun 2026 16:58:18 +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=1781801900; cv=none; b=B1aZdqhVNKH6PKHeHxyoRDZmhcmPgCc5Wq6KS+TBSl/QMIE/KAYNYGIerJ+wFzy7AzU+huybWMReHEyzhO3P37BiIFpSmqe7bPcI/7vAfqPzleiGcTd2D6mvSVUozk2MbHhyB6EDcWuQlUFok1FVuufGkG8i5kkqzBrLv6+Eq6I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781801900; c=relaxed/simple; bh=uZ2FBmxOoVhJsLeuZtKLiGJZ3fUw16DLYpIJJdwXrAI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uDpsO/qkQMc7LlpaVxdyfA+hokc1oQpmjKEEi3Zqov8hGdNxPDBWXIcOO6Fl54JX8TT0eOdMp6NdljnPBy2Seq/2k4Cfl3P/UAfaCwlEZfuAnr3zLzBIBQJR4y0/Ho4rXxXPPZySUQAybRo/UOgzySXnx4Gyd7WPaNLs9CwGz8U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LIKzHUWh; 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="LIKzHUWh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B97211F00A3A; Thu, 18 Jun 2026 16:58:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781801898; bh=Ajw8xEIbnhyGqpeHFElvJETCGD/Q08OjHIPkMg7eBg8=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=LIKzHUWh1rcnMF7JYZWuvOZlU5o8yiiEAHohIFiMJR2Z3iW9uyoZi8VZocR7Xi2Zw nSSEAxrm9M3E2KScgDRhZNmb3NvSNe0qLQQpO6SQmbEG6BFdqu9vqaRCXkeiN6hX5d mJxEQ/0dFuHNe9uRw7vwNRYjmjmzTqbgDnERn3dboIdbtvNeTyvupqTJN5XZoTfKd8 q/QOAbAyUv+uBdM4QL//V8zoaObPkTeYUnNYGYNo/s5ZIX5jLx1cBMCtVyXiNMeN+o GVgHyeWo/+Cn9Jjbh4V1+kWjCz7AzdPPkemdD7N0A/5+reLG7rI+EVkGnwtgultSSl l3i+Lij+WZDqw== From: Jeff Layton Date: Thu, 18 Jun 2026 12:57:55 -0400 Subject: [PATCH v5 1/6] sunrpc: add per-netns per-procedure call counts to svc_stat Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260618-exportd-netlink-v5-1-e9aef947af3d@kernel.org> References: <20260618-exportd-netlink-v5-0-e9aef947af3d@kernel.org> In-Reply-To: <20260618-exportd-netlink-v5-0-e9aef947af3d@kernel.org> To: NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Chuck Lever Cc: Trond Myklebust , Anna Schumaker , Steve Dickson , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=5117; i=jlayton@kernel.org; h=from:subject:message-id; bh=uZ2FBmxOoVhJsLeuZtKLiGJZ3fUw16DLYpIJJdwXrAI=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqNCOmi7E8jDxWuh03EkfgKwqPVxx7xQB7MAHgv +kIFSF/c5+JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCajQjpgAKCRAADmhBGVaC FZVtD/9mpExe8NBgy9T+iIO0c7DaFCW1R6i4Er8T8sFkSZdQZgIP/71/rE1Lj2LgmUJg27tuR9X fHhq8/GUoDZFshThFQU4jEtaBVl2BCdddWsWP1QFv2TRg0VZyOxWXZXhfn7sw5fi5o3t4WZgVY/ LKz174BwxL0jFpG+yyhNI1vmMcyOPDuEbg7PtGwHvuZFBGq8PGPbQ9/W88ljdAOzX3nvhJ4wgpD MJPXMGQUJV/GFzq93YGEIh/D3VQXUh0KQZFtmZOtzPpQFy2Far3tahqW6fqaKDbb/R/QV81yS7h 4LVtjqiWvumS0/FfyEcp7VwiA/TLrTz9fJlfAQExWxKjGmvCKsCDwigx2GzcDoBKGkK7nc3jTuY oInR/FCDsFJKYR760RsnIT+AXGLH7Ny2RMpT8jViuJpFGEMS56vOZp0p0SIsJ5L7q72n61NSYLj FlbTPLHoJDVMYqmkJQelLeyC/6zU7Jw6Y4ufGwfL2SbH6h+kPy0ku518Cfk5/PQ5o4vlYpcGGwd 22N/F+DO2FWMT3PxL9dP/DxGfVs+uK9ERdI8Mj5fAe59syGdQnEmrfOE4PozqSNa+emGfIAkRCq 5IhRuMib+rMBjRVP43gPsv/lhmO+KLLwBLP0z0C3ZbxvO9omKajdJGR6yEIJTB7Xt+iFSFjFbHQ quolw4wnsEGWzGg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 The existing per-procedure call counts live in global svc_version->vs_count[] arrays which are not network-namespace-aware. Add per-netns equivalents in struct svc_stat so the upcoming netlink stats interface can return namespace-scoped statistics. Add a vs_count pointer array to struct svc_stat, along with svc_stat_alloc_counts() and svc_stat_free_counts() helpers to manage per-version percpu call count arrays. Increment the per-net counter alongside the global one in svc_generic_init_request(). Call the alloc/free helpers from nfsd_net_init() and nfsd_net_exit(). Assisted-by: Claude:claude-opus-4-6 Signed-off-by: Jeff Layton --- fs/nfsd/nfsctl.c | 8 +++++- include/linux/sunrpc/stats.h | 6 +++++ net/sunrpc/svc.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index caf59421f8f4..601301e34fc7 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -2514,9 +2514,12 @@ static __net_init int nfsd_net_init(struct net *net) memset(&nn->nfsd_svcstats, 0, sizeof(nn->nfsd_svcstats)); nn->nfsd_svcstats.program = &nfsd_programs[0]; + retval = svc_stat_alloc_counts(&nn->nfsd_svcstats); + if (retval) + goto out_proc_error; if (!nfsd_proc_stat_init(net)) { retval = -ENOMEM; - goto out_proc_error; + goto out_svcstats_error; } for (i = 0; i < sizeof(nn->nfsd_versions); i++) @@ -2534,6 +2537,8 @@ static __net_init int nfsd_net_init(struct net *net) #endif return 0; +out_svcstats_error: + svc_stat_free_counts(&nn->nfsd_svcstats); out_proc_error: percpu_counter_destroy_many(nn->counter, NFSD_STATS_COUNTERS_NUM); out_repcache_error: @@ -2574,6 +2579,7 @@ static __net_exit void nfsd_net_exit(struct net *net) kfree_sensitive(nn->fh_key); nfsd_net_cb_shutdown(nn); nfsd_proc_stat_shutdown(net); + svc_stat_free_counts(&nn->nfsd_svcstats); percpu_counter_destroy_many(nn->counter, NFSD_STATS_COUNTERS_NUM); nfsd_idmap_shutdown(net); nfsd_export_shutdown(net); diff --git a/include/linux/sunrpc/stats.h b/include/linux/sunrpc/stats.h index 3ce1550d1beb..087ade905e29 100644 --- a/include/linux/sunrpc/stats.h +++ b/include/linux/sunrpc/stats.h @@ -37,9 +37,15 @@ struct svc_stat { rpcbadfmt, rpcbadauth, rpcbadclnt; + + /* Per-version per-procedure call counts (per-cpu, per-netns) */ + unsigned long __percpu **vs_count; }; struct net; +int svc_stat_alloc_counts(struct svc_stat *statp); +void svc_stat_free_counts(struct svc_stat *statp); + #ifdef CONFIG_PROC_FS int rpc_proc_init(struct net *); void rpc_proc_exit(struct net *); diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index dd80a2eaaa74..0cee079df1cb 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1438,6 +1438,14 @@ svc_generic_init_request(struct svc_rqst *rqstp, /* Bump per-procedure stats counter */ this_cpu_inc(versp->vs_count[rqstp->rq_proc]); + /* Bump per-net per-procedure stats counter */ + if (rqstp->rq_server->sv_stats && + rqstp->rq_server->sv_stats->program == progp && + rqstp->rq_server->sv_stats->vs_count && + rqstp->rq_server->sv_stats->vs_count[rqstp->rq_vers]) + this_cpu_inc(rqstp->rq_server->sv_stats->vs_count + [rqstp->rq_vers][rqstp->rq_proc]); + ret->dispatch = versp->vs_dispatch; return rpc_success; err_bad_vers: @@ -1449,6 +1457,60 @@ svc_generic_init_request(struct svc_rqst *rqstp, } EXPORT_SYMBOL_GPL(svc_generic_init_request); +/** + * svc_stat_alloc_counts - allocate per-netns per-version call count arrays + * @statp: svc_stat whose vs_count arrays should be allocated + * + * statp->program must be set before calling this. + * + * Returns zero on success, or a negative errno otherwise. + */ +int svc_stat_alloc_counts(struct svc_stat *statp) +{ + struct svc_program *prog = statp->program; + unsigned int i; + + statp->vs_count = kcalloc(prog->pg_nvers, + sizeof(unsigned long __percpu *), + GFP_KERNEL); + if (!statp->vs_count) + return -ENOMEM; + + for (i = 0; i < prog->pg_nvers; i++) { + if (!prog->pg_vers[i]) + continue; + statp->vs_count[i] = __alloc_percpu(prog->pg_vers[i]->vs_nproc * + sizeof(unsigned long), + sizeof(unsigned long)); + if (!statp->vs_count[i]) + goto err; + } + return 0; +err: + svc_stat_free_counts(statp); + return -ENOMEM; +} +EXPORT_SYMBOL_GPL(svc_stat_alloc_counts); + +/** + * svc_stat_free_counts - free per-netns per-version call count arrays + * @statp: svc_stat whose vs_count arrays should be freed + */ +void svc_stat_free_counts(struct svc_stat *statp) +{ + struct svc_program *prog = statp->program; + unsigned int i; + + if (!statp->vs_count) + return; + + for (i = 0; i < prog->pg_nvers; i++) + free_percpu(statp->vs_count[i]); + kfree(statp->vs_count); + statp->vs_count = NULL; +} +EXPORT_SYMBOL_GPL(svc_stat_free_counts); + /* * Common routine for processing the RPC request. */ -- 2.54.0