linux-kernel - Re: [PATCH 4/8] stack_tracer: move sysctl registration to kernel/trace/trace.c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20250303204732.1f5af40d@gandalf.local.home>
Date: Mon, 3 Mar 2025 20:47:32 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: Joel Granados <joel.granados@...nel.org>
Cc: Kees Cook <kees@...nel.org>, Masami Hiramatsu <mhiramat@...nel.org>,
 Mark Rutland <mark.rutland@....com>, Mathieu Desnoyers
 <mathieu.desnoyers@...icios.com>, Peter Zijlstra <peterz@...radead.org>,
 Ingo Molnar <mingo@...hat.com>, Arnaldo Carvalho de Melo <acme@...nel.org>,
 Namhyung Kim <namhyung@...nel.org>, Alexander Shishkin
 <alexander.shishkin@...ux.intel.com>, Jiri Olsa <jolsa@...nel.org>, Ian
 Rogers <irogers@...gle.com>, Adrian Hunter <adrian.hunter@...el.com>,
 "Liang, Kan" <kan.liang@...ux.intel.com>, "David S. Miller"
 <davem@...emloft.net>, Andreas Larsson <andreas@...sler.com>, Heiko
 Carstens <hca@...ux.ibm.com>, Vasily Gorbik <gor@...ux.ibm.com>, Alexander
 Gordeev <agordeev@...ux.ibm.com>, Christian Borntraeger
 <borntraeger@...ux.ibm.com>, Sven Schnelle <svens@...ux.ibm.com>, Gerald
 Schaefer <gerald.schaefer@...ux.ibm.com>, Thomas Gleixner
 <tglx@...utronix.de>, Borislav Petkov <bp@...en8.de>, Dave Hansen
 <dave.hansen@...ux.intel.com>, x86@...nel.org, "H. Peter Anvin"
 <hpa@...or.com>, "Rafael J. Wysocki" <rafael@...nel.org>, Len Brown
 <lenb@...nel.org>, linux-kernel@...r.kernel.org,
 linux-fsdevel@...r.kernel.org, linux-trace-kernel@...r.kernel.org,
 linux-perf-users@...r.kernel.org, sparclinux@...r.kernel.org,
 linux-s390@...r.kernel.org, linux-acpi@...r.kernel.org
Subject: Re: [PATCH 4/8] stack_tracer: move sysctl registration to
 kernel/trace/trace.c

On Tue, 18 Feb 2025 10:56:20 +0100
Joel Granados <joel.granados@...nel.org> wrote:

> Squash with ftrace:
> Move stac_tracer_enabled into trace_sysctl_table while keeping the
> CONFIG_STACK_TRACER ifdef. 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 <joel.granados@...nel.org>
> ---
>  kernel/sysctl.c      | 10 ----------
>  kernel/trace/trace.c |  9 +++++++++
>  2 files changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> index baa250e223a2..dc3747cc72d4 100644
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@ -68,7 +68,6 @@
>  
>  #ifdef CONFIG_X86
>  #include <asm/nmi.h>
> -#include <asm/stacktrace.h>
>  #include <asm/io.h>
>  #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.c b/kernel/trace/trace.c
> index abfc0e56173b..17b449f9e330 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c

This should go into kernel/trace/trace_stack.c, and remove the #ifdef.

-- Steve

> @@ -166,6 +166,15 @@ static const struct ctl_table trace_sysctl_table[] = {
>  		.mode		= 0644,
>  		.proc_handler	= tracepoint_printk_sysctl,
>  	},
> +#ifdef CONFIG_STACK_TRACER
> +	{
> +		.procname	= "stack_tracer_enabled",
> +		.data		= &stack_tracer_enabled,
> +		.maxlen		= sizeof(int),
> +		.mode		= 0644,
> +		.proc_handler	= stack_trace_sysctl,
> +	},
> +#endif
>  };
>  
>  static int __init init_trace_sysctls(void)
>