powerpc: Replace kretprobe code with rethook on powerpc
PATCH RESEND v4 1/1 powerpc: Replace kretprobe code with rethook on powerpc
This is an adaptation of commit f3a112c0c40d ("x86,rethook,kprobes:
Replace kretprobe with rethook on x86") to powerpc.
Rethook follows the existing kretprobe implementation, but separates it from kprobes so that it can be used by fprobe (ftrace-based function entry/exit probes). As such, this patch also enables fprobe to work on powerpc. The only other change compared to the existing kretprobe implementation is doing the return address fixup in arch_rethook_fixup_return().
Reference to other archs:
commit b57c2f124098 ("riscv: add riscv rethook implementation") commit 7b0a096436c2 ("LoongArch: Replace kretprobe with rethook")
Note:
=====
In future, rethook will be only for kretprobe, and kretprobe will be replaced by fprobe.
https://lore.kernel.org/all/172000134410.63468.13742222887213469474.stgit@devnote2/
We will adapt the above implementation for powerpc once its upstream.
Until then, we can have this implementation of rethook to serve
current kretprobe usecases.
--- arch/powerpc/Kconfig | 1 + arch/powerpc/kernel/Makefile | 1 + arch/powerpc/kernel/kprobes.c | 65 +--------------------------- arch/powerpc/kernel/optprobes.c | 2 +- arch/powerpc/kernel/rethook.c | 73 ++++++++++++++++++++++++++++++++ arch/powerpc/kernel/stacktrace.c | 6 ++- 6 files changed, 81 insertions(+), 67 deletions(-) create mode 100644 arch/powerpc/kernel/rethook.c
arch/powerpc/Kconfig +1 -0
@@ -269,6 +269,7 @@ config PPC select HAVE_PERF_EVENTS_NMI if PPC64 select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP + select HAVE_RETHOOK if KPROBES select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RELIABLE_STACKTRACE select HAVE_RSEQ
arch/powerpc/kernel/Makefile +1 -0
@@ -139,6 +139,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_OPTPROBES) += optprobes.o optprobes_head.o obj-$(CONFIG_KPROBES_ON_FTRACE) += kprobes-ftrace.o obj-$(CONFIG_UPROBES) += uprobes.o +obj-$(CONFIG_RETHOOK) += rethook.o obj-$(CONFIG_PPC_UDBG_16550) += legacy_serial.o udbg_16550.o obj-$(CONFIG_SWIOTLB) += dma-swiotlb.o obj-$(CONFIG_ARCH_HAS_DMA_SET_MASK) += dma-mask.o
arch/powerpc/kernel/kprobes.c +1 -64
85 lines not on this page · raw message
arch/powerpc/kernel/optprobes.c +1 -1
@@ -56,7 +56,7 @@ static unsigned long can_optimize(struct kprobe *p)* has a 'nop' instruction, which can be emulated. * So further checks can be skipped. */ -if (p->addr == (kprobe_opcode_t *)&__kretprobe_trampoline) +if (p->addr == (kprobe_opcode_t *)&arch_rethook_trampoline)return addr +sizeof (kprobe_opcode_t);/*
arch/powerpc/kernel/rethook.c new file +73 -0
73 lines not on this page · raw message
arch/powerpc/kernel/stacktrace.c +4 -2
@@ -21,6 +21,7 @@#include <asm/processor.h> #include <linux/ftrace.h> #include <asm/kprobes.h> +#include <linux/rethook.h> #include <asm/paca.h>
@@ -133,12 +134,13 @@ int __no_sanitize_address arch_stack_walk_reliable(stack_trace_consume_fn consum* arch-dependent code, they are generic. */ ip =ftrace_graph_ret_addr (task, &graph_idx, ip, stack); -#ifdef CONFIG_KPROBES +/* * Mark stacktraces with kretprobed functions on them * as unreliable. */ -if (ip == (unsigned long )__kretprobe_trampoline) +#ifdef CONFIG_RETHOOK +if (ip == (unsigned long )arch_rethook_trampoline)return -EINVAL ;#endif
Signature · 1 line
2.44.0
Michael Ellerman
reviewerQuoted 22 lines · Abhishek Dubey
This is an adaptation of commit
f3a112c0c40d("x86,rethook,kprobes:
Replace kretprobe with rethook on x86") to powerpc.Rethook follows the existing kretprobe implementation, but separates it from kprobes so that it can be used by fprobe (ftrace-based function entry/exit probes). As such, this patch also enables fprobe to work on powerpc. The only other change compared to the existing kretprobe implementation is doing the return address fixup in
arch_rethook_fixup_return().Reference to other archs:
commitb57c2f124098("riscv: add riscv rethook implementation") commit7b0a096436c2("LoongArch: Replace kretprobe with rethook")Note:
=====In future, rethook will be only for kretprobe, and kretprobe will be replaced by fprobe.
https://lore.kernel.org/all/172000134410.63468.13742222887213469474.stgit@devnote2/
Quoted 7 lines
We will adapt the above implementation for powerpc once its upstream.
Until then, we can have this implementation of rethook to serve
current kretprobe usecases.Reviewed-by Naveen Rao <[email protected]>Signed-off-by Abhishek Dubey <[email protected]>---
Was Masami's objection to v3 resolved?
cheers
Michael Ellerman
AppliedQuoted 11 lines · Abhishek Dubey
This is an adaptation of commit
f3a112c0c40d("x86,rethook,kprobes:
Replace kretprobe with rethook on x86") to powerpc.Rethook follows the existing kretprobe implementation, but separates it from kprobes so that it can be used by fprobe (ftrace-based function entry/exit probes). As such, this patch also enables fprobe to work on powerpc. The only other change compared to the existing kretprobe implementation is doing the return address fixup in
arch_rethook_fixup_return().[...]
Applied to powerpc/next.
[1/1] powerpc: Replace kretprobe code with rethook on powerpc
https://git.kernel.org/powerpc/c/19f1bc3fb55452739dd3d56cfd06c29ecdbe3e9f
cheers
Quoted 11 lines · On Fri, 06 Sep 2024 21:52:52 +1000 Michael Ellerman…
Quoted 10 lines · Abhishek Dubey
This is an adaptation of commit
f3a112c0c40d("x86,rethook,kprobes:
Replace kretprobe with rethook on x86") to powerpc.Rethook follows the existing kretprobe implementation, but separates it from kprobes so that it can be used by fprobe (ftrace-based function entry/exit probes). As such, this patch also enables fprobe to work on powerpc. The only other change compared to the existing kretprobe implementation is doing the return address fixup in
arch_rethook_fixup_return().
Quoted 6 lines
Quoted 1 line
[...]
Applied to powerpc/next.
[1/1] powerpc: Replace kretprobe code with rethook on powerpc
https://git.kernel.org/powerpc/c/19f1bc3fb55452739dd3d56cfd06c29ecdbe3e9f
Thanks, and sorry for late reply, but I don't have any objection.
Quoted 2 lines
cheers
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Quoted 15 lines · Masami Hiramatsu
Quoted 11 lines · On Fri, 06 Sep 2024 21:52:52 +1000 Michael Ellerman…
Quoted 10 lines · Abhishek Dubey
This is an adaptation of commit
f3a112c0c40d("x86,rethook,kprobes:
Replace kretprobe with rethook on x86") to powerpc.Rethook follows the existing kretprobe implementation, but separates it from kprobes so that it can be used by fprobe (ftrace-based function entry/exit probes). As such, this patch also enables fprobe to work on powerpc. The only other change compared to the existing kretprobe implementation is doing the return address fixup in
arch_rethook_fixup_return().
Quoted 9 lines
Quoted 6 lines
Quoted 1 line
[...]
Applied to powerpc/next.
[1/1] powerpc: Replace kretprobe code with rethook on powerpc
https://git.kernel.org/powerpc/c/19f1bc3fb55452739dd3d56cfd06c29ecdbe3e9fThanks, and sorry for late reply, but I don't have any objection.
It's weird that powerpc and a bunch of other arguably less popular architectures have rethook implementation, but ARM64 doesn. Any reason why that is the case, Masami?
Quoted 7 lines
Quoted 2 lines
cheers
--
Masami Hiramatsu (Google) <[email protected]>
Michael Ellerman
reviewerQuoted 14 lines · Masami Hiramatsu (Google)
Quoted 11 lines · On Fri, 06 Sep 2024 21:52:52 +1000 Michael Ellerman…
Quoted 10 lines · Abhishek Dubey
This is an adaptation of commit
f3a112c0c40d("x86,rethook,kprobes:
Replace kretprobe with rethook on x86") to powerpc.Rethook follows the existing kretprobe implementation, but separates it from kprobes so that it can be used by fprobe (ftrace-based function entry/exit probes). As such, this patch also enables fprobe to work on powerpc. The only other change compared to the existing kretprobe implementation is doing the return address fixup in
arch_rethook_fixup_return().
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
[...]
Applied to powerpc/next.
[1/1] powerpc: Replace kretprobe code with rethook on powerpc
https://git.kernel.org/powerpc/c/19f1bc3fb55452739dd3d56cfd06c29ecdbe3e9fThanks, and sorry for late reply, but I don't have any objection.
Thanks. No worries.
cheers