diff options
| author | Tim Moore <timoore@redhat.com> | 2009-12-16 18:04:34 +0100 |
|---|---|---|
| committer | Tim Moore <timoore@redhat.com> | 2009-12-17 16:10:14 +0100 |
| commit | 4c5ce7a55108edb5203b3d69949f09c2284f1963 (patch) | |
| tree | 5498ae9264990b49c6721141f2fa77bd140cb4d5 /runtime/stack-i386.c | |
| parent | 2e7f844220b9419b2f05234b07c56bcdedf7afb2 (diff) | |
| download | systemtap-steved-4c5ce7a55108edb5203b3d69949f09c2284f1963.tar.gz systemtap-steved-4c5ce7a55108edb5203b3d69949f09c2284f1963.tar.xz systemtap-steved-4c5ce7a55108edb5203b3d69949f09c2284f1963.zip | |
backtrace through uprobes trampoline.
Only works in uretprobes for the moment.
* runtime/stack-x86_64.c (__stp_stack_print): Rewrite trampoline PC
addresses if necessary.
* runtime/stack-i386.c (__stp_stack_print): ditto
* runtime/stack-arm.c (__stp_stack_print): Add extra argument
* runtime/stack-ppc.c (__stp_stack_print): ditto
* runtime/stack-s390.c (__stp_stack_print): ditto
* runtime/stack.c (_stap_stack_print): call __stp_stack_print with
uretprobe_instance.
* testsuite/systemtap.context/uprobe_backtrace.stp: new test
Diffstat (limited to 'runtime/stack-i386.c')
| -rw-r--r-- | runtime/stack-i386.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/runtime/stack-i386.c b/runtime/stack-i386.c index b447e495..fef11871 100644 --- a/runtime/stack-i386.c +++ b/runtime/stack-i386.c @@ -31,7 +31,7 @@ static void _stp_stack_print_fallback(unsigned long stack, int verbose, int leve #endif static void __stp_stack_print (struct pt_regs *regs, int verbose, int levels, - struct task_struct *tsk) + struct task_struct *tsk, struct uretprobe_instance *ri) { unsigned long context = (unsigned long)®_SP(regs) & ~(THREAD_SIZE - 1); @@ -63,6 +63,15 @@ static void __stp_stack_print (struct pt_regs *regs, int verbose, int levels, while (levels && (tsk || !arch_unw_user_mode(&info))) { int ret = unwind(&info, tsk); + unsigned long maybe_pc = 0; + if (ri) { + maybe_pc = uprobe_get_pc(ri, UNW_PC(&info), + UNW_SP(&info)); + if (!maybe_pc) + printk("SYSTEMTAP ERROR: uprobe_get_return returned 0\n"); + else + UNW_PC(&info) = maybe_pc; + } dbug_unwind(1, "ret=%d PC=%lx SP=%lx\n", ret, UNW_PC(&info), UNW_SP(&info)); if (ret == 0) { _stp_func_print(UNW_PC(&info), verbose, 1, tsk); |