diff options
author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2018-11-18 17:37:40 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-05 19:32:10 +0100 |
commit | 34773b2f57ae9ef9953c66cfaf34b4cbaf18f981 (patch) | |
tree | cddaa32d71c3ae522a031323dbf95cd1f8988f1e /arch/sparc | |
parent | 56c1dd92c0fc2cc5bdaf66a9fb2dbe4848c4acf0 (diff) | |
download | linux-stable-34773b2f57ae9ef9953c66cfaf34b4cbaf18f981.tar.gz linux-stable-34773b2f57ae9ef9953c66cfaf34b4cbaf18f981.tar.bz2 linux-stable-34773b2f57ae9ef9953c66cfaf34b4cbaf18f981.zip |
sparc/function_graph: Simplify with function_graph_enter()
commit 9c4bf5e0db164f330a2d3e128e9832661f69f0e9 upstream.
The function_graph_enter() function does the work of calling the function
graph hook function and the management of the shadow stack, simplifying the
work done in the architecture dependent prepare_ftrace_return().
Have sparc use the new code, and remove the shadow stack management as well as
having to set up the trace structure.
This is needed to prepare for a fix of a design bug on how the curr_ret_stack
is used.
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Cc: stable@kernel.org
Fixes: 03274a3ffb449 ("tracing/fgraph: Adjust fgraph depth before calling trace return callback")
Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/ftrace.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/sparc/kernel/ftrace.c b/arch/sparc/kernel/ftrace.c index 915dda4ae412..684b84ce397f 100644 --- a/arch/sparc/kernel/ftrace.c +++ b/arch/sparc/kernel/ftrace.c @@ -126,20 +126,11 @@ unsigned long prepare_ftrace_return(unsigned long parent, unsigned long frame_pointer) { unsigned long return_hooker = (unsigned long) &return_to_handler; - struct ftrace_graph_ent trace; if (unlikely(atomic_read(¤t->tracing_graph_pause))) return parent + 8UL; - trace.func = self_addr; - trace.depth = current->curr_ret_stack + 1; - - /* Only trace if the calling function expects to */ - if (!ftrace_graph_entry(&trace)) - return parent + 8UL; - - if (ftrace_push_return_trace(parent, self_addr, &trace.depth, - frame_pointer, NULL) == -EBUSY) + if (function_graph_enter(parent, self_addr, frame_pointer, NULL)) return parent + 8UL; return return_hooker; |