rethook: add riscv rethook implementation.
PATCH v5 1/1 rethook: add riscv rethook implementation.
From: Binglei Wang <[email protected]>
Implement the kretprobes on riscv arch by using rethook mechanism which abstracts general kretprobe info into a struct rethook_node to be embedded in the struct kretprobe_instance.
1. replace __kretprobe_trampoline with
arch_hook_trampoline
2. replace kretprobe_trampoline_handler with
rethook_trampoline_handler
Signed-off-by Binglei Wang <[email protected]>
--- arch/riscv/Kconfig | 1 + arch/riscv/kernel/probes/Makefile | 1 + arch/riscv/kernel/probes/kprobes.c | 8 -- arch/riscv/kernel/probes/kprobes_trampoline.S | 73 +---------------- arch/riscv/kernel/probes/kprobes_trampoline.h | 79 +++++++++++++++++++ arch/riscv/kernel/probes/rethook.c | 27 +++++++ arch/riscv/kernel/probes/rethook.h | 8 ++ arch/riscv/kernel/probes/rethook_trampoline.S | 22 ++++++ include/linux/kprobes.h | 6 ++ 9 files changed, 145 insertions(+), 80 deletions(-) create mode 100644 arch/riscv/kernel/probes/kprobes_trampoline.h create mode 100644 arch/riscv/kernel/probes/rethook.c create mode 100644 arch/riscv/kernel/probes/rethook.h create mode 100644 arch/riscv/kernel/probes/rethook_trampoline.S
arch/riscv/Kconfig +1 -0
@@ -97,6 +97,7 @@ config RISCV select HAVE_KPROBES if !XIP_KERNEL select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL select HAVE_KRETPROBES if !XIP_KERNEL + select HAVE_RETHOOK if !XIP_KERNEL select HAVE_MOVE_PMD select HAVE_MOVE_PUD select HAVE_PCI
arch/riscv/kernel/probes/Makefile +1 -0
@@ -3,4 +3,5 @@ obj-$(CONFIG_KPROBES) += kprobes.o decode-insn.o simulate-insn.o obj-$(CONFIG_KPROBES) += kprobes_trampoline.o obj-$(CONFIG_KPROBES_ON_FTRACE) += ftrace.o obj-$(CONFIG_UPROBES) += uprobes.o decode-insn.o simulate-insn.o +obj-$(CONFIG_RETHOOK) += rethook.o rethook_trampoline.o CFLAGS_REMOVE_simulate-insn.o = $(CC_FLAGS_FTRACE)
arch/riscv/kernel/probes/kprobes.c +0 -8
@@ -350,14 +350,6 @@ void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs)return (void *)kretprobe_trampoline_handler (regs,NULL ); } -void __kprobes arch_prepare_kretprobe (struct kretprobe_instance *ri, -struct pt_regs *regs) -{ - ri->ret_addr = (kprobe_opcode_t *)regs->ra; - ri->fp =NULL ; - regs->ra = (unsigned long ) &__kretprobe_trampoline; -} -int __kprobes arch_trampoline_kprobe (struct kprobe *p) {return 0 ;
arch/riscv/kernel/probes/kprobes_trampoline.S +1 -72
79 lines not on this page · raw message
arch/riscv/kernel/probes/kprobes_trampoline.h new file +79 -0
79 lines not on this page · raw message
arch/riscv/kernel/probes/rethook.c new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Generic return hook for riscv. +*/ + +#include <linux/kprobes.h> +#include <linux/rethook.h> +#include "rethook.h" + +/* This is called from arch_rethook_trampoline() */ +unsigned long __used arch_rethook_trampoline_callback (struct pt_regs *regs) +{ +return rethook_trampoline_handler (regs, regs->s0); +} +NOKPROBE_SYMBOL (arch_rethook_trampoline_callback); + + +void arch_rethook_prepare (struct rethook_node *rhn,struct pt_regs *regs,bool mcount) +{ + rhn->ret_addr = regs->ra; + rhn->frame = regs->s0; + +/* replace return addr with trampoline */ + regs->ra = (u64 )arch_rethook_trampoline; +} +NOKPROBE_SYMBOL (arch_rethook_prepare); +
arch/riscv/kernel/probes/rethook.h new file +8 -0
@@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only +#ifndef __RISCV_RETHOOK_H +#define __RISCV_RETHOOK_H + +unsigned long arch_rethook_trampoline_callback (struct pt_regs *regs); +void arch_rethook_prepare (struct rethook_node *rhn,struct pt_regs *regs,bool mcount); + +#endif
arch/riscv/kernel/probes/rethook_trampoline.S new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Author: Patrick Stählin <[email protected]> + */ +#include "kprobes_trampoline.h" + +ENTRY(arch_rethook_trampoline) + addi sp, sp, -(PT_SIZE_ON_STACK) + save_all_base_regs + + move a0, sp /* pt_regs */ + + call arch_rethook_trampoline_callback + + /* use the result as the return-address */ + move ra, a0 + + restore_all_base_regs + addi sp, sp, PT_SIZE_ON_STACK + + ret +ENDPROC(arch_rethook_trampoline)
include/linux/kprobes.h +6 -0
@@ -210,6 +210,12 @@ static nokprobe_inline unsigned long get_kretprobe_retaddr(struct kretprobe_inst {return ri->node.ret_addr; } +static nokprobe_inline +unsigned long kretprobe_trampoline_handler (struct pt_regs *regs, +void *frame_pointer) +{ +return 0 ; +}#else extern void arch_prepare_kretprobe (struct kretprobe_instance *ri,struct pt_regs *regs);
Signature · 1 line
2.27.0