[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <f574knvwbip2hvyvorxcxfjrojd2bblmewvfsv6utivydljrpj@h2cryrh7cojq>
Date: Thu, 6 Mar 2025 11:37:24 +0100
From: Joel Granados <joel.granados@...nel.org>
To: Steven Rostedt <rostedt@...dmis.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 Mon, Mar 03, 2025 at 08:47:32PM -0500, Steven Rostedt wrote:
> On Tue, 18 Feb 2025 10:56:20 +0100
> Joel Granados <joel.granados@...nel.org> wrote:
>
> > Squash with ftrace:
I'll also fix this little marker that I missed. And I'll not squash it,
as it is now going into trace_stack.c
> > 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
I'll remove these comments from the commit message
> > 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.
Will send my V2 shortly with this modification.
>
> -- 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)
> >
>
Thx for the review
Best
--
Joel Granados
Powered by blists - more mailing lists