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 v8 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_descriptor() Date: Fri, 18 Jun 2021 16:05:40 +0900 [thread overview] Message-ID: <162399994018.506599.10332627573727646767.stgit@devnote2> (raw) In-Reply-To: <162399992186.506599.8457763707951687195.stgit@devnote2> Replace arch_deref_entry_point() with dereference_symbol_descriptor() because those are doing same thing. Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Tested-by: Andrii Nakryik <andrii@kernel.org> --- Changes in v6: - Use dereference_symbol_descriptor() so that it can handle address in modules correctly. --- arch/ia64/kernel/kprobes.c | 5 ----- arch/powerpc/kernel/kprobes.c | 11 ----------- include/linux/kprobes.h | 1 - kernel/kprobes.c | 7 +------ lib/error-inject.c | 3 ++- 5 files changed, 3 insertions(+), 24 deletions(-) diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index d4048518a1d7..0f8573bbf520 100644 --- a/arch/ia64/kernel/kprobes.c +++ b/arch/ia64/kernel/kprobes.c @@ -891,11 +891,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, return ret; } -unsigned long arch_deref_entry_point(void *entry) -{ - return ((struct fnptr *)entry)->ip; -} - static struct kprobe trampoline_p = { .pre_handler = trampoline_probe_handler }; diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c index c64a5feaebbe..24472f2c2cfc 100644 --- a/arch/powerpc/kernel/kprobes.c +++ b/arch/powerpc/kernel/kprobes.c @@ -522,17 +522,6 @@ int kprobe_fault_handler(struct pt_regs *regs, int trapnr) } NOKPROBE_SYMBOL(kprobe_fault_handler); -unsigned long arch_deref_entry_point(void *entry) -{ -#ifdef PPC64_ELF_ABI_v1 - if (!kernel_text_address((unsigned long)entry)) - return ppc_global_function_entry(entry); - else -#endif - return (unsigned long)entry; -} -NOKPROBE_SYMBOL(arch_deref_entry_point); - static struct kprobe trampoline_p = { .addr = (kprobe_opcode_t *) &kretprobe_trampoline, .pre_handler = trampoline_probe_handler diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 523ffc7bc3a8..713c3a683011 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h @@ -382,7 +382,6 @@ int register_kprobe(struct kprobe *p); void unregister_kprobe(struct kprobe *p); int register_kprobes(struct kprobe **kps, int num); void unregister_kprobes(struct kprobe **kps, int num); -unsigned long arch_deref_entry_point(void *); int register_kretprobe(struct kretprobe *rp); void unregister_kretprobe(struct kretprobe *rp); diff --git a/kernel/kprobes.c b/kernel/kprobes.c index e41385afe79d..f8fe9d077b41 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1838,11 +1838,6 @@ static struct notifier_block kprobe_exceptions_nb = { .priority = 0x7fffffff /* we need to be notified first */ }; -unsigned long __weak arch_deref_entry_point(void *entry) -{ - return (unsigned long)entry; -} - #ifdef CONFIG_KRETPROBES unsigned long __kretprobe_trampoline_handler(struct pt_regs *regs, @@ -2305,7 +2300,7 @@ static int __init populate_kprobe_blacklist(unsigned long *start, int ret; for (iter = start; iter < end; iter++) { - entry = arch_deref_entry_point((void *)*iter); + entry = (unsigned long)dereference_symbol_descriptor((void *)*iter); ret = kprobe_add_ksym_blacklist(entry); if (ret == -EINVAL) continue; diff --git a/lib/error-inject.c b/lib/error-inject.c index c73651b15b76..2ff5ef689d72 100644 --- a/lib/error-inject.c +++ b/lib/error-inject.c @@ -8,6 +8,7 @@ #include <linux/mutex.h> #include <linux/list.h> #include <linux/slab.h> +#include <asm/sections.h> /* Whitelist of symbols that can be overridden for error injection. */ static LIST_HEAD(error_injection_list); @@ -64,7 +65,7 @@ static void populate_error_injection_list(struct error_injection_entry *start, mutex_lock(&ei_mutex); for (iter = start; iter < end; iter++) { - entry = arch_deref_entry_point((void *)iter->addr); + entry = (unsigned long)dereference_symbol_descriptor((void *)iter->addr); if (!kernel_text_address(entry) || !kallsyms_lookup_size_offset(entry, &size, &offset)) {
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 v8 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_de Date: Fri, 18 Jun 2021 07:05:40 +0000 [thread overview] Message-ID: <162399994018.506599.10332627573727646767.stgit@devnote2> (raw) In-Reply-To: <162399992186.506599.8457763707951687195.stgit@devnote2> Replace arch_deref_entry_point() with dereference_symbol_descriptor() because those are doing same thing. Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Tested-by: Andrii Nakryik <andrii@kernel.org> --- Changes in v6: - Use dereference_symbol_descriptor() so that it can handle address in modules correctly. --- arch/ia64/kernel/kprobes.c | 5 ----- arch/powerpc/kernel/kprobes.c | 11 ----------- include/linux/kprobes.h | 1 - kernel/kprobes.c | 7 +------ lib/error-inject.c | 3 ++- 5 files changed, 3 insertions(+), 24 deletions(-) diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index d4048518a1d7..0f8573bbf520 100644 --- a/arch/ia64/kernel/kprobes.c +++ b/arch/ia64/kernel/kprobes.c @@ -891,11 +891,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, return ret; } -unsigned long arch_deref_entry_point(void *entry) -{ - return ((struct fnptr *)entry)->ip; -} - static struct kprobe trampoline_p = { .pre_handler = trampoline_probe_handler }; diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c index c64a5feaebbe..24472f2c2cfc 100644 --- a/arch/powerpc/kernel/kprobes.c +++ b/arch/powerpc/kernel/kprobes.c @@ -522,17 +522,6 @@ int kprobe_fault_handler(struct pt_regs *regs, int trapnr) } NOKPROBE_SYMBOL(kprobe_fault_handler); -unsigned long arch_deref_entry_point(void *entry) -{ -#ifdef PPC64_ELF_ABI_v1 - if (!kernel_text_address((unsigned long)entry)) - return ppc_global_function_entry(entry); - else -#endif - return (unsigned long)entry; -} -NOKPROBE_SYMBOL(arch_deref_entry_point); - static struct kprobe trampoline_p = { .addr = (kprobe_opcode_t *) &kretprobe_trampoline, .pre_handler = trampoline_probe_handler diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 523ffc7bc3a8..713c3a683011 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h @@ -382,7 +382,6 @@ int register_kprobe(struct kprobe *p); void unregister_kprobe(struct kprobe *p); int register_kprobes(struct kprobe **kps, int num); void unregister_kprobes(struct kprobe **kps, int num); -unsigned long arch_deref_entry_point(void *); int register_kretprobe(struct kretprobe *rp); void unregister_kretprobe(struct kretprobe *rp); diff --git a/kernel/kprobes.c b/kernel/kprobes.c index e41385afe79d..f8fe9d077b41 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1838,11 +1838,6 @@ static struct notifier_block kprobe_exceptions_nb = { .priority = 0x7fffffff /* we need to be notified first */ }; -unsigned long __weak arch_deref_entry_point(void *entry) -{ - return (unsigned long)entry; -} - #ifdef CONFIG_KRETPROBES unsigned long __kretprobe_trampoline_handler(struct pt_regs *regs, @@ -2305,7 +2300,7 @@ static int __init populate_kprobe_blacklist(unsigned long *start, int ret; for (iter = start; iter < end; iter++) { - entry = arch_deref_entry_point((void *)*iter); + entry = (unsigned long)dereference_symbol_descriptor((void *)*iter); ret = kprobe_add_ksym_blacklist(entry); if (ret = -EINVAL) continue; diff --git a/lib/error-inject.c b/lib/error-inject.c index c73651b15b76..2ff5ef689d72 100644 --- a/lib/error-inject.c +++ b/lib/error-inject.c @@ -8,6 +8,7 @@ #include <linux/mutex.h> #include <linux/list.h> #include <linux/slab.h> +#include <asm/sections.h> /* Whitelist of symbols that can be overridden for error injection. */ static LIST_HEAD(error_injection_list); @@ -64,7 +65,7 @@ static void populate_error_injection_list(struct error_injection_entry *start, mutex_lock(&ei_mutex); for (iter = start; iter < end; iter++) { - entry = arch_deref_entry_point((void *)iter->addr); + entry = (unsigned long)dereference_symbol_descriptor((void *)iter->addr); if (!kernel_text_address(entry) || !kallsyms_lookup_size_offset(entry, &size, &offset)) {
next prev parent reply other threads:[~2021-06-18 7:05 UTC|newest] Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-18 7:05 [PATCH -tip v8 00/13] kprobes: Fix stacktrace with kretprobes on x86 Masami Hiramatsu 2021-06-18 7:05 ` Masami Hiramatsu 2021-06-18 7:05 ` [PATCH -tip v8 01/13] ia64: kprobes: Fix to pass correct trampoline address to the handler Masami Hiramatsu 2021-06-18 7:05 ` Masami Hiramatsu 2021-07-05 7:46 ` Ingo Molnar 2021-07-05 7:46 ` Ingo Molnar 2021-07-05 10:05 ` Masami Hiramatsu 2021-07-05 10:05 ` Masami Hiramatsu 2021-06-18 7:05 ` Masami Hiramatsu [this message] 2021-06-18 7:05 ` [PATCH -tip v8 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_de Masami Hiramatsu 2021-07-05 7:48 ` [PATCH -tip v8 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_descriptor() Ingo Molnar 2021-07-05 7:48 ` [PATCH -tip v8 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbo Ingo Molnar 2021-07-05 12:03 ` [PATCH -tip v8 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_descriptor() Masami Hiramatsu 2021-07-05 12:03 ` [PATCH -tip v8 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbo Masami Hiramatsu 2021-07-07 18:28 ` [PATCH -tip v8 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_descriptor() Andrii Nakryiko 2021-07-07 18:28 ` [PATCH -tip v8 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbo Andrii Nakryiko 2021-07-08 4:08 ` [PATCH -tip v8 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_descriptor() Masami Hiramatsu 2021-07-08 4:08 ` [PATCH -tip v8 02/13] kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbo Masami Hiramatsu 2021-06-18 7:05 ` [PATCH -tip v8 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() Masami Hiramatsu 2021-06-18 7:05 ` [PATCH -tip v8 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler Masami Hiramatsu 2021-07-05 7:03 ` [PATCH -tip v8 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() Ingo Molnar 2021-07-05 7:03 ` [PATCH -tip v8 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_han Ingo Molnar 2021-07-05 10:03 ` [PATCH -tip v8 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() Masami Hiramatsu 2021-07-05 10:03 ` [PATCH -tip v8 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_han Masami Hiramatsu 2021-07-05 7:49 ` [PATCH -tip v8 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() Ingo Molnar 2021-07-05 7:49 ` [PATCH -tip v8 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_han Ingo Molnar 2021-06-18 7:05 ` [PATCH -tip v8 04/13] kprobes: Add kretprobe_find_ret_addr() for searching return address Masami Hiramatsu 2021-06-18 7:05 ` Masami Hiramatsu 2021-07-05 7:42 ` Ingo Molnar 2021-07-05 7:42 ` Ingo Molnar 2021-07-05 14:11 ` Masami Hiramatsu 2021-07-05 14:11 ` Masami Hiramatsu 2021-06-18 7:06 ` [PATCH -tip v8 05/13] x86/kprobes: Add UNWIND_HINT_FUNC on kretprobe_trampoline code Masami Hiramatsu 2021-06-18 7:06 ` Masami Hiramatsu 2021-07-05 8:02 ` Ingo Molnar 2021-07-05 8:02 ` Ingo Molnar 2021-07-09 15:31 ` Masami Hiramatsu 2021-07-09 15:31 ` Masami Hiramatsu 2021-07-10 1:41 ` Masami Hiramatsu 2021-07-10 1:41 ` Masami Hiramatsu 2021-07-10 19:01 ` Josh Poimboeuf 2021-07-10 19:01 ` Josh Poimboeuf 2021-07-10 19:24 ` [PATCH 1/2] objtool: Add frame-pointer-specific function ignore Josh Poimboeuf 2021-07-10 19:24 ` Josh Poimboeuf 2021-07-11 1:16 ` Masami Hiramatsu 2021-07-11 1:16 ` Masami Hiramatsu 2021-07-29 2:31 ` Masami Hiramatsu 2021-07-29 2:31 ` Masami Hiramatsu 2021-07-10 19:25 ` [PATCH 2/2] objtool: Ignore unwind hints for ignored functions Josh Poimboeuf 2021-07-10 19:25 ` Josh Poimboeuf 2021-07-11 2:07 ` Masami Hiramatsu 2021-07-11 2:07 ` Masami Hiramatsu 2021-06-18 7:06 ` [PATCH -tip v8 06/13] ARC: Add instruction_pointer_set() API Masami Hiramatsu 2021-06-18 7:06 ` Masami Hiramatsu 2021-06-18 7:06 ` [PATCH -tip v8 07/13] ia64: " Masami Hiramatsu 2021-06-18 7:06 ` Masami Hiramatsu 2021-06-18 7:06 ` [PATCH -tip v8 08/13] arm: kprobes: Make a space for regs->ARM_pc at kretprobe_trampoline Masami Hiramatsu 2021-06-18 7:06 ` Masami Hiramatsu 2021-07-05 8:04 ` Ingo Molnar 2021-07-05 8:04 ` Ingo Molnar 2021-07-05 14:40 ` Masami Hiramatsu 2021-07-05 14:40 ` Masami Hiramatsu 2021-06-18 7:06 ` [PATCH -tip v8 09/13] kprobes: Enable stacktrace from pt_regs in kretprobe handler Masami Hiramatsu 2021-06-18 7:06 ` Masami Hiramatsu 2021-06-18 14:04 ` Josh Poimboeuf 2021-06-18 14:04 ` Josh Poimboeuf 2021-06-18 7:06 ` [PATCH -tip v8 10/13] x86/kprobes: Push a fake return address at kretprobe_trampoline Masami Hiramatsu 2021-06-18 7:06 ` Masami Hiramatsu 2021-07-05 8:17 ` Ingo Molnar 2021-07-05 8:17 ` Ingo Molnar 2021-07-09 14:55 ` Masami Hiramatsu 2021-07-09 14:55 ` Masami Hiramatsu 2021-06-18 7:07 ` [PATCH -tip v8 11/13] x86/unwind: Recover kretprobe trampoline entry Masami Hiramatsu 2021-06-18 7:07 ` Masami Hiramatsu 2021-07-05 11:36 ` Peter Zijlstra 2021-07-05 11:36 ` Peter Zijlstra 2021-07-05 15:42 ` Masami Hiramatsu 2021-07-05 15:42 ` Masami Hiramatsu 2021-07-06 7:55 ` Peter Zijlstra 2021-07-06 7:55 ` Peter Zijlstra 2021-07-06 15:11 ` Steven Rostedt 2021-07-06 15:11 ` Steven Rostedt 2021-07-07 8:20 ` Peter Zijlstra 2021-07-07 8:20 ` Peter Zijlstra 2021-07-07 8:36 ` Peter Zijlstra 2021-07-07 8:36 ` Peter Zijlstra 2021-07-07 10:15 ` Masami Hiramatsu 2021-07-07 10:15 ` Masami Hiramatsu 2021-07-07 10:20 ` Peter Zijlstra 2021-07-07 10:20 ` Peter Zijlstra 2021-07-07 10:45 ` Masami Hiramatsu 2021-07-07 10:45 ` Masami Hiramatsu 2021-07-07 13:29 ` Masami Hiramatsu 2021-07-07 13:29 ` Masami Hiramatsu 2021-07-07 14:42 ` Matt Wu 2021-07-07 14:42 ` Matt Wu 2021-07-11 14:09 ` Masami Hiramatsu 2021-07-11 14:09 ` Masami Hiramatsu 2021-07-11 15:28 ` Matt Wu 2021-07-11 15:28 ` Matt Wu 2021-07-12 4:57 ` Masami Hiramatsu 2021-07-12 4:57 ` Masami Hiramatsu 2021-06-18 7:07 ` [PATCH -tip v8 12/13] tracing: Show kretprobe unknown indicator only for kretprobe_trampoline Masami Hiramatsu 2021-06-18 7:07 ` Masami Hiramatsu 2021-06-18 7:07 ` [PATCH -tip v8 13/13] x86/kprobes: Fixup return address in generic trampoline handler Masami Hiramatsu 2021-06-18 7:07 ` Masami Hiramatsu 2021-07-05 8:34 ` Ingo Molnar 2021-07-05 8:34 ` Ingo Molnar 2021-07-06 12:57 ` Masami Hiramatsu 2021-07-06 12:57 ` Masami Hiramatsu 2021-06-18 17:44 ` [PATCH -tip v8 00/13] kprobes: Fix stacktrace with kretprobes on x86 Andrii Nakryiko 2021-06-18 17:44 ` Andrii Nakryiko 2021-06-28 13:50 ` Masami Hiramatsu 2021-06-28 13:50 ` 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=162399994018.506599.10332627573727646767.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.