From: "Naveen N. Rao" <naveen.n.rao@linux.ibm.com> To: Masami Hiramatsu <mhiramat@kernel.org>, Ingo Molnar <mingo@kernel.org>, Steven Rostedt <rostedt@goodmis.org> Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>, ast@kernel.org, bpf@vger.kernel.org, Daniel Xu <dxu@dxuuu.xyz>, Josh Poimboeuf <jpoimboe@redhat.com>, kernel-team@fb.com, kuba@kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, mingo@redhat.com, Abhishek Sagar <sagar.abhishek@gmail.com>, tglx@linutronix.de, X86 ML <x86@kernel.org>, yhs@fb.com Subject: Re: [PATCH -tip v7 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() Date: Mon, 14 Jun 2021 21:16:26 +0530 [thread overview] Message-ID: <1623685371.y5qy4nxer2.naveen@linux.ibm.com> (raw) In-Reply-To: <162209757191.436794.12654958417415894884.stgit@devnote2> Hi Masami, Masami Hiramatsu wrote: > Remove trampoline_address from kretprobe_trampoline_handler(). > Instead of passing the address, kretprobe_trampoline_handler() > can use new kretprobe_trampoline_addr(). > > Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> > Tested-by: Andrii Nakryik <andrii@kernel.org> > --- > Changes in v3: > - Remove wrong kretprobe_trampoline declaration from > arch/x86/include/asm/kprobes.h. > Changes in v2: > - Remove arch_deref_entry_point() from comment. > --- > arch/arc/kernel/kprobes.c | 2 +- > arch/arm/probes/kprobes/core.c | 3 +-- > arch/arm64/kernel/probes/kprobes.c | 3 +-- > arch/csky/kernel/probes/kprobes.c | 2 +- > arch/ia64/kernel/kprobes.c | 5 ++--- > arch/mips/kernel/kprobes.c | 3 +-- > arch/parisc/kernel/kprobes.c | 4 ++-- > arch/powerpc/kernel/kprobes.c | 2 +- > arch/riscv/kernel/probes/kprobes.c | 2 +- > arch/s390/kernel/kprobes.c | 2 +- > arch/sh/kernel/kprobes.c | 2 +- > arch/sparc/kernel/kprobes.c | 2 +- > arch/x86/include/asm/kprobes.h | 1 - > arch/x86/kernel/kprobes/core.c | 2 +- > include/linux/kprobes.h | 18 +++++++++++++----- > kernel/kprobes.c | 3 +-- > 16 files changed, 29 insertions(+), 27 deletions(-) > <snip> > diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h > index d65c041b5c22..65dadd4238a2 100644 > --- a/include/linux/kprobes.h > +++ b/include/linux/kprobes.h > @@ -205,15 +205,23 @@ extern void arch_prepare_kretprobe(struct kretprobe_instance *ri, > struct pt_regs *regs); > extern int arch_trampoline_kprobe(struct kprobe *p); > > +void kretprobe_trampoline(void); > +/* > + * Since some architecture uses structured function pointer, > + * use dereference_function_descriptor() to get real function address. > + */ > +static nokprobe_inline void *kretprobe_trampoline_addr(void) > +{ > + return dereference_function_descriptor(kretprobe_trampoline); I'm afraid this won't work correctly. For kernel functions, please use dereference_kernel_function_descriptor() which checks if the function has a descriptor before dereferencing it. Thanks, Naveen
WARNING: multiple messages have this Message-ID (diff)
From: "Naveen N. Rao" <naveen.n.rao@linux.ibm.com> To: Masami Hiramatsu <mhiramat@kernel.org>, Ingo Molnar <mingo@kernel.org>, Steven Rostedt <rostedt@goodmis.org> Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>, ast@kernel.org, bpf@vger.kernel.org, Daniel Xu <dxu@dxuuu.xyz>, Josh Poimboeuf <jpoimboe@redhat.com>, kernel-team@fb.com, kuba@kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, mingo@redhat.com, Abhishek Sagar <sagar.abhishek@gmail.com>, tglx@linutronix.de, X86 ML <x86@kernel.org>, yhs@fb.com Subject: Re: [PATCH -tip v7 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_han Date: Mon, 14 Jun 2021 15:58:26 +0000 [thread overview] Message-ID: <1623685371.y5qy4nxer2.naveen@linux.ibm.com> (raw) In-Reply-To: <162209757191.436794.12654958417415894884.stgit@devnote2> Hi Masami, Masami Hiramatsu wrote: > Remove trampoline_address from kretprobe_trampoline_handler(). > Instead of passing the address, kretprobe_trampoline_handler() > can use new kretprobe_trampoline_addr(). > > Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> > Tested-by: Andrii Nakryik <andrii@kernel.org> > --- > Changes in v3: > - Remove wrong kretprobe_trampoline declaration from > arch/x86/include/asm/kprobes.h. > Changes in v2: > - Remove arch_deref_entry_point() from comment. > --- > arch/arc/kernel/kprobes.c | 2 +- > arch/arm/probes/kprobes/core.c | 3 +-- > arch/arm64/kernel/probes/kprobes.c | 3 +-- > arch/csky/kernel/probes/kprobes.c | 2 +- > arch/ia64/kernel/kprobes.c | 5 ++--- > arch/mips/kernel/kprobes.c | 3 +-- > arch/parisc/kernel/kprobes.c | 4 ++-- > arch/powerpc/kernel/kprobes.c | 2 +- > arch/riscv/kernel/probes/kprobes.c | 2 +- > arch/s390/kernel/kprobes.c | 2 +- > arch/sh/kernel/kprobes.c | 2 +- > arch/sparc/kernel/kprobes.c | 2 +- > arch/x86/include/asm/kprobes.h | 1 - > arch/x86/kernel/kprobes/core.c | 2 +- > include/linux/kprobes.h | 18 +++++++++++++----- > kernel/kprobes.c | 3 +-- > 16 files changed, 29 insertions(+), 27 deletions(-) > <snip> > diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h > index d65c041b5c22..65dadd4238a2 100644 > --- a/include/linux/kprobes.h > +++ b/include/linux/kprobes.h > @@ -205,15 +205,23 @@ extern void arch_prepare_kretprobe(struct kretprobe_instance *ri, > struct pt_regs *regs); > extern int arch_trampoline_kprobe(struct kprobe *p); > > +void kretprobe_trampoline(void); > +/* > + * Since some architecture uses structured function pointer, > + * use dereference_function_descriptor() to get real function address. > + */ > +static nokprobe_inline void *kretprobe_trampoline_addr(void) > +{ > + return dereference_function_descriptor(kretprobe_trampoline); I'm afraid this won't work correctly. For kernel functions, please use dereference_kernel_function_descriptor() which checks if the function has a descriptor before dereferencing it. Thanks, Naveen
next prev parent reply other threads:[~2021-06-14 15:47 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 ` Naveen N. Rao [this message] 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 ` [PATCH -tip v7 12/13] tracing: Show kretprobe unknown indicator only for kretprobe_trampoline Masami Hiramatsu 2021-05-27 6:40 ` 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=1623685371.y5qy4nxer2.naveen@linux.ibm.com \ --to=naveen.n.rao@linux.ibm.com \ --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=mhiramat@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.