Merge branch 'kprobes: rethook: x86: Replace kretprobe trampoline with rethook'
Masami Hiramatsu says: ==================== Here are the 3rd version for generic kretprobe and kretprobe on x86 for replacing the kretprobe trampoline with rethook. The previous version is here[1] [1] https://lore.kernel.org/all/164821817332.2373735.12048266953420821089.stgit@devnote2/T/#u This version fixed typo and build issues for bpf-next and CONFIG_RETHOOK=y error. I also add temporary mitigation lines for ANNOTATE_NOENDBR macro issue for bpf-next tree [2/4]. This will be removed after merging kernel IBT series. Background: This rethook came from Jiri's request of multiple kprobe for bpf[2]. He tried to solve an issue that starting bpf with multiple kprobe will take a long time because bpf-kprobe will wait for RCU grace period for sync rcu events. Jiri wanted to attach a single bpf handler to multiple kprobes and he tried to introduce multiple-probe interface to kprobe. So I asked him to use ftrace and kretprobe-like hook if it is only for the function entry and exit, instead of adding ad-hoc interface to kprobes. For this purpose, I introduced the fprobe (kprobe like interface for ftrace) with the rethook (this is a generic return hook feature for fprobe exit handler)[3]. [2] https://lore.kernel.org/all/20220104080943.113249-1-jolsa@kernel.org/T/#u [3] https://lore.kernel.org/all/164191321766.806991.7930388561276940676.stgit@devnote2/T/#u The rethook is basically same as the kretprobe trampoline. I just made it decoupled from kprobes. Eventually, the all arch dependent kretprobe trampolines will be replaced with the rethook trampoline instead of cloning and set HAVE_RETHOOK=y. When I port the rethook for all arch which supports kretprobe, the legacy kretprobe specific code (which is for CONFIG_KRETPROBE_ON_RETHOOK=n) will be removed eventually. ==================== Acked-by:Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by:
Alexei Starovoitov <ast@kernel.org>
Showing
- arch/Kconfig 7 additions, 1 deletionarch/Kconfig
- arch/x86/Kconfig 1 addition, 0 deletionsarch/x86/Kconfig
- arch/x86/include/asm/unwind.h 11 additions, 12 deletionsarch/x86/include/asm/unwind.h
- arch/x86/kernel/Makefile 1 addition, 0 deletionsarch/x86/kernel/Makefile
- arch/x86/kernel/kprobes/common.h 1 addition, 0 deletionsarch/x86/kernel/kprobes/common.h
- arch/x86/kernel/kprobes/core.c 0 additions, 107 deletionsarch/x86/kernel/kprobes/core.c
- arch/x86/kernel/kprobes/opt.c 16 additions, 9 deletionsarch/x86/kernel/kprobes/opt.c
- arch/x86/kernel/rethook.c 127 additions, 0 deletionsarch/x86/kernel/rethook.c
- arch/x86/kernel/unwind_orc.c 5 additions, 5 deletionsarch/x86/kernel/unwind_orc.c
- include/linux/kprobes.h 49 additions, 2 deletionsinclude/linux/kprobes.h
- kernel/Makefile 1 addition, 0 deletionskernel/Makefile
- kernel/kprobes.c 104 additions, 20 deletionskernel/kprobes.c
- kernel/trace/trace_kprobe.c 2 additions, 2 deletionskernel/trace/trace_kprobe.c
Please register or sign in to comment