| Message ID | 20220420160006.17880-1-zhouchengming@bytedance.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v5,1/2] ftrace: cleanup ftrace_graph_caller enable and disable | expand |
On Thu, Apr 21, 2022 at 12:00:05AM +0800, Chengming Zhou wrote: > The ftrace_[enable,disable]_ftrace_graph_caller() are used to do > special hooks for graph tracer, which are not needed on some ARCHs > that use graph_ops:func function to install return_hooker. > > So introduce the weak version in ftrace core code to cleanup > in x86. > > Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com> FWIW: Acked-by: Mark Rutland <mark.rutland@arm.com> Steve, are you happy if this goes via the arm64 tree along with patch 2? Thanks, Mark. > v4: > - put weak ftrace_enable,disable_ftrace_graph_caller() in > fgraph.c instead of ftrace.c as suggested by Steve. > > v3: > - consolidate two #if into a single #if, suggested by Steve. Thanks. > --- > arch/x86/kernel/ftrace.c | 17 ++--------------- > kernel/trace/fgraph.c | 18 ++++++++++++++++++ > 2 files changed, 20 insertions(+), 15 deletions(-) > > diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c > index 1e31c7d21597..b09d73c2ba89 100644 > --- a/arch/x86/kernel/ftrace.c > +++ b/arch/x86/kernel/ftrace.c > @@ -579,9 +579,7 @@ void arch_ftrace_trampoline_free(struct ftrace_ops *ops) > > #ifdef CONFIG_FUNCTION_GRAPH_TRACER > > -#ifdef CONFIG_DYNAMIC_FTRACE > - > -#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS > +#if defined(CONFIG_DYNAMIC_FTRACE) && !defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS) > extern void ftrace_graph_call(void); > static const char *ftrace_jmp_replace(unsigned long ip, unsigned long addr) > { > @@ -610,18 +608,7 @@ int ftrace_disable_ftrace_graph_caller(void) > > return ftrace_mod_jmp(ip, &ftrace_stub); > } > -#else /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ > -int ftrace_enable_ftrace_graph_caller(void) > -{ > - return 0; > -} > - > -int ftrace_disable_ftrace_graph_caller(void) > -{ > - return 0; > -} > -#endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ > -#endif /* !CONFIG_DYNAMIC_FTRACE */ > +#endif /* CONFIG_DYNAMIC_FTRACE && !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ > > /* > * Hook the return address and push it in the stack of return addrs > diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c > index 8f4fb328133a..289311680c29 100644 > --- a/kernel/trace/fgraph.c > +++ b/kernel/trace/fgraph.c > @@ -30,6 +30,24 @@ int ftrace_graph_active; > /* Both enabled by default (can be cleared by function_graph tracer flags */ > static bool fgraph_sleep_time = true; > > +/* > + * archs can override this function if they must do something > + * to enable hook for graph tracer. > + */ > +int __weak ftrace_enable_ftrace_graph_caller(void) > +{ > + return 0; > +} > + > +/* > + * archs can override this function if they must do something > + * to disable hook for graph tracer. > + */ > +int __weak ftrace_disable_ftrace_graph_caller(void) > +{ > + return 0; > +} > + > /** > * ftrace_graph_stop - set to permanently disable function graph tracing > * > -- > 2.35.2 >
On Mon, 25 Apr 2022 10:51:19 +0100 Mark Rutland <mark.rutland@arm.com> wrote: > Steve, are you happy if this goes via the arm64 tree along with patch 2? Yeah, go ahead. Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org> -- Steve
On Mon, Apr 25, 2022 at 09:27:07PM -0400, Steven Rostedt wrote: > On Mon, 25 Apr 2022 10:51:19 +0100 > Mark Rutland <mark.rutland@arm.com> wrote: > > > Steve, are you happy if this goes via the arm64 tree along with patch 2? > > Yeah, go ahead. > > Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org> Thanks! Catalin, could you please pick these two? Thanks, Mark.
On Thu, 21 Apr 2022 00:00:05 +0800, Chengming Zhou wrote: > The ftrace_[enable,disable]_ftrace_graph_caller() are used to do > special hooks for graph tracer, which are not needed on some ARCHs > that use graph_ops:func function to install return_hooker. > > So introduce the weak version in ftrace core code to cleanup > in x86. > > [...] Applied to arm64 (for-next/ftrace), thanks! [1/2] ftrace: cleanup ftrace_graph_caller enable and disable https://git.kernel.org/arm64/c/e999995c84c3 [2/2] arm64/ftrace: Make function graph use ftrace directly https://git.kernel.org/arm64/c/c4a0ebf87ceb
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 1e31c7d21597..b09d73c2ba89 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -579,9 +579,7 @@ void arch_ftrace_trampoline_free(struct ftrace_ops *ops) #ifdef CONFIG_FUNCTION_GRAPH_TRACER -#ifdef CONFIG_DYNAMIC_FTRACE - -#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS +#if defined(CONFIG_DYNAMIC_FTRACE) && !defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS) extern void ftrace_graph_call(void); static const char *ftrace_jmp_replace(unsigned long ip, unsigned long addr) { @@ -610,18 +608,7 @@ int ftrace_disable_ftrace_graph_caller(void) return ftrace_mod_jmp(ip, &ftrace_stub); } -#else /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ -int ftrace_enable_ftrace_graph_caller(void) -{ - return 0; -} - -int ftrace_disable_ftrace_graph_caller(void) -{ - return 0; -} -#endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ -#endif /* !CONFIG_DYNAMIC_FTRACE */ +#endif /* CONFIG_DYNAMIC_FTRACE && !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ /* * Hook the return address and push it in the stack of return addrs diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c index 8f4fb328133a..289311680c29 100644 --- a/kernel/trace/fgraph.c +++ b/kernel/trace/fgraph.c @@ -30,6 +30,24 @@ int ftrace_graph_active; /* Both enabled by default (can be cleared by function_graph tracer flags */ static bool fgraph_sleep_time = true; +/* + * archs can override this function if they must do something + * to enable hook for graph tracer. + */ +int __weak ftrace_enable_ftrace_graph_caller(void) +{ + return 0; +} + +/* + * archs can override this function if they must do something + * to disable hook for graph tracer. + */ +int __weak ftrace_disable_ftrace_graph_caller(void) +{ + return 0; +} + /** * ftrace_graph_stop - set to permanently disable function graph tracing *
The ftrace_[enable,disable]_ftrace_graph_caller() are used to do special hooks for graph tracer, which are not needed on some ARCHs that use graph_ops:func function to install return_hooker. So introduce the weak version in ftrace core code to cleanup in x86. Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com> --- v4: - put weak ftrace_enable,disable_ftrace_graph_caller() in fgraph.c instead of ftrace.c as suggested by Steve. v3: - consolidate two #if into a single #if, suggested by Steve. Thanks. --- arch/x86/kernel/ftrace.c | 17 ++--------------- kernel/trace/fgraph.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 15 deletions(-)