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

From: Jiri Olsa
Date: Thu Oct 21 2021 - 12:47:38 EST


On Thu, Oct 21, 2021 at 12:37:29PM -0400, Steven Rostedt wrote:
> From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx>
>
> 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) <rostedt@xxxxxxxxxxx>

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

Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>

thanks,
jirka

> ---
> Fixes this patch:
> https://lore.kernel.org/all/20211008091336.33616-5-jolsa@xxxxxxxxxx/
>
> 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
>