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 F1506C52D7D for ; Thu, 15 Aug 2024 08:44:23 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 894C73D2244 for ; Thu, 15 Aug 2024 10:44:22 +0200 (CEST) Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [217.194.8.6]) (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 403013D21C7 for ; Thu, 15 Aug 2024 10:40:59 +0200 (CEST) Authentication-Results: in-6.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=linuxfoundation.org (client-ip=2604:1380:40e1:4800::1; helo=sin.source.kernel.org; envelope-from=gregkh@linuxfoundation.org; receiver=lists.linux.it) Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id 2E45F1400124 for ; Thu, 15 Aug 2024 10:40:58 +0200 (CEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 0047ECE194E; Thu, 15 Aug 2024 08:40:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BADB9C32786; Thu, 15 Aug 2024 08:40:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723711255; bh=kEbr4hjiyg1nBxuUarSdNdCJz2WtoraNa9awKKtPQXA=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=abWrHky0KerTiD0AgdCNchIjLrpSI0hAY3poYc5YnJBKoDytSG1v9cGX0Ly7nPk9N UKGWsDpvi6BUMCYCk043KKaH+fqwFJ1XylfVlXHQMQNCosP7gVlXds5t8SqHySqQP/ dP9KWzl59hoZQ2TpUmvPLiVjMJkzmmjBACCa8dxg= 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:00 +0200 In-Reply-To: <20240810200009.9882-10-cel@kernel.org> Message-ID: <2024081500-dairy-engraving-fa2d@gregkh> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-Virus-Scanned: clamav-milter 1.0.3 at in-6.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] Patch "sunrpc: don't change ->sv_stats if it doesn't exist" 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: don't change ->sv_stats if it doesn't exist 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-don-t-change-sv_stats-if-it-doesn-t-exist.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-66330-greg=kroah.com@vger.kernel.org Sat Aug 10 22:01:11 2024 From: cel@kernel.org Date: Sat, 10 Aug 2024 16:00:00 -0400 Subject: sunrpc: don't change ->sv_stats if it doesn't exist 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-10-cel@kernel.org> From: Josef Bacik [ Upstream commit ab42f4d9a26f1723dcfd6c93fcf768032b2bb5e7 ] We check for the existence of ->sv_stats elsewhere except in the core processing code. It appears that only nfsd actual exports these values anywhere, everybody else just has a write only copy of sv_stats in their svc_program. Add a check for ->sv_stats before every adjustment to allow us to eliminate the stats struct from all the users who don't report the 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 --- net/sunrpc/svc.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1324,7 +1324,8 @@ svc_process_common(struct svc_rqst *rqst goto err_bad_proc; /* Syntactic check complete */ - serv->sv_stats->rpccnt++; + if (serv->sv_stats) + serv->sv_stats->rpccnt++; trace_svc_process(rqstp, progp->pg_name); /* Build the reply header. */ @@ -1377,7 +1378,8 @@ err_short_len: goto close_xprt; err_bad_rpc: - serv->sv_stats->rpcbadfmt++; + if (serv->sv_stats) + serv->sv_stats->rpcbadfmt++; svc_putnl(resv, 1); /* REJECT */ svc_putnl(resv, 0); /* RPC_MISMATCH */ svc_putnl(resv, 2); /* Only RPCv2 supported */ @@ -1387,7 +1389,8 @@ err_bad_rpc: err_bad_auth: dprintk("svc: authentication failed (%d)\n", be32_to_cpu(rqstp->rq_auth_stat)); - serv->sv_stats->rpcbadauth++; + if (serv->sv_stats) + serv->sv_stats->rpcbadauth++; /* Restore write pointer to location of accept status: */ xdr_ressize_check(rqstp, reply_statp); svc_putnl(resv, 1); /* REJECT */ @@ -1397,7 +1400,8 @@ err_bad_auth: err_bad_prog: dprintk("svc: unknown program %d\n", prog); - serv->sv_stats->rpcbadfmt++; + if (serv->sv_stats) + serv->sv_stats->rpcbadfmt++; svc_putnl(resv, RPC_PROG_UNAVAIL); goto sendit; @@ -1405,7 +1409,8 @@ err_bad_vers: svc_printk(rqstp, "unknown version (%d for prog %d, %s)\n", rqstp->rq_vers, rqstp->rq_prog, progp->pg_name); - serv->sv_stats->rpcbadfmt++; + if (serv->sv_stats) + serv->sv_stats->rpcbadfmt++; svc_putnl(resv, RPC_PROG_MISMATCH); svc_putnl(resv, process.mismatch.lovers); svc_putnl(resv, process.mismatch.hivers); @@ -1414,7 +1419,8 @@ err_bad_vers: err_bad_proc: svc_printk(rqstp, "unknown procedure (%d)\n", rqstp->rq_proc); - serv->sv_stats->rpcbadfmt++; + if (serv->sv_stats) + serv->sv_stats->rpcbadfmt++; svc_putnl(resv, RPC_PROC_UNAVAIL); goto sendit; @@ -1423,7 +1429,8 @@ err_garbage: rpc_stat = rpc_garbage_args; err_bad: - serv->sv_stats->rpcbadfmt++; + if (serv->sv_stats) + serv->sv_stats->rpcbadfmt++; svc_putnl(resv, ntohl(rpc_stat)); goto sendit; } @@ -1469,7 +1476,8 @@ svc_process(struct svc_rqst *rqstp) out_baddir: svc_printk(rqstp, "bad direction 0x%08x, dropping request\n", be32_to_cpu(dir)); - rqstp->rq_server->sv_stats->rpcbadfmt++; + if (rqstp->rq_server->sv_stats) + rqstp->rq_server->sv_stats->rpcbadfmt++; out_drop: svc_drop(rqstp); return 0; 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