diff options
| author | Mark Wielaard <mjw@redhat.com> | 2009-06-03 15:36:03 +0200 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2009-06-03 15:36:03 +0200 |
| commit | 129de9ef18cd142e31ed509a7704d4faf0879f4c (patch) | |
| tree | 7c177716d871c8173a3b997581e2e9d3d18474ea /runtime/stack-i386.c | |
| parent | 987a37e77751d1a8aac0a0591c3b53fddf0de7cd (diff) | |
| download | systemtap-steved-129de9ef18cd142e31ed509a7704d4faf0879f4c.tar.gz systemtap-steved-129de9ef18cd142e31ed509a7704d4faf0879f4c.tar.xz systemtap-steved-129de9ef18cd142e31ed509a7704d4faf0879f4c.zip | |
Detect kretprobe trampoline and use fallback unwinder.
* runtime/sym.h (_stp_kretprobe_trampoline): Document.
* translate.cxx (unwindsym_dump_context): Add stp_kretprobe_trampoline_addr.
(dump_unwindsyms): Detect kretprobe_trampoline_holder symbol address.
(emit_symbol_data): Initialize and emit _stp_kretprobe_trampoline.
* runtime/transport/symbols.c (_stp_do_relocation): Detect kernel load
address and adjust _stp_kretprobe_trampoline.
* runtime/stack-i386.c (__stp_stack_print): Always use fallback unwinder
when hitting kretprobe_trampoline_holder.
* runtime/stack-x86_64.c (__stp_stack_print): Likewise.
Diffstat (limited to 'runtime/stack-i386.c')
| -rw-r--r-- | runtime/stack-i386.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/stack-i386.c b/runtime/stack-i386.c index 69623765..b447e495 100644 --- a/runtime/stack-i386.c +++ b/runtime/stack-i386.c @@ -67,14 +67,15 @@ static void __stp_stack_print (struct pt_regs *regs, int verbose, int levels, if (ret == 0) { _stp_func_print(UNW_PC(&info), verbose, 1, tsk); levels--; - continue; + if (UNW_PC(&info) != _stp_kretprobe_trampoline) + continue; } /* If an error happened or we hit a kretprobe trampoline, * use fallback backtrace, unless user task backtrace. * FIXME: is there a way to unwind across kretprobe - * trampolines? */ + * trampolines? PR9999. */ if ((ret < 0 - || (ret > 0 && UNW_PC(&info) == _stp_kretprobe_trampoline)) + || UNW_PC(&info) == _stp_kretprobe_trampoline) && ! (tsk || arch_unw_user_mode(&info))) _stp_stack_print_fallback(UNW_SP(&info), verbose, levels); return; |