From nobody Sun Feb 8 04:42:36 2026 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 E72A433086; Wed, 28 May 2025 00:12:58 +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=1748391180; cv=none; b=YnHkTMi79k1O1aSYUzZNo1gnDwpkB85MtLtjSUHjm2Wh2r+6ZFa47E880Pfw2Npe/rUyxU28e+vQqrfOqy/v7GSF35tz/uAOxTYhsRCfKPaTHoQLhj95TH16t2H5BKSNCjf/WHgpanR3vFLk2+KnEx+Cb3t6iRHZj6kqI37e1L4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748391180; c=relaxed/simple; bh=5ONDFZ4LVaUcmaKvgoHjy+Uh+SRtmvFLfkPbbIhSqWM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jtJ1B4J//z/F2sW+cuNTkxofvhoY09azRRfXTAtwg2s8EWfrZg/WLgTviNCqV2nKLCCZ9JIgykR8cYICpAqmXUSJnpNQsfa98TQ2NS197GErHd19X9ZtLsSwgQVUwtd2js0LdvZ5l/6iMJiWxS/va1bcXIe2F7FeT7lX4CMPOXw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H9P/AtNv; 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="H9P/AtNv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B077EC4CEED; Wed, 28 May 2025 00:12:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1748391178; bh=5ONDFZ4LVaUcmaKvgoHjy+Uh+SRtmvFLfkPbbIhSqWM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=H9P/AtNvYE8uOVA1jTwO6GUexHt7YXpFBA1NpG5Oilog3II7QWIfitV8enoAI3BDj rtZO0Wan2kGWnICAf8LiyfgDaK0z6LCu/Povum0ai/O+f0QZ/C/d02YUZnOYccjZQn GRyxgiJeqzb1mJRjvtNtPtAPuuPQZ7QW0/fv3BA8f36Lj5rhgt3kqswChee2GnFRJ6 x7hF0VxmNjjxCXEenwet8pTIcQ4Hx9X5a2o0lvex25D3csWU4M8WLiSBPD6LLbDchU A7+n03WaAAz9IEjUTTJ7enJ9UtNHhMmc/H/tgAHOHcYJ/YejWt6EV8cMIt0lXPYlRH JWdJyi6YgtISQ== From: Jeff Layton Date: Tue, 27 May 2025 20:12:47 -0400 Subject: [PATCH 1/2] nfsd: use threads array as-is in netlink interface Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250527-rpc-numa-v1-1-fa1d98e9a900@kernel.org> References: <20250527-rpc-numa-v1-0-fa1d98e9a900@kernel.org> In-Reply-To: <20250527-rpc-numa-v1-0-fa1d98e9a900@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Trond Myklebust , Anna Schumaker , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: Mike Snitzer , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1912; i=jlayton@kernel.org; h=from:subject:message-id; bh=5ONDFZ4LVaUcmaKvgoHjy+Uh+SRtmvFLfkPbbIhSqWM=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBoNlUG9Nr7KJW3ldEnKQqvXsJQ9cNpLE27W3MwA 97XNMGS5gSJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaDZVBgAKCRAADmhBGVaC Fdj+EACFgjx+In/2Hqjpy58mWpT3o4UT296dFvTPnytPs8ok3FLiSCzbph+WPkwQZB3NjDJvA/l 2guqhrfWiySmpff7yzEf7BQY/alGoRj+5suwRr4eGyOWawxyoXjqhb2MSph9HyRKraKskKHFvPN vXtzNJ7TOoMkOOMPTPsQVXz0xIc5ax6CsyYZ+sNpHxIF6767/qz1ur1JcO27jGtJuP2APHigwhc pfMnLha4Xq+79bbjjDXHMzvocuqCvrwG9iHV2wRomJ2j/ZTOsFfOVMXfLZ5eYEXtJ6qdwkSSCs6 kDntgcNM3GUMRlnAOzxmZ45fj1E1fv7PQtri4R31UmEv0u7W2wa2LAdgOCDqvnEFyfV3BWUbI/f yoZherDGaMaKWLp/KDmhh4xrmiqWaEmAAfgPfT177X1DDeOhTBOeYwcZ/iMsgeevsoDqGLS61Tb S0WP+FixQ7WMyEd867RxXMio3CxOZ/TjWWb5H1skn14bon2wDVDEinAJey2cPjarI2teCSu+xqW LKCt2aCYrmI83WYyLXscxTruOmISp4lj40u26L79usyyxdvq/5itpS6JLulq+X66y1NV5qiGTeu RmqHmGv5KMUjyNsQk8L0kdRweBxLH/GiNsZwp9Py7CdfXQHyHFdCvfcDlEjQcX3hBig22X4kdQ1 WbqN2erF7pphajw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 The old nfsdfs interface for starting a server with multiple pools handles the special case of a single entry array passed down from userland by distributing the threads over every NUMA node. The netlink control interface however constructs an array of length nfsd_nrpools() and fills any unprovided slots with 0's. This behavior defeats the special casing that the old interface relies on. Change nfsd_nl_threads_set_doit() to pass down the array from userland as-is. Fixes: 7f5c330b2620 ("nfsd: allow passing in array of thread counts via net= link") Reported-by: Mike Snitzer Closes: https://lore.kernel.org/linux-nfs/aDC-ftnzhJAlwqwh@kernel.org/ Signed-off-by: Jeff Layton Reviewed-by: Simon Horman Tested-by: Mike Snitzer --- fs/nfsd/nfsctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index ac265d6fde35df4e02b955050f5b0ef22e6e519c..22101e08c3e80350668e94c3950= 58bc228b08e64 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1611,7 +1611,7 @@ int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb, */ int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info) { - int *nthreads, count =3D 0, nrpools, i, ret =3D -EOPNOTSUPP, rem; + int *nthreads, nrpools =3D 0, i, ret =3D -EOPNOTSUPP, rem; struct net *net =3D genl_info_net(info); struct nfsd_net *nn =3D net_generic(net, nfsd_net_id); const struct nlattr *attr; @@ -1623,12 +1623,11 @@ int nfsd_nl_threads_set_doit(struct sk_buff *skb, s= truct genl_info *info) /* count number of SERVER_THREADS values */ nlmsg_for_each_attr(attr, info->nlhdr, GENL_HDRLEN, rem) { if (nla_type(attr) =3D=3D NFSD_A_SERVER_THREADS) - count++; + nrpools++; } =20 mutex_lock(&nfsd_mutex); =20 - nrpools =3D max(count, nfsd_nrpools(net)); nthreads =3D kcalloc(nrpools, sizeof(int), GFP_KERNEL); if (!nthreads) { ret =3D -ENOMEM; --=20 2.49.0 From nobody Sun Feb 8 04:42:36 2026 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 CF89F41C72; Wed, 28 May 2025 00:13:00 +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=1748391181; cv=none; b=PRHLRiZe4Ex7WY5ZA+WdmqbqJYsqPXj6izCZPw0pcKLJ7OAVGnhjAuHxecPov6V6g4nrBePhHN5ZqVvqKJpF56aXgtKQ6kajLEfK3nwNeZ0Mt/gvu4ZF0uSvPcXKS5sWHrj63KmNzBxRfunSSWOJCrTOrLpCEQinbjKMO5RqhTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748391181; c=relaxed/simple; bh=cxW4SaBd30d71b+XTGQnQOrd3RoXiIa9IXf9TAX8wcI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DbuXQeCXgO+BaF6eGfsvpP81VAAJxHjZGQfB6YDtexrtlAsg3VCKmSYjNw3uHlmufMVUlXE1xpNYZjTHkJ8lnsko2EFNm2QGDlceX1RwMplx5QxKk1DYqZjm9nAOPwoDATzPTtb6u5FNvgEej3KrDtCtKR/gUImSVCF9sbqz9W8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cBkz54W8; 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="cBkz54W8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9CBF2C4CEEF; Wed, 28 May 2025 00:12:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1748391180; bh=cxW4SaBd30d71b+XTGQnQOrd3RoXiIa9IXf9TAX8wcI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cBkz54W8rb4B9VA3IK0gsi5vhlq4TR9Nk6IYfIJ8ieIOB82bRTHHZwP/wzy3PutwT +aYkkOxxDPRC6NNy9FQWNIos68XuOhkSxHXInCwmbox7leypTgcdxAHS/Uq/OGh2WE Od/joQd8ZgHwypznwJDpQzzhzV9mfw9Gv1fQ9oy/E0u93TRWJFeVHSjy+DwBFjwdXY PMx8ANiem1VbCAyNswZmYW98QRp+857CqCWjwCjKxN5iBFEtXVAnArTCVmC1d4w1lD cios5kOGfl1CDxHnlwEdioTNDw/chS+uWSgCAIFo+50fTFIYyMuK+RuehsDE8eKU5a AOhbX6XrVv8WA== From: Jeff Layton Date: Tue, 27 May 2025 20:12:48 -0400 Subject: [PATCH 2/2] sunrpc: new tracepoints around svc thread wakeups Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250527-rpc-numa-v1-2-fa1d98e9a900@kernel.org> References: <20250527-rpc-numa-v1-0-fa1d98e9a900@kernel.org> In-Reply-To: <20250527-rpc-numa-v1-0-fa1d98e9a900@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Trond Myklebust , Anna Schumaker , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: Mike Snitzer , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2475; i=jlayton@kernel.org; h=from:subject:message-id; bh=cxW4SaBd30d71b+XTGQnQOrd3RoXiIa9IXf9TAX8wcI=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBoNlUGnW4tgC8sVfVgHbdTgLn8V08NG8CkTE+ob BFqhAKcGoGJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaDZVBgAKCRAADmhBGVaC FUZUD/9BxN8EbQJyaMr+oPKZt5N1nr44RjHQy1scup+4Oq61Z07x8RkeHzVlc5cXFpS6u59licC VnbnpVSaR2MpagNnU18dcj6qjstz+RkQYcdKFSV35D2gGd/YX5S0PexNB4Hs9Kbp+1LHrBPfKAR pi26BBmC8OBL2ZH/eBeQlTcOC10VdwzMv4NWwuUU6nvbGcaW30/06z2fM30Pf7oQ6Pecm0Lyouw sET9h2mMdF4iSBeslSVqz0QpK4uz0x5oBaAjmId/8/7J7hH3nZSl4mN1MQcX2pXbKoXc3WlN0rI 8n2PerX+GAfLOag/sKdrzH1Q/d0ZouO0Tsopu/41kXMY9EAJRNig1NKzyn5604WfDcTMSJbncBO oQUPdcl5Dt5LgFUQdts0bVOHGnIHO/sf6XmHzR7l4SWBgBdDOV6iE6gaJjtmbweEraTV+8hAyAm KRMnQfT96DbZ7oIJvO44MjbDQZRZ4FUfr8l8NVerRgZk+05Z350/fcGYGssZctqGEw++5tVz9Z6 38M7SKEgPRxlKHSGWAaASwS78Kdf/6foihD0URiL6lB2GGfWvUEsfxtuLnOCfvAY1vbMxZQFx5p LGR14NTuEV/ubtIgqHbK510RC9k1okcxMstGyZAaUMZ/hS2zCH4bF+hi7q1n1WAm6PJwucE1kBn QWSM4+U8fPJW8Dg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Convert the svc_wake_up tracepoint into svc_pool_thread_event class. Have it also record the pool id, and add new tracepoints for when the thread is already running and for when there are no idle threads. Signed-off-by: Jeff Layton --- include/trace/events/sunrpc.h | 23 ++++++++++++++++++----- net/sunrpc/svc.c | 5 ++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index 5d331383047b79b9f6dcd699c87287453c1a5f49..d23009b4dc979fd7eebcfb6bc31= 64608f74ab23b 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h @@ -2124,22 +2124,35 @@ TRACE_EVENT(svc_xprt_accept, ) ); =20 -TRACE_EVENT(svc_wake_up, - TP_PROTO(int pid), +DECLARE_EVENT_CLASS(svc_pool_thread_event, + TP_PROTO(const struct svc_pool *pool, pid_t pid), =20 - TP_ARGS(pid), + TP_ARGS(pool, pid), =20 TP_STRUCT__entry( - __field(int, pid) + __field(unsigned int, pool_id) + __field(pid_t, pid) ), =20 TP_fast_assign( + __entry->pool_id =3D pool->sp_id; __entry->pid =3D pid; ), =20 - TP_printk("pid=3D%d", __entry->pid) + TP_printk("pool=3D%u pid=3D%d", __entry->pool_id, __entry->pid) ); =20 +#define DEFINE_SVC_POOL_THREAD_EVENT(name) \ + DEFINE_EVENT(svc_pool_thread_event, svc_pool_thread_##name, \ + TP_PROTO( \ + const struct svc_pool *pool, pid_t pid \ + ), \ + TP_ARGS(pool, pid)) + +DEFINE_SVC_POOL_THREAD_EVENT(wake); +DEFINE_SVC_POOL_THREAD_EVENT(running); +DEFINE_SVC_POOL_THREAD_EVENT(noidle); + TRACE_EVENT(svc_alloc_arg_err, TP_PROTO( unsigned int requested, diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index e7f9c295d13c03bf28a5eeec839fd85e24f5525f..de80d3683350dc86bee34137197= 97dcf7a4562e8 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -749,13 +749,16 @@ void svc_pool_wake_idle_thread(struct svc_pool *pool) WRITE_ONCE(rqstp->rq_qtime, ktime_get()); if (!task_is_running(rqstp->rq_task)) { wake_up_process(rqstp->rq_task); - trace_svc_wake_up(rqstp->rq_task->pid); + trace_svc_pool_thread_wake(pool, rqstp->rq_task->pid); percpu_counter_inc(&pool->sp_threads_woken); + } else { + trace_svc_pool_thread_running(pool, rqstp->rq_task->pid); } rcu_read_unlock(); return; } rcu_read_unlock(); + trace_svc_pool_thread_noidle(pool, rqstp->rq_task->pid); =20 } EXPORT_SYMBOL_GPL(svc_pool_wake_idle_thread); --=20 2.49.0