| Message ID | 9358c81e47f9d395d90691f77f50feaf20be963e.1621577151.git.naveen.n.rao@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
| Series | powerpc: Stack tracer fixes | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (258eb1f3aaa9face35e613c229c1337263491ea0) |
| snowpatch_ozlabs/checkpatch | warning | total: 0 errors, 2 warnings, 0 checks, 9 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 89e34aa273e21a..9df1d44939bec1 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -2160,6 +2160,9 @@ void show_stack(struct task_struct *tsk, unsigned long *stack, &ftrace_idx, ip, stack); if (ret_addr != ip) pr_cont(" (%pS)", (void *)ret_addr); + ip = ftrace_get_traced_func_if_no_stackframe(ip, stack); + if (ip) + pr_cont(" (%pS)", (void *)ip); if (firstframe) pr_cont(" (unreliable)"); pr_cont("\n");
With -mprofile-kernel and ppc32, the function tracer is invoked before a function sets up its own stackframe. This results in the traced function not appearing in stack traces. Fix this by checking for ftrace entry and including the traced function in the stack trace. With this patch, stack traces show the function traced next to the ftrace entry: NIP [c0080000003700d4] handler_pre+0x1c/0x5c [kprobe_example] LR [c00000000006c118] kprobe_ftrace_handler+0x1b8/0x270 Call Trace: [c00000001ed7fa50] [c00000001ed7faa0] 0xc00000001ed7faa0 (unreliable) [c00000001ed7fab0] [c00000000006c118] kprobe_ftrace_handler+0x1b8/0x270 [c00000001ed7fb00] [c000000000076604] ftrace_regs_call+0x4/0xa4 (kernel_clone+0xc/0x600) ^^^^^^^^^^^^^^^^^^^^^^^^ [c00000001ed7fcf0] [c000000000139e08] __do_sys_clone+0x88/0xd0 [c00000001ed7fdb0] [c00000000002b6c4] system_call_exception+0xf4/0x200 [c00000001ed7fe10] [c00000000000ca5c] system_call_common+0xec/0x278 Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> --- arch/powerpc/kernel/process.c | 3 +++ 1 file changed, 3 insertions(+)