From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 10CBAC52D7D for ; Thu, 15 Aug 2024 08:45:34 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 5C02A3D225A for ; Thu, 15 Aug 2024 10:45:32 +0200 (CEST) Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [IPv6:2001:4b78:1:20::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 24A463D21B3 for ; Thu, 15 Aug 2024 10:41:10 +0200 (CEST) Authentication-Results: in-3.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=linuxfoundation.org (client-ip=2604:1380:4641:c500::1; helo=dfw.source.kernel.org; envelope-from=gregkh@linuxfoundation.org; receiver=lists.linux.it) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-3.smtp.seeweb.it (Postfix) with ESMTPS id 5BAFB1A0036A for ; Thu, 15 Aug 2024 10:41:08 +0200 (CEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id C153861AB3; Thu, 15 Aug 2024 08:41:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 179C8C32786; Thu, 15 Aug 2024 08:41:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723711267; bh=hZ59AhSE/xOkyVDXrN4wF9xcCISZr/VekmR9CoPx33g=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=O47+drkg7JLXUe7z/LgRhdZXtZ3JxY0uP8l+G/MuxLYDCg6rpzEgVSAB7EwGP4SsY HZStyVIpAiWpHDqjQvn3DaiN/xmPLSGC6ZeIjksEKvaQ+/Do+dStafNMt2IHMshaiP 1TXdXE7WpP7sLjqF/vXvPgqB3MPn6VXjo0lb20YA= To: calum.mackay@oracle.com, cel@kernel.org, chuck.lever@oracle.com, gregkh@linuxfoundation.org, jlayton@kernel.org, josef@toxicpanda.com, kernel-team@fb.com, ltp@lists.linux.it, pvorel@suse.cz, sherry.yang@oracle.com From: Date: Thu, 15 Aug 2024 10:40:01 +0200 In-Reply-To: <20240810200009.9882-12-cel@kernel.org> Message-ID: <2024081501-volatile-suffix-fdb0@gregkh> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-Virus-Scanned: clamav-milter 1.0.3 at in-3.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] Patch "sunrpc: pass in the sv_stats struct through svc_create_pooled" has been added to the 6.1-stable tree X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable-commits@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" This is a note to let you know that I've just added the patch titled sunrpc: pass in the sv_stats struct through svc_create_pooled to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: sunrpc-pass-in-the-sv_stats-struct-through-svc_create_pooled.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable+bounces-66332-greg=kroah.com@vger.kernel.org Sat Aug 10 22:01:17 2024 From: cel@kernel.org Date: Sat, 10 Aug 2024 16:00:02 -0400 Subject: sunrpc: pass in the sv_stats struct through svc_create_pooled To: Cc: , pvorel@suse.cz, sherry.yang@oracle.com, calum.mackay@oracle.com, kernel-team@fb.com, ltp@lists.linux.it, Josef Bacik , Jeff Layton Message-ID: <20240810200009.9882-12-cel@kernel.org> From: Josef Bacik [ Upstream commit f094323867668d50124886ad884b665de7319537 ] Since only one service actually reports the rpc stats there's not much of a reason to have a pointer to it in the svc_program struct. Adjust the svc_create_pooled function to take the sv_stats as an argument and pass the struct through there as desired instead of getting it from the svc_program->pg_stats. Signed-off-by: Josef Bacik Reviewed-by: Jeff Layton [ cel: adjusted to apply to v6.1.y ] Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/nfssvc.c | 3 ++- include/linux/sunrpc/svc.h | 4 +++- net/sunrpc/svc.c | 12 +++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -657,7 +657,8 @@ int nfsd_create_serv(struct net *net) if (nfsd_max_blksize == 0) nfsd_max_blksize = nfsd_get_default_max_blksize(); nfsd_reset_versions(nn); - serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize, nfsd); + serv = svc_create_pooled(&nfsd_program, &nfsd_svcstats, + nfsd_max_blksize, nfsd); if (serv == NULL) return -ENOMEM; --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -493,7 +493,9 @@ void svc_rqst_replace_page(struct sv struct page *page); void svc_rqst_free(struct svc_rqst *); void svc_exit_thread(struct svc_rqst *); -struct svc_serv * svc_create_pooled(struct svc_program *, unsigned int, +struct svc_serv * svc_create_pooled(struct svc_program *prog, + struct svc_stat *stats, + unsigned int bufsize, int (*threadfn)(void *data)); int svc_set_num_threads(struct svc_serv *, struct svc_pool *, int); int svc_pool_stats_open(struct svc_serv *serv, struct file *file); --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -453,8 +453,8 @@ __svc_init_bc(struct svc_serv *serv) * Create an RPC service */ static struct svc_serv * -__svc_create(struct svc_program *prog, unsigned int bufsize, int npools, - int (*threadfn)(void *data)) +__svc_create(struct svc_program *prog, struct svc_stat *stats, + unsigned int bufsize, int npools, int (*threadfn)(void *data)) { struct svc_serv *serv; unsigned int vers; @@ -466,7 +466,7 @@ __svc_create(struct svc_program *prog, u serv->sv_name = prog->pg_name; serv->sv_program = prog; kref_init(&serv->sv_refcnt); - serv->sv_stats = prog->pg_stats; + serv->sv_stats = stats; if (bufsize > RPCSVC_MAXPAYLOAD) bufsize = RPCSVC_MAXPAYLOAD; serv->sv_max_payload = bufsize? bufsize : 4096; @@ -528,26 +528,28 @@ __svc_create(struct svc_program *prog, u struct svc_serv *svc_create(struct svc_program *prog, unsigned int bufsize, int (*threadfn)(void *data)) { - return __svc_create(prog, bufsize, 1, threadfn); + return __svc_create(prog, NULL, bufsize, 1, threadfn); } EXPORT_SYMBOL_GPL(svc_create); /** * svc_create_pooled - Create an RPC service with pooled threads * @prog: the RPC program the new service will handle + * @stats: the stats struct if desired * @bufsize: maximum message size for @prog * @threadfn: a function to service RPC requests for @prog * * Returns an instantiated struct svc_serv object or NULL. */ struct svc_serv *svc_create_pooled(struct svc_program *prog, + struct svc_stat *stats, unsigned int bufsize, int (*threadfn)(void *data)) { struct svc_serv *serv; unsigned int npools = svc_pool_map_get(); - serv = __svc_create(prog, bufsize, npools, threadfn); + serv = __svc_create(prog, stats, bufsize, npools, threadfn); if (!serv) goto out_err; return serv; Patches currently in stable-queue which might be from kroah.com@vger.kernel.org are queue-6.1/nfsd-remove-nfsd_stats-make-th_cnt-a-global-counter.patch queue-6.1/nfsd-move-reply-cache-initialization-into-nfsd-startup.patch queue-6.1/sunrpc-remove-pg_stats-from-svc_program.patch queue-6.1/mptcp-pm-don-t-try-to-create-sf-if-alloc-failed.patch queue-6.1/nfsd-rename-nfsd_reply_cache_alloc.patch queue-6.1/nfsd-make-all-of-the-nfsd-stats-per-network-namespace.patch queue-6.1/mptcp-pass-addr-to-mptcp_pm_alloc_anno_list.patch queue-6.1/nfsd-move-init-of-percpu-reply_cache_stats-counters-back-to-nfsd_init_net.patch queue-6.1/nfsd-replace-nfsd_prune_bucket.patch queue-6.1/nfsd-stop-setting-pg_stats-for-unused-stats.patch queue-6.1/sunrpc-don-t-change-sv_stats-if-it-doesn-t-exist.patch queue-6.1/nfsd-make-svc_stat-per-network-namespace-instead-of-global.patch queue-6.1/nfsd-fix-frame-size-warning-in-svc_export_parse.patch queue-6.1/nfsd-rename-nfsd_net_-to-nfsd_stats_.patch queue-6.1/mptcp-pm-do-not-ignore-subflow-if-signal-flag-is-also-set.patch queue-6.1/nfsd-refactor-nfsd_reply_cache_free_locked.patch queue-6.1/mptcp-fully-established-after-add_addr-echo-on-mpj.patch queue-6.1/sunrpc-use-the-struct-net-as-the-svc-proc-private.patch queue-6.1/selftests-mptcp-join-test-both-signal-subflow.patch queue-6.1/sunrpc-pass-in-the-sv_stats-struct-through-svc_create_pooled.patch queue-6.1/mptcp-pm-reduce-indentation-blocks.patch queue-6.1/nfsd-rewrite-synopsis-of-nfsd_percpu_counters_init.patch queue-6.1/nfsd-expose-proc-net-sunrpc-nfsd-in-net-namespaces.patch queue-6.1/nfsd-refactor-the-duplicate-reply-cache-shrinker.patch -- Mailing list info: https://lists.linux.it/listinfo/ltp