Skip to content

Commit

Permalink
nds32: function_graph: Simplify with function_graph_enter()
Browse files Browse the repository at this point in the history
commit d48ebb2 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 nds32 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: Greentime Hu <greentime@andestech.com>
Cc: stable@kernel.org
Fixes: 03274a3 ("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>
  • Loading branch information
rostedt authored and gregkh committed Dec 5, 2018
1 parent 2176149 commit 25ac02d
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions arch/nds32/kernel/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,29 +211,15 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,
unsigned long frame_pointer)
{
unsigned long return_hooker = (unsigned long)&return_to_handler;
struct ftrace_graph_ent trace;
unsigned long old;
int err;

if (unlikely(atomic_read(&current->tracing_graph_pause)))
return;

old = *parent;

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;

err = ftrace_push_return_trace(old, self_addr, &trace.depth,
frame_pointer, NULL);

if (err == -EBUSY)
return;

*parent = return_hooker;
if (!function_graph_enter(old, self_addr, frame_pointer, NULL))
*parent = return_hooker;
}

noinline void ftrace_graph_caller(void)
Expand Down

0 comments on commit 25ac02d

Please sign in to comment.