| Message ID | 20191223084614.67126-2-zong.li@sifive.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | RISC-V: fixes issues of ftrace graph tracer | expand |
On Mon, 23 Dec 2019, Zong Li wrote: > The condition should be logical NOT to assign the hook address to parent > address. Because the return value 0 of function_graph_enter upon > success. > > Fixes: e949b6db51dc (riscv/function_graph: Simplify with function_graph_enter()) > There shouldn't be a blank line here - I've removed it in the queued version. > Signed-off-by: Zong Li <zong.li@sifive.com> Thanks, queued for v5.5-rc. - Paul
diff --git a/arch/riscv/kernel/ftrace.c b/arch/riscv/kernel/ftrace.c index b94d8db5ddcc..c40fdcdeb950 100644 --- a/arch/riscv/kernel/ftrace.c +++ b/arch/riscv/kernel/ftrace.c @@ -142,7 +142,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, */ old = *parent; - if (function_graph_enter(old, self_addr, frame_pointer, parent)) + if (!function_graph_enter(old, self_addr, frame_pointer, parent)) *parent = return_hooker; }
The condition should be logical NOT to assign the hook address to parent address. Because the return value 0 of function_graph_enter upon success. Fixes: e949b6db51dc (riscv/function_graph: Simplify with function_graph_enter()) Signed-off-by: Zong Li <zong.li@sifive.com> --- arch/riscv/kernel/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)