2021-10-21 16:40:26

by Steven Rostedt

Subject: [PATCH] tracing: Fix selftest config check for function graph start up test

From: "Steven Rostedt (VMware)" <[email protected]>

There's a new test in trace_selftest_startup_function_graph() that
requires the use of ftrace args being supported as well does some tricks
with dynamic tracing. Although this code checks HAVE_DYNAMIC_FTRACE_WITH_ARGS
it fails to check DYNAMIC_FTRACE, and the kernel fails to build due to
that dependency.

Signed-off-by: Steven Rostedt (VMware) <[email protected]>
---
Fixes this patch:
https://lore.kernel.org/all/[email protected]/

kernel/trace/trace_selftest.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 3404a245417e..3db8b80fbdca 100644
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -845,7 +845,8 @@ trace_selftest_startup_function_graph(struct tracer *trace,
goto out;
}

-#ifdef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS
+#if defined(CONFIG_DYNAMIC_FTRACE) && \
+ defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS)
tracing_reset_online_cpus(&tr->array_buffer);
set_graph_array(tr);

--
2.31.1

2021-10-21 16:49:56

by Jiri Olsa

Subject: Re: [PATCH] tracing: Fix selftest config check for function graph start up test

On Thu, Oct 21, 2021 at 12:37:29PM -0400, Steven Rostedt wrote:
> From: "Steven Rostedt (VMware)" <[email protected]>
>
> There's a new test in trace_selftest_startup_function_graph() that
> requires the use of ftrace args being supported as well does some tricks
> with dynamic tracing. Although this code checks HAVE_DYNAMIC_FTRACE_WITH_ARGS
> it fails to check DYNAMIC_FTRACE, and the kernel fails to build due to
> that dependency.
>
> Signed-off-by: Steven Rostedt (VMware) <[email protected]>

oops, I assumed id depended on CONFIG_DYNAMIC_FTRACE,
but did not check..

Acked-by: Jiri Olsa <[email protected]>

thanks,
jirka

> ---
> Fixes this patch:
> https://lore.kernel.org/all/[email protected]/
>
> kernel/trace/trace_selftest.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
> index 3404a245417e..3db8b80fbdca 100644
> --- a/kernel/trace/trace_selftest.c
> +++ b/kernel/trace/trace_selftest.c
> @@ -845,7 +845,8 @@ trace_selftest_startup_function_graph(struct tracer *trace,
> goto out;
> }
>
> -#ifdef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS
> +#if defined(CONFIG_DYNAMIC_FTRACE) && \
> + defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS)
> tracing_reset_online_cpus(&tr->array_buffer);
> set_graph_array(tr);
>
> --
> 2.31.1
>

2021-10-21 17:46:14

by Steven Rostedt

Subject: Re: [PATCH] tracing: Fix selftest config check for function graph start up test

On Thu, 21 Oct 2021 18:47:30 +0200
Jiri Olsa <[email protected]> wrote:

> oops, I assumed id depended on CONFIG_DYNAMIC_FTRACE,
> but did not check..

And I need to make a v2....

My cross compile tests are now failing :-/

/work/build/trace/nobackup/cross-linux.git/kernel/trace/trace_selftest.c:787:32: warning: 'trace_direct_tramp' defined but not used [-Wunused-function]


New patch on its way.

-- Steve