From: Masami Hiramatsu <mhiramat@kernel.org> To: Steven Rostedt <rostedt@goodmis.org>, 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, tglx@linutronix.de, kernel-team@fb.com, yhs@fb.com, Josh Poimboeuf <jpoimboe@redhat.com>, linux-ia64@vger.kernel.org, Abhishek Sagar <sagar.abhishek@gmail.com>, Andrii Nakryiko <andrii.nakryiko@gmail.com> Subject: [PATCH -tip v7 12/13] tracing: Show kretprobe unknown indicator only for kretprobe_trampoline Date: Thu, 27 May 2021 15:40:57 +0900 [thread overview] Message-ID: <162209765751.436794.17923326412681624558.stgit@devnote2> (raw) In-Reply-To: <162209754288.436794.3904335049560916855.stgit@devnote2> ftrace shows "[unknown/kretprobe'd]" indicator all addresses in the kretprobe_trampoline, but the modified address by kretprobe should be only kretprobe_trampoline+0. Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Tested-by: Andrii Nakryik <andrii@kernel.org> --- kernel/trace/trace_output.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index d0368a569bfa..e46780670742 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -8,6 +8,7 @@ #include <linux/module.h> #include <linux/mutex.h> #include <linux/ftrace.h> +#include <linux/kprobes.h> #include <linux/sched/clock.h> #include <linux/sched/mm.h> @@ -346,22 +347,12 @@ int trace_output_call(struct trace_iterator *iter, char *name, char *fmt, ...) } EXPORT_SYMBOL_GPL(trace_output_call); -#ifdef CONFIG_KRETPROBES -static inline const char *kretprobed(const char *name) +static inline const char *kretprobed(const char *name, unsigned long addr) { - static const char tramp_name[] = "kretprobe_trampoline"; - int size = sizeof(tramp_name); - - if (strncmp(tramp_name, name, size) == 0) + if (is_kretprobe_trampoline(addr)) return "[unknown/kretprobe'd]"; return name; } -#else -static inline const char *kretprobed(const char *name) -{ - return name; -} -#endif /* CONFIG_KRETPROBES */ void trace_seq_print_sym(struct trace_seq *s, unsigned long address, bool offset) @@ -374,7 +365,7 @@ trace_seq_print_sym(struct trace_seq *s, unsigned long address, bool offset) sprint_symbol(str, address); else kallsyms_lookup(address, NULL, NULL, NULL, str); - name = kretprobed(str); + name = kretprobed(str, address); if (name && strlen(name)) { trace_seq_puts(s, name);
WARNING: multiple messages have this Message-ID (diff)
From: Masami Hiramatsu <mhiramat@kernel.org> To: Steven Rostedt <rostedt@goodmis.org>, 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, tglx@linutronix.de, kernel-team@fb.com, yhs@fb.com, Josh Poimboeuf <jpoimboe@redhat.com>, linux-ia64@vger.kernel.org, Abhishek Sagar <sagar.abhishek@gmail.com>, Andrii Nakryiko <andrii.nakryiko@gmail.com> Subject: [PATCH -tip v7 12/13] tracing: Show kretprobe unknown indicator only for kretprobe_trampoline Date: Thu, 27 May 2021 06:40:57 +0000 [thread overview] Message-ID: <162209765751.436794.17923326412681624558.stgit@devnote2> (raw) In-Reply-To: <162209754288.436794.3904335049560916855.stgit@devnote2> ftrace shows "[unknown/kretprobe'd]" indicator all addresses in the kretprobe_trampoline, but the modified address by kretprobe should be only kretprobe_trampoline+0. Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Tested-by: Andrii Nakryik <andrii@kernel.org> --- kernel/trace/trace_output.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index d0368a569bfa..e46780670742 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -8,6 +8,7 @@ #include <linux/module.h> #include <linux/mutex.h> #include <linux/ftrace.h> +#include <linux/kprobes.h> #include <linux/sched/clock.h> #include <linux/sched/mm.h> @@ -346,22 +347,12 @@ int trace_output_call(struct trace_iterator *iter, char *name, char *fmt, ...) } EXPORT_SYMBOL_GPL(trace_output_call); -#ifdef CONFIG_KRETPROBES -static inline const char *kretprobed(const char *name) +static inline const char *kretprobed(const char *name, unsigned long addr) { - static const char tramp_name[] = "kretprobe_trampoline"; - int size = sizeof(tramp_name); - - if (strncmp(tramp_name, name, size) = 0) + if (is_kretprobe_trampoline(addr)) return "[unknown/kretprobe'd]"; return name; } -#else -static inline const char *kretprobed(const char *name) -{ - return name; -} -#endif /* CONFIG_KRETPROBES */ void trace_seq_print_sym(struct trace_seq *s, unsigned long address, bool offset) @@ -374,7 +365,7 @@ trace_seq_print_sym(struct trace_seq *s, unsigned long address, bool offset) sprint_symbol(str, address); else kallsyms_lookup(address, NULL, NULL, NULL, str); - name = kretprobed(str); + name = kretprobed(str, address); if (name && strlen(name)) { trace_seq_puts(s, name);
next prev parent reply other threads:[~2021-05-27 6:41 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-27 6:39 [PATCH -tip v7 00/13] kprobes: Fix stacktrace with kretprobes on x86 Masami Hiramatsu 2021-05-27 6:39 ` Masami Hiramatsu 2021-05-27 6:39 ` [PATCH -tip v7 01/13] ia64: kprobes: Fix to pass correct trampoline address to the handler Masami Hiramatsu 2021-05-27 6:39 ` Masami Hiramatsu 2021-05-27 6:39 ` [PATCH -tip v7 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_descriptor() Masami Hiramatsu 2021-05-27 6:39 ` [PATCH -tip v7 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_de Masami Hiramatsu 2021-05-27 6:39 ` [PATCH -tip v7 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() Masami Hiramatsu 2021-05-27 6:39 ` [PATCH -tip v7 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler Masami Hiramatsu 2021-06-14 15:46 ` [PATCH -tip v7 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() Naveen N. Rao 2021-06-14 15:58 ` [PATCH -tip v7 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_han Naveen N. Rao 2021-06-15 0:06 ` [PATCH -tip v7 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() Masami Hiramatsu 2021-06-15 0:06 ` [PATCH -tip v7 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_han Masami Hiramatsu 2021-05-27 6:39 ` [PATCH -tip v7 04/13] kprobes: Add kretprobe_find_ret_addr() for searching return address Masami Hiramatsu 2021-05-27 6:39 ` Masami Hiramatsu 2021-05-27 6:39 ` [PATCH -tip v7 05/13] x86/kprobes: Add UNWIND_HINT_FUNC on kretprobe_trampoline code Masami Hiramatsu 2021-05-27 6:39 ` Masami Hiramatsu 2021-05-27 6:40 ` [PATCH -tip v7 06/13] ARC: Add instruction_pointer_set() API Masami Hiramatsu 2021-05-27 6:40 ` Masami Hiramatsu 2021-05-27 6:40 ` [PATCH -tip v7 07/13] ia64: " Masami Hiramatsu 2021-05-27 6:40 ` Masami Hiramatsu 2021-05-27 6:40 ` [PATCH -tip v7 08/13] arm: kprobes: Make a space for regs->ARM_pc at kretprobe_trampoline Masami Hiramatsu 2021-05-27 6:40 ` Masami Hiramatsu 2021-05-27 6:40 ` [PATCH -tip v7 09/13] kprobes: Setup instruction pointer in __kretprobe_trampoline_handler Masami Hiramatsu 2021-05-27 6:40 ` Masami Hiramatsu 2021-06-17 4:39 ` Josh Poimboeuf 2021-06-17 4:39 ` Josh Poimboeuf 2021-06-17 4:40 ` Josh Poimboeuf 2021-06-17 4:40 ` Josh Poimboeuf 2021-06-17 14:40 ` Masami Hiramatsu 2021-06-17 14:40 ` Masami Hiramatsu 2021-06-17 15:02 ` Masami Hiramatsu 2021-06-17 15:02 ` Masami Hiramatsu 2021-06-17 17:45 ` Andrii Nakryiko 2021-06-17 17:45 ` Andrii Nakryiko 2021-06-17 18:21 ` Josh Poimboeuf 2021-06-17 18:21 ` Josh Poimboeuf 2021-06-17 18:31 ` Andrii Nakryiko 2021-06-17 18:31 ` Andrii Nakryiko 2021-06-17 19:26 ` Josh Poimboeuf 2021-06-17 19:26 ` Josh Poimboeuf 2021-06-17 19:46 ` Andrii Nakryiko 2021-06-17 19:46 ` Andrii Nakryiko 2021-06-18 0:33 ` Masami Hiramatsu 2021-06-18 0:33 ` Masami Hiramatsu 2021-06-18 1:03 ` Josh Poimboeuf 2021-06-18 1:03 ` Josh Poimboeuf 2021-06-17 23:58 ` Masami Hiramatsu 2021-06-17 23:58 ` Masami Hiramatsu 2021-06-18 0:58 ` Josh Poimboeuf 2021-06-18 0:58 ` Josh Poimboeuf 2021-05-27 6:40 ` [PATCH -tip v7 10/13] x86/kprobes: Push a fake return address at kretprobe_trampoline Masami Hiramatsu 2021-05-27 6:40 ` Masami Hiramatsu 2021-06-17 4:41 ` Josh Poimboeuf 2021-06-17 4:41 ` Josh Poimboeuf 2021-05-27 6:40 ` [PATCH -tip v7 11/13] x86/unwind: Recover kretprobe trampoline entry Masami Hiramatsu 2021-05-27 6:40 ` Masami Hiramatsu 2021-06-17 4:41 ` Josh Poimboeuf 2021-06-17 4:41 ` Josh Poimboeuf 2021-05-27 6:40 ` Masami Hiramatsu [this message] 2021-05-27 6:40 ` [PATCH -tip v7 12/13] tracing: Show kretprobe unknown indicator only for kretprobe_trampoline Masami Hiramatsu 2021-05-27 6:41 ` [PATCH -tip v7 13/13] x86/kprobes: Fixup return address in generic trampoline handler Masami Hiramatsu 2021-05-27 6:41 ` Masami Hiramatsu 2021-05-27 16:41 ` [PATCH -tip v7 00/13] kprobes: Fix stacktrace with kretprobes on x86 Andrii Nakryiko 2021-05-27 16:41 ` Andrii Nakryiko 2021-06-10 3:40 ` Masami Hiramatsu 2021-06-10 3:40 ` 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=162209765751.436794.17923326412681624558.stgit@devnote2 \ --to=mhiramat@kernel.org \ --cc=andrii.nakryiko@gmail.com \ --cc=ast@kernel.org \ --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=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.