From: Masami Hiramatsu <mhiramat@kernel.org> To: Steven Rostedt <rostedt@goodmis.org>, Josh Poimboeuf <jpoimboe@redhat.com>, Ingo Molnar <mingo@kernel.org> Cc: X86 ML <x86@kernel.org>, Masami Hiramatsu <mhiramat@kernel.org>, Daniel Xu <dxu@dxuuu.xyz>, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, kuba@kernel.org, mingo@redhat.com, ast@kernel.org, Thomas Gleixner <tglx@linutronix.de>, Borislav Petkov <bp@alien8.de>, Peter Zijlstra <peterz@infradead.org>, kernel-team@fb.com, yhs@fb.com, linux-ia64@vger.kernel.org, Abhishek Sagar <sagar.abhishek@gmail.com>, Andrii Nakryiko <andrii.nakryiko@gmail.com> Subject: [PATCH -tip v10 00/16] kprobes: Fix stacktrace with kretprobes on x86 Date: Thu, 29 Jul 2021 23:05:56 +0900 [thread overview] Message-ID: <162756755600.301564.4957591913842010341.stgit@devnote2> (raw) Hello, This is the 10th version of the series to fix the stacktrace with kretprobe on x86. The previous version is here; https://lore.kernel.org/bpf/162601048053.1318837.1550594515476777588.stgit@devnote2/ This version is rebased on top of new kprobes cleanup series(*1) and merging Josh's objtool update series (*2)(*3) as [6/16] and [7/16]. (*1) https://lore.kernel.org/bpf/162748615977.59465.13262421617578791515.stgit@devnote2/ (*2) https://lore.kernel.org/bpf/20210710192433.x5cgjsq2ksvaqnss@treble/ (*3) https://lore.kernel.org/bpf/20210710192514.ghvksi3ozhez4lvb@treble/ Changes from v9: - Add Josh's objtool update patches with a build error fix as [6/16] and [7/16]. - Add a API document for kretprobe_find_ret_addr() and check cur != NULL in [5/16]. With this series, unwinder can unwind stack correctly from ftrace as below; # cd /sys/kernel/debug/tracing # echo > trace # echo 1 > options/sym-offset # echo r vfs_read >> kprobe_events # echo r full_proxy_read >> kprobe_events # echo traceoff:1 > events/kprobes/r_vfs_read_0/trigger # echo stacktrace:1 > events/kprobes/r_full_proxy_read_0/trigger # echo 1 > events/kprobes/enable # cat /sys/kernel/debug/kprobes/list ffffffff8133b740 r full_proxy_read+0x0 [FTRACE] ffffffff812560b0 r vfs_read+0x0 [FTRACE] # echo 0 > events/kprobes/enable # cat trace # tracer: nop # # entries-in-buffer/entries-written: 3/3 #P:8 # # _-----=> irqs-off # / _----=> need-resched # | / _---=> hardirq/softirq # || / _--=> preempt-depth # ||| / delay # TASK-PID CPU# |||| TIMESTAMP FUNCTION # | | | |||| | | <...>-134 [007] ...1 16.185877: r_full_proxy_read_0: (vfs_read+0x98/0x180 <- full_proxy_read) <...>-134 [007] ...1 16.185901: <stack trace> => kretprobe_trace_func+0x209/0x300 => kretprobe_dispatcher+0x4a/0x70 => __kretprobe_trampoline_handler+0xd4/0x170 => trampoline_handler+0x43/0x60 => kretprobe_trampoline+0x2a/0x50 => vfs_read+0x98/0x180 => ksys_read+0x5f/0xe0 => do_syscall_64+0x37/0x90 => entry_SYSCALL_64_after_hwframe+0x44/0xae <...>-134 [007] ...1 16.185902: r_vfs_read_0: (ksys_read+0x5f/0xe0 <- vfs_read) This shows the double return probes (vfs_read() and full_proxy_read()) on the stack correctly unwinded. (vfs_read() returns to 'ksys_read+0x5f' and full_proxy_read() returns to 'vfs_read+0x98') This also changes the kretprobe behavisor a bit, now the instraction pointer in the 'pt_regs' passed to kretprobe user handler is correctly set the real return address. So user handlers can get it via instruction_pointer() API, and can use stack_trace_save_regs(). You can also get this series from git://git.kernel.org/pub/scm/linux/kernel/git/mhiramat/linux.git kprobes/kretprobe-stackfix-v9 Thank you, --- Josh Poimboeuf (3): objtool: Add frame-pointer-specific function ignore objtool: Ignore unwind hints for ignored functions x86/kprobes: Add UNWIND_HINT_FUNC on kretprobe_trampoline() Masami Hiramatsu (13): ia64: kprobes: Fix to pass correct trampoline address to the handler kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_descriptor() kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() kprobes: treewide: Make it harder to refer kretprobe_trampoline directly kprobes: Add kretprobe_find_ret_addr() for searching return address ARC: Add instruction_pointer_set() API ia64: Add instruction_pointer_set() API arm: kprobes: Make space for instruction pointer on stack kprobes: Enable stacktrace from pt_regs in kretprobe handler x86/kprobes: Push a fake return address at kretprobe_trampoline x86/unwind: Recover kretprobe trampoline entry tracing: Show kretprobe unknown indicator only for kretprobe_trampoline x86/kprobes: Fixup return address in generic trampoline handler arch/arc/include/asm/kprobes.h | 2 arch/arc/include/asm/ptrace.h | 5 + arch/arc/kernel/kprobes.c | 13 +- arch/arm/probes/kprobes/core.c | 11 +- arch/arm64/include/asm/kprobes.h | 2 arch/arm64/kernel/probes/kprobes.c | 5 - arch/arm64/kernel/probes/kprobes_trampoline.S | 4 - arch/csky/include/asm/kprobes.h | 2 arch/csky/kernel/probes/kprobes.c | 4 - arch/csky/kernel/probes/kprobes_trampoline.S | 4 - arch/ia64/include/asm/ptrace.h | 5 + arch/ia64/kernel/kprobes.c | 15 +-- arch/mips/kernel/kprobes.c | 15 +-- arch/parisc/kernel/kprobes.c | 6 + arch/powerpc/include/asm/kprobes.h | 2 arch/powerpc/kernel/kprobes.c | 29 ++--- arch/powerpc/kernel/optprobes.c | 2 arch/powerpc/kernel/stacktrace.c | 2 arch/riscv/include/asm/kprobes.h | 2 arch/riscv/kernel/probes/kprobes.c | 4 - arch/riscv/kernel/probes/kprobes_trampoline.S | 4 - arch/s390/include/asm/kprobes.h | 2 arch/s390/kernel/kprobes.c | 12 +- arch/s390/kernel/stacktrace.c | 2 arch/sh/include/asm/kprobes.h | 2 arch/sh/kernel/kprobes.c | 12 +- arch/sparc/include/asm/kprobes.h | 2 arch/sparc/kernel/kprobes.c | 12 +- arch/x86/include/asm/kprobes.h | 1 arch/x86/include/asm/unwind.h | 23 ++++ arch/x86/include/asm/unwind_hints.h | 5 + arch/x86/kernel/kprobes/core.c | 71 ++++++++++--- arch/x86/kernel/unwind_frame.c | 3 - arch/x86/kernel/unwind_guess.c | 3 - arch/x86/kernel/unwind_orc.c | 21 +++- include/linux/kprobes.h | 44 +++++++- include/linux/objtool.h | 12 ++ kernel/kprobes.c | 133 +++++++++++++++++++------ kernel/trace/trace_output.c | 17 +-- lib/error-inject.c | 3 - tools/include/linux/objtool.h | 12 ++ tools/objtool/check.c | 2 42 files changed, 360 insertions(+), 172 deletions(-) -- Masami Hiramatsu (Linaro) <mhiramat@kernel.org>
WARNING: multiple messages have this Message-ID (diff)
From: Masami Hiramatsu <mhiramat@kernel.org> To: Steven Rostedt <rostedt@goodmis.org>, Josh Poimboeuf <jpoimboe@redhat.com>, Ingo Molnar <mingo@kernel.org> Cc: X86 ML <x86@kernel.org>, Masami Hiramatsu <mhiramat@kernel.org>, Daniel Xu <dxu@dxuuu.xyz>, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, kuba@kernel.org, mingo@redhat.com, ast@kernel.org, Thomas Gleixner <tglx@linutronix.de>, Borislav Petkov <bp@alien8.de>, Peter Zijlstra <peterz@infradead.org>, kernel-team@fb.com, yhs@fb.com, linux-ia64@vger.kernel.org, Abhishek Sagar <sagar.abhishek@gmail.com>, Andrii Nakryiko <andrii.nakryiko@gmail.com> Subject: [PATCH -tip v10 00/16] kprobes: Fix stacktrace with kretprobes on x86 Date: Thu, 29 Jul 2021 14:05:56 +0000 [thread overview] Message-ID: <162756755600.301564.4957591913842010341.stgit@devnote2> (raw) Hello, This is the 10th version of the series to fix the stacktrace with kretprobe on x86. The previous version is here; https://lore.kernel.org/bpf/162601048053.1318837.1550594515476777588.stgit@devnote2/ This version is rebased on top of new kprobes cleanup series(*1) and merging Josh's objtool update series (*2)(*3) as [6/16] and [7/16]. (*1) https://lore.kernel.org/bpf/162748615977.59465.13262421617578791515.stgit@devnote2/ (*2) https://lore.kernel.org/bpf/20210710192433.x5cgjsq2ksvaqnss@treble/ (*3) https://lore.kernel.org/bpf/20210710192514.ghvksi3ozhez4lvb@treble/ Changes from v9: - Add Josh's objtool update patches with a build error fix as [6/16] and [7/16]. - Add a API document for kretprobe_find_ret_addr() and check cur != NULL in [5/16]. With this series, unwinder can unwind stack correctly from ftrace as below; # cd /sys/kernel/debug/tracing # echo > trace # echo 1 > options/sym-offset # echo r vfs_read >> kprobe_events # echo r full_proxy_read >> kprobe_events # echo traceoff:1 > events/kprobes/r_vfs_read_0/trigger # echo stacktrace:1 > events/kprobes/r_full_proxy_read_0/trigger # echo 1 > events/kprobes/enable # cat /sys/kernel/debug/kprobes/list ffffffff8133b740 r full_proxy_read+0x0 [FTRACE] ffffffff812560b0 r vfs_read+0x0 [FTRACE] # echo 0 > events/kprobes/enable # cat trace # tracer: nop # # entries-in-buffer/entries-written: 3/3 #P:8 # # _-----=> irqs-off # / _----=> need-resched # | / _---=> hardirq/softirq # || / _--=> preempt-depth # ||| / delay # TASK-PID CPU# |||| TIMESTAMP FUNCTION # | | | |||| | | <...>-134 [007] ...1 16.185877: r_full_proxy_read_0: (vfs_read+0x98/0x180 <- full_proxy_read) <...>-134 [007] ...1 16.185901: <stack trace> => kretprobe_trace_func+0x209/0x300 => kretprobe_dispatcher+0x4a/0x70 => __kretprobe_trampoline_handler+0xd4/0x170 => trampoline_handler+0x43/0x60 => kretprobe_trampoline+0x2a/0x50 => vfs_read+0x98/0x180 => ksys_read+0x5f/0xe0 => do_syscall_64+0x37/0x90 => entry_SYSCALL_64_after_hwframe+0x44/0xae <...>-134 [007] ...1 16.185902: r_vfs_read_0: (ksys_read+0x5f/0xe0 <- vfs_read) This shows the double return probes (vfs_read() and full_proxy_read()) on the stack correctly unwinded. (vfs_read() returns to 'ksys_read+0x5f' and full_proxy_read() returns to 'vfs_read+0x98') This also changes the kretprobe behavisor a bit, now the instraction pointer in the 'pt_regs' passed to kretprobe user handler is correctly set the real return address. So user handlers can get it via instruction_pointer() API, and can use stack_trace_save_regs(). You can also get this series from git://git.kernel.org/pub/scm/linux/kernel/git/mhiramat/linux.git kprobes/kretprobe-stackfix-v9 Thank you, --- Josh Poimboeuf (3): objtool: Add frame-pointer-specific function ignore objtool: Ignore unwind hints for ignored functions x86/kprobes: Add UNWIND_HINT_FUNC on kretprobe_trampoline() Masami Hiramatsu (13): ia64: kprobes: Fix to pass correct trampoline address to the handler kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_descriptor() kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() kprobes: treewide: Make it harder to refer kretprobe_trampoline directly kprobes: Add kretprobe_find_ret_addr() for searching return address ARC: Add instruction_pointer_set() API ia64: Add instruction_pointer_set() API arm: kprobes: Make space for instruction pointer on stack kprobes: Enable stacktrace from pt_regs in kretprobe handler x86/kprobes: Push a fake return address at kretprobe_trampoline x86/unwind: Recover kretprobe trampoline entry tracing: Show kretprobe unknown indicator only for kretprobe_trampoline x86/kprobes: Fixup return address in generic trampoline handler arch/arc/include/asm/kprobes.h | 2 arch/arc/include/asm/ptrace.h | 5 + arch/arc/kernel/kprobes.c | 13 +- arch/arm/probes/kprobes/core.c | 11 +- arch/arm64/include/asm/kprobes.h | 2 arch/arm64/kernel/probes/kprobes.c | 5 - arch/arm64/kernel/probes/kprobes_trampoline.S | 4 - arch/csky/include/asm/kprobes.h | 2 arch/csky/kernel/probes/kprobes.c | 4 - arch/csky/kernel/probes/kprobes_trampoline.S | 4 - arch/ia64/include/asm/ptrace.h | 5 + arch/ia64/kernel/kprobes.c | 15 +-- arch/mips/kernel/kprobes.c | 15 +-- arch/parisc/kernel/kprobes.c | 6 + arch/powerpc/include/asm/kprobes.h | 2 arch/powerpc/kernel/kprobes.c | 29 ++--- arch/powerpc/kernel/optprobes.c | 2 arch/powerpc/kernel/stacktrace.c | 2 arch/riscv/include/asm/kprobes.h | 2 arch/riscv/kernel/probes/kprobes.c | 4 - arch/riscv/kernel/probes/kprobes_trampoline.S | 4 - arch/s390/include/asm/kprobes.h | 2 arch/s390/kernel/kprobes.c | 12 +- arch/s390/kernel/stacktrace.c | 2 arch/sh/include/asm/kprobes.h | 2 arch/sh/kernel/kprobes.c | 12 +- arch/sparc/include/asm/kprobes.h | 2 arch/sparc/kernel/kprobes.c | 12 +- arch/x86/include/asm/kprobes.h | 1 arch/x86/include/asm/unwind.h | 23 ++++ arch/x86/include/asm/unwind_hints.h | 5 + arch/x86/kernel/kprobes/core.c | 71 ++++++++++--- arch/x86/kernel/unwind_frame.c | 3 - arch/x86/kernel/unwind_guess.c | 3 - arch/x86/kernel/unwind_orc.c | 21 +++- include/linux/kprobes.h | 44 +++++++- include/linux/objtool.h | 12 ++ kernel/kprobes.c | 133 +++++++++++++++++++------ kernel/trace/trace_output.c | 17 +-- lib/error-inject.c | 3 - tools/include/linux/objtool.h | 12 ++ tools/objtool/check.c | 2 42 files changed, 360 insertions(+), 172 deletions(-) -- Masami Hiramatsu (Linaro) <mhiramat@kernel.org>
next reply other threads:[~2021-07-29 14:11 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-29 14:05 Masami Hiramatsu [this message] 2021-07-29 14:05 ` [PATCH -tip v10 00/16] kprobes: Fix stacktrace with kretprobes on x86 Masami Hiramatsu 2021-07-29 14:06 ` [PATCH -tip v10 01/16] ia64: kprobes: Fix to pass correct trampoline address to the handler Masami Hiramatsu 2021-07-29 14:06 ` Masami Hiramatsu 2021-07-29 14:06 ` [PATCH -tip v10 02/16] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_descriptor() Masami Hiramatsu 2021-07-29 14:06 ` [PATCH -tip v10 02/16] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_d Masami Hiramatsu 2021-07-29 14:06 ` [PATCH -tip v10 03/16] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() Masami Hiramatsu 2021-07-29 14:06 ` [PATCH -tip v10 03/16] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handle Masami Hiramatsu 2021-07-29 14:06 ` [PATCH -tip v10 04/16] kprobes: treewide: Make it harder to refer kretprobe_trampoline directly Masami Hiramatsu 2021-07-29 14:06 ` Masami Hiramatsu 2021-07-29 14:06 ` [PATCH -tip v10 05/16] kprobes: Add kretprobe_find_ret_addr() for searching return address Masami Hiramatsu 2021-07-29 14:06 ` Masami Hiramatsu 2021-07-29 14:06 ` [PATCH -tip v10 06/16] objtool: Add frame-pointer-specific function ignore Masami Hiramatsu 2021-07-29 14:06 ` Masami Hiramatsu 2021-07-29 14:07 ` [PATCH -tip v10 07/16] objtool: Ignore unwind hints for ignored functions Masami Hiramatsu 2021-07-29 14:07 ` Masami Hiramatsu 2021-07-29 14:07 ` [PATCH -tip v10 08/16] x86/kprobes: Add UNWIND_HINT_FUNC on kretprobe_trampoline() Masami Hiramatsu 2021-07-29 14:07 ` Masami Hiramatsu 2021-07-29 14:07 ` [PATCH -tip v10 09/16] ARC: Add instruction_pointer_set() API Masami Hiramatsu 2021-07-29 14:07 ` Masami Hiramatsu 2021-07-29 14:07 ` [PATCH -tip v10 10/16] ia64: " Masami Hiramatsu 2021-07-29 14:07 ` Masami Hiramatsu 2021-07-29 14:07 ` [PATCH -tip v10 11/16] arm: kprobes: Make space for instruction pointer on stack Masami Hiramatsu 2021-07-29 14:07 ` Masami Hiramatsu 2021-07-29 14:07 ` [PATCH -tip v10 12/16] kprobes: Enable stacktrace from pt_regs in kretprobe handler Masami Hiramatsu 2021-07-29 14:07 ` Masami Hiramatsu 2021-07-29 14:07 ` [PATCH -tip v10 13/16] x86/kprobes: Push a fake return address at kretprobe_trampoline Masami Hiramatsu 2021-07-29 14:07 ` Masami Hiramatsu 2021-07-29 14:08 ` [PATCH -tip v10 14/16] x86/unwind: Recover kretprobe trampoline entry Masami Hiramatsu 2021-07-29 14:08 ` Masami Hiramatsu 2021-07-29 14:08 ` [PATCH -tip v10 15/16] tracing: Show kretprobe unknown indicator only for kretprobe_trampoline Masami Hiramatsu 2021-07-29 14:08 ` Masami Hiramatsu 2021-07-29 14:08 ` [PATCH -tip v10 16/16] x86/kprobes: Fixup return address in generic trampoline handler Masami Hiramatsu 2021-07-29 14:08 ` Masami Hiramatsu 2021-07-29 23:35 ` [PATCH -tip v10 00/16] kprobes: Fix stacktrace with kretprobes on x86 Masami Hiramatsu 2021-07-29 23:35 ` Masami Hiramatsu 2021-08-24 5:12 ` Andrii Nakryiko 2021-08-24 5:12 ` Andrii Nakryiko 2021-08-24 5:32 ` Masami Hiramatsu 2021-08-24 5:32 ` Masami Hiramatsu 2021-09-13 17:14 ` Andrii Nakryiko 2021-09-13 17:14 ` Andrii Nakryiko 2021-09-14 0:38 ` Masami Hiramatsu 2021-09-14 0:38 ` Masami Hiramatsu 2021-09-14 1:36 ` Andrii Nakryiko 2021-09-14 1:36 ` Andrii Nakryiko 2021-09-14 5:10 ` Masami Hiramatsu 2021-09-14 5:10 ` Masami Hiramatsu 2021-08-29 14:22 ` [RFC PATCH 0/1] Non stack-intrusive return probe event Masami Hiramatsu 2021-08-29 14:22 ` Masami Hiramatsu 2021-08-29 14:22 ` [RFC PATCH 1/1] [PoC] tracing: kprobe: Add non-stack intrusion " Masami Hiramatsu 2021-08-29 14:22 ` Masami Hiramatsu 2021-08-30 19:04 ` [RFC PATCH 0/1] Non stack-intrusive " Andrii Nakryiko 2021-08-30 19:04 ` Andrii Nakryiko 2021-08-31 6:06 ` Masami Hiramatsu 2021-08-31 6:06 ` Masami Hiramatsu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=162756755600.301564.4957591913842010341.stgit@devnote2 \ --to=mhiramat@kernel.org \ --cc=andrii.nakryiko@gmail.com \ --cc=ast@kernel.org \ --cc=bp@alien8.de \ --cc=bpf@vger.kernel.org \ --cc=dxu@dxuuu.xyz \ --cc=jpoimboe@redhat.com \ --cc=kernel-team@fb.com \ --cc=kuba@kernel.org \ --cc=linux-ia64@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@kernel.org \ --cc=mingo@redhat.com \ --cc=peterz@infradead.org \ --cc=rostedt@goodmis.org \ --cc=sagar.abhishek@gmail.com \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ --cc=yhs@fb.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.