rethook: add riscv rethook implementation.
PATCH v6 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. remove arch dependent kretprobe implementation
2. replace __kretprobe_trampoline with arch_hook_trampoline
---
arch/riscv/Kconfig | 1 +
arch/riscv/kernel/probes/Makefile | 2 +-
arch/riscv/kernel/probes/kprobes.c | 13 ----------
arch/riscv/kernel/probes/rethook.c | 26 +++++++++++++++++++
arch/riscv/kernel/probes/rethook.h | 8 ++++++
...obes_trampoline.S => rethook_trampoline.S} | 0
6 files changed, 36 insertions(+), 14 deletions(-)
create mode 100644 arch/riscv/kernel/probes/rethook.c
create mode 100644 arch/riscv/kernel/probes/rethook.h
rename arch/riscv/kernel/probes/{kprobes_trampoline.S => rethook_trampoline.S} (100%)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 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 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_KPROBES) += rethook.o rethook_trampoline.o CFLAGS_REMOVE_simulate-insn.o = $(CC_FLAGS_FTRACE)
arch/riscv/kernel/probes/kprobes.c +0 -13
@@ -345,19 +345,6 @@ int __init arch_populate_kprobe_blacklist(void)return ret; } -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/rethook.c new file +26 -0
@@ -0,0 +1,26 @@ +// 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 renamed from arch/riscv/kernel/probes/kprobes_trampoline.S +0 -0
Signature · 1 line
2.27.0
Quoted 11 lines · Binglei Wang
From: Binglei Wang <[email protected]>
Implement the kretprobes on riscv arch by using rethook mechanism which abstracts general kretprobe info into a struct
rethook_nodeto be embedded in the structkretprobe_instance.1. remove arch dependent kretprobe implementation
2. replace__kretprobe_trampolinewitharch_hook_trampolineSigned-off-by Binglei Wang <[email protected]>---
What changed since v5? You need to put a changelog under the --- for what changed in each revision.
Thanks,
Conor.
Quoted 112 lines
arch/riscv/Kconfig | 1 + arch/riscv/kernel/probes/Makefile | 2 +- arch/riscv/kernel/probes/kprobes.c | 13 ---------- arch/riscv/kernel/probes/rethook.c | 26 +++++++++++++++++++ arch/riscv/kernel/probes/rethook.h | 8 ++++++ ...obes_trampoline.S => rethook_trampoline.S} | 0 6 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 arch/riscv/kernel/probes/rethook.c create mode 100644 arch/riscv/kernel/probes/rethook.h rename arch/riscv/kernel/probes/{kprobes_trampoline.S => rethook_trampoline.S} (100%)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_PCIarch/riscv/kernel/probes/Makefile +1
-1@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 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_KPROBES) += rethook.o rethook_trampoline.o CFLAGS_REMOVE_simulate-insn.o = $(CC_FLAGS_FTRACE)arch/riscv/kernel/probes/kprobes.c +0
-13@@ -345,19 +345,6 @@ int __init arch_populate_kprobe_blacklist(void)return ret; } -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/rethook.c new file +26
-0@@ -0,0 +1,26 @@ +// 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 renamed from arch/riscv/kernel/probes/kprobes_trampoline.S +0
-0Signature · 1 line
2.27.0
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv