From patchwork Thu Mar 6 11:29:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 14004308 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 A788F21147D; Thu, 6 Mar 2025 11:30:51 +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=1741260651; cv=none; b=fuvBp/TZilrh7HUVbvXvyGJE0X+DFGWoGX5KDbhWas548yKJ2PKk77fNL8Yctee2aC9nb9Pb3Qx+uMTqfpYwRuLGMMU4M0Wniu0lzCXbvCV+tiNggU7zCjshPMCC7LdeK2JHo5YSuTCP2LfI56ZSeMjE7VvzmP7+MqvVuFocnlo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741260651; c=relaxed/simple; bh=pNjcBvmaJVdCgzpg/FmoYLnX8KqZ21YzHmxlpf6uAsM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SHtxM9j5IPi3vY4qK1Y68n+RjIsvOFqMCYuhUhk5i+89Yf2fQ7W30ULIqqtHMQ9ZvzAJHQz0tDEF+mHRwAQbNIoEenDejkAG2mbS8iNpwhCK8rJdp3l308EDS9HhFIJplt/7+DTzM6IpAtpo92Ks93fW1vKhBX+nb85W49OJ0B8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GZBW89u6; 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="GZBW89u6" Received: by smtp.kernel.org (Postfix) with ESMTPS id CDC53C4CEE2; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741260651; bh=pNjcBvmaJVdCgzpg/FmoYLnX8KqZ21YzHmxlpf6uAsM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GZBW89u6dY6ZDKGI8jm2kcYJdvMfYktmE5U5Hg/X0+d4hcwwsCGd5tgcTNZWolk0E l37fHZxWuakNu2wev2/6BLCwQr7+z2w5LMo4k4YHeAe1nBgcLr9yEw4IMrxTcoicrH FV7/MpQi5Iy+BPS4x3QdZznEW5yt+NFcBUtG5qgopt0BnxG3sBwsKm1Nz3YOgqSntd ZDqObPnSP7vSqYr/PHSr26G0PM6n3E6Oe+lCJIxEEB+9SsheI5g549AQFu8SKmiFq+ WFwVjp92SrTgSnpard/r8XWStztl8J3GfKOYVf1kXJD2yZcIAzMXTeT2RPVpLtukMR LFjBxlEFQvT+Q== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C8F5C28B27; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) From: Joel Granados Date: Thu, 06 Mar 2025 12:29:44 +0100 Subject: [PATCH v2 4/6] stack_tracer: move sysctl registration to kernel/trace/trace_stack.c Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250306-jag-mv_ctltables-v2-4-71b243c8d3f8@kernel.org> References: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> In-Reply-To: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1944; i=joel.granados@kernel.org; h=from:subject:message-id; bh=pNjcBvmaJVdCgzpg/FmoYLnX8KqZ21YzHmxlpf6uAsM=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGfJh2alAR7cgQ9qnoQ1dS1TtnuKGA+eVEsFK VJ3ED1gF8zG84kBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJnyYdmAAoJELqXzVK3 lkFPccsL/R6gdkbabbHbYIySeuZWAhaEq69GXChzsk4MkziXKdS1nqhAQRyagOvwm3v4TLsQ5wn EeSA8nqBfgCSzv3Zc4J8jPsoIB1r/WAYBivWOm9s4+nlfGKX853EnYVMzFQoQda+uxN4nXvqdD5 jYnjRDFXtobyLtlB3wEXvxHsLU2BwzRKeSk0U6ymKOaFutC5iLl3Ts/i2pgTqhUVtGR9xDE/AUl FvZKvdvnGnTcWq0kPwYcFDeADGJqtJwOZBFXF6B+du5+Qfc/mFesuMLMN1gNg/4pX4XMoSHS+GR phhE6S6SwL/M/XUCsM2Hq0JGz6fJBzfrbEC+thYwoxiGtDKAA2ZcrY/au+3bqtzQ06U674AeYRH saCxNzr960/eGSe4Hn6RkOY02dvH3Uy0e1MDCwE8qe00EGCWf6iUe8lTPHetI0nUOqcujw+td2r 9uMmTB1rt7y7AC+VnEahIQQxPWfR4PP2ojmk2bwBptsB3O58TTI9c2RPCsqZaDAR0/SBlU6HEi5 eI= X-Developer-Key: i=joel.granados@kernel.org; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for joel.granados@kernel.org/default with auth_id=239 Move stack_tracer_enabled into trace_stack_sysctl_table. This is part of a greater effort to move ctl tables into their respective subsystems which will reduce the merge conflicts in kerenel/sysctl.c. Signed-off-by: Joel Granados --- kernel/sysctl.c | 10 ---------- kernel/trace/trace_stack.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index baa250e223a26bafc39cb7a7d7635b4f7f5dcf56..dc3747cc72d470662879e4f2b7f2651505b7ca90 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -68,7 +68,6 @@ #ifdef CONFIG_X86 #include -#include #include #endif #ifdef CONFIG_SPARC @@ -1674,15 +1673,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif -#ifdef CONFIG_STACK_TRACER - { - .procname = "stack_tracer_enabled", - .data = &stack_tracer_enabled, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = stack_trace_sysctl, - }, -#endif #ifdef CONFIG_MODULES { .procname = "modprobe", diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 14c6f272c4d8a382070d45e1cf0ee97db38831c9..b7ffbc1da8357f9c252cb8936c8f789daa97eb9a 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -578,3 +578,23 @@ static __init int stack_trace_init(void) } device_initcall(stack_trace_init); + + +static const struct ctl_table trace_stack_sysctl_table[] = { + { + .procname = "stack_tracer_enabled", + .data = &stack_tracer_enabled, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = stack_trace_sysctl, + }, +}; + +static int __init init_trace_stack_sysctls(void) +{ + register_sysctl_init("kernel", trace_stack_sysctl_table); + return 0; +} +subsys_initcall(init_trace_stack_sysctls); + +