All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] tracing: Fix selftest config check for function graph start up test
@ 2021-10-21 16:37 Steven Rostedt
  2021-10-21 16:47 ` Jiri Olsa
  0 siblings, 1 reply; 3+ messages in thread
From: Steven Rostedt @ 2021-10-21 16:37 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Andrew Morton, Jiri Olsa

From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

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

 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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] tracing: Fix selftest config check for function graph start up test
  2021-10-21 16:37 [PATCH] tracing: Fix selftest config check for function graph start up test Steven Rostedt
@ 2021-10-21 16:47 ` Jiri Olsa
  2021-10-21 17:41   ` Steven Rostedt
  0 siblings, 1 reply; 3+ messages in thread
From: Jiri Olsa @ 2021-10-21 16:47 UTC (permalink / raw)
  To: Steven Rostedt; +Cc: LKML, Ingo Molnar, Andrew Morton

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

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

Acked-by: Jiri Olsa <jolsa@redhat.com>

thanks,
jirka

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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] tracing: Fix selftest config check for function graph start up test
  2021-10-21 16:47 ` Jiri Olsa
@ 2021-10-21 17:41   ` Steven Rostedt
  0 siblings, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2021-10-21 17:41 UTC (permalink / raw)
  To: Jiri Olsa; +Cc: LKML, Ingo Molnar, Andrew Morton

On Thu, 21 Oct 2021 18:47:30 +0200
Jiri Olsa <jolsa@redhat.com> 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-10-21 17:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-21 16:37 [PATCH] tracing: Fix selftest config check for function graph start up test Steven Rostedt
2021-10-21 16:47 ` Jiri Olsa
2021-10-21 17:41   ` Steven Rostedt

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.