* Re: [PATCH] rethook: add riscv rethook implementation. [not found] <20220922040443.605175-1-l3b2w1@gmail.com> @ 2022-09-22 8:40 ` kernel test robot 2022-09-22 10:23 ` kernel test robot [not found] ` <20220922111933.607219-1-l3b2w1@gmail.com> 2 siblings, 0 replies; 6+ messages in thread From: kernel test robot @ 2022-09-22 8:40 UTC (permalink / raw) To: Binglei Wang, paul.walmsley, palmer, aou, naveen.n.rao, anil.s.keshavamurthy, davem, hiramat Cc: kbuild-all, linux-riscv, linux-kernel, Binglei Wang Hi Binglei, Thank you for the patch! Yet something to improve: [auto build test ERROR on rostedt-trace/for-next] [also build test ERROR on linus/master v6.0-rc6 next-20220921] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Binglei-Wang/rethook-add-riscv-rethook-implementation/20220922-120748 base: https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git for-next config: arc-defconfig (https://download.01.org/0day-ci/archive/20220922/202209221624.rWsWQbRt-lkp@intel.com/config) compiler: arc-elf-gcc (GCC) 12.1.0 reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://github.com/intel-lab-lkp/linux/commit/3f86f610d114317cd7f7a7a1c9116fa0b916667a git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Binglei-Wang/rethook-add-riscv-rethook-implementation/20220922-120748 git checkout 3f86f610d114317cd7f7a7a1c9116fa0b916667a # save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bash If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>): In file included from arch/arc/kernel/kprobes.c:7: include/linux/kprobes.h: In function 'arch_prepare_kretprobe': include/linux/kprobes.h:225:49: error: 'struct pt_regs' has no member named 'ra'; did you mean 'r0'? 225 | ri->ret_addr = (kprobe_opcode_t *)regs->ra; | ^~ | r0 include/linux/kprobes.h:227:15: error: 'struct pt_regs' has no member named 'ra'; did you mean 'r0'? 227 | regs->ra = (unsigned long) &__kretprobe_trampoline; | ^~ | r0 arch/arc/kernel/kprobes.c: At top level: arch/arc/kernel/kprobes.c:193:15: warning: no previous prototype for 'arc_kprobe_handler' [-Wmissing-prototypes] 193 | int __kprobes arc_kprobe_handler(unsigned long addr, struct pt_regs *regs) | ^~~~~~~~~~~~~~~~~~ >> arch/arc/kernel/kprobes.c:371:16: error: redefinition of 'arch_prepare_kretprobe' 371 | void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, | ^~~~~~~~~~~~~~~~~~~~~~ include/linux/kprobes.h:222:29: note: previous definition of 'arch_prepare_kretprobe' with type 'void(struct kretprobe_instance *, struct pt_regs *)' 222 | static nokprobe_inline void arch_prepare_kretprobe(struct kretprobe_instance *ri, | ^~~~~~~~~~~~~~~~~~~~~~ vim +/arch_prepare_kretprobe +371 arch/arc/kernel/kprobes.c 4d86dfbbda09b3 Vineet Gupta 2013-01-22 370 4d86dfbbda09b3 Vineet Gupta 2013-01-22 @371 void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, 4d86dfbbda09b3 Vineet Gupta 2013-01-22 372 struct pt_regs *regs) 4d86dfbbda09b3 Vineet Gupta 2013-01-22 373 { 4d86dfbbda09b3 Vineet Gupta 2013-01-22 374 4d86dfbbda09b3 Vineet Gupta 2013-01-22 375 ri->ret_addr = (kprobe_opcode_t *) regs->blink; f75dd136b65ccc Masami Hiramatsu 2020-08-29 376 ri->fp = NULL; 4d86dfbbda09b3 Vineet Gupta 2013-01-22 377 4d86dfbbda09b3 Vineet Gupta 2013-01-22 378 /* Replace the return addr with trampoline addr */ adf8a61a940c49 Masami Hiramatsu 2021-09-14 379 regs->blink = (unsigned long)&__kretprobe_trampoline; 4d86dfbbda09b3 Vineet Gupta 2013-01-22 380 } 4d86dfbbda09b3 Vineet Gupta 2013-01-22 381 -- 0-DAY CI Kernel Test Service https://01.org/lkp _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rethook: add riscv rethook implementation. [not found] <20220922040443.605175-1-l3b2w1@gmail.com> 2022-09-22 8:40 ` [PATCH] rethook: add riscv rethook implementation kernel test robot @ 2022-09-22 10:23 ` kernel test robot [not found] ` <20220922111933.607219-1-l3b2w1@gmail.com> 2 siblings, 0 replies; 6+ messages in thread From: kernel test robot @ 2022-09-22 10:23 UTC (permalink / raw) To: Binglei Wang, paul.walmsley, palmer, aou, naveen.n.rao, anil.s.keshavamurthy, davem, hiramat Cc: kbuild-all, linux-riscv, linux-kernel, Binglei Wang Hi Binglei, Thank you for the patch! Yet something to improve: [auto build test ERROR on rostedt-trace/for-next] [also build test ERROR on linus/master v6.0-rc6 next-20220921] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Binglei-Wang/rethook-add-riscv-rethook-implementation/20220922-120748 base: https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git for-next config: s390-allmodconfig (https://download.01.org/0day-ci/archive/20220922/202209221828.DpzmggxE-lkp@intel.com/config) compiler: s390-linux-gcc (GCC) 12.1.0 reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://github.com/intel-lab-lkp/linux/commit/3f86f610d114317cd7f7a7a1c9116fa0b916667a git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Binglei-Wang/rethook-add-riscv-rethook-implementation/20220922-120748 git checkout 3f86f610d114317cd7f7a7a1c9116fa0b916667a # save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=s390 SHELL=/bin/bash arch/s390/ If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>): In file included from arch/s390/kernel/kprobes.c:13: include/linux/kprobes.h: In function 'arch_prepare_kretprobe': include/linux/kprobes.h:225:47: error: 'struct pt_regs' has no member named 'ra' 225 | ri->ret_addr = (kprobe_opcode_t *)regs->ra; | ^~ include/linux/kprobes.h:227:13: error: 'struct pt_regs' has no member named 'ra' 227 | regs->ra = (unsigned long) &__kretprobe_trampoline; | ^~ arch/s390/kernel/kprobes.c: At top level: >> arch/s390/kernel/kprobes.c:285:6: error: redefinition of 'arch_prepare_kretprobe' 285 | void arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs) | ^~~~~~~~~~~~~~~~~~~~~~ include/linux/kprobes.h:222:29: note: previous definition of 'arch_prepare_kretprobe' with type 'void(struct kretprobe_instance *, struct pt_regs *)' 222 | static nokprobe_inline void arch_prepare_kretprobe(struct kretprobe_instance *ri, | ^~~~~~~~~~~~~~~~~~~~~~ vim +/arch_prepare_kretprobe +285 arch/s390/kernel/kprobes.c 4ba069b802c29e Michael Grundy 2006-09-20 284 7a5388de5c70f7 Heiko Carstens 2014-10-22 @285 void arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs) 4ba069b802c29e Michael Grundy 2006-09-20 286 { 4ba069b802c29e Michael Grundy 2006-09-20 287 ri->ret_addr = (kprobe_opcode_t *)regs->gprs[14]; 09bc20c8fb35cf Vasily Gorbik 2022-03-05 288 ri->fp = (void *)regs->gprs[15]; 4ba069b802c29e Michael Grundy 2006-09-20 289 4ba069b802c29e Michael Grundy 2006-09-20 290 /* Replace the return addr with trampoline addr */ adf8a61a940c49 Masami Hiramatsu 2021-09-14 291 regs->gprs[14] = (unsigned long)&__kretprobe_trampoline; 4ba069b802c29e Michael Grundy 2006-09-20 292 } 7a5388de5c70f7 Heiko Carstens 2014-10-22 293 NOKPROBE_SYMBOL(arch_prepare_kretprobe); 4ba069b802c29e Michael Grundy 2006-09-20 294 -- 0-DAY CI Kernel Test Service https://01.org/lkp _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20220922111933.607219-1-l3b2w1@gmail.com>]
* Re: [PATCH] rethook: add riscv rethook implementation. [not found] ` <20220922111933.607219-1-l3b2w1@gmail.com> @ 2022-09-22 11:28 ` Conor Dooley 2022-09-22 13:44 ` [PATCH v4] " l3b2w1 0 siblings, 1 reply; 6+ messages in thread From: Conor Dooley @ 2022-09-22 11:28 UTC (permalink / raw) To: Binglei Wang Cc: paul.walmsley, palmer, aou, naveen.n.rao, anil.s.keshavamurthy, davem, mhiramat, linux-riscv, linux-kernel On Thu, Sep 22, 2022 at 07:19:33PM +0800, Binglei Wang wrote: > From: Binglei Wang <l3b2w1@gmail.com> > > Implement the kretprobes on riscv arch by using rethook machenism > which abstracts general kretprobe info into a struct rethook_node > to be embedded in the struct kretprobe_instance. Hey Binglei, This is now version 3 of the patch right? You need to run format-patch with the -v option so you stop confusing tooling (and humans) as to what they are reviewing. Also, your changelog from the other versions is missing. Please take a look at the docs for how to submit subsequent versions: https://www.kernel.org/doc/html/latest/process/submitting-patches.html > Signed-off-by: Binglei Wang <l3b2w1@gmail.com> Previously this was your work email - I suspect it still needs to be your work email here. Your work address can still be the author even if the mail is not send from that account. Hope that helps, Conor. > --- > 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 | 26 ++++++ > arch/riscv/kernel/probes/rethook_trampoline.S | 22 ++++++ > include/linux/kprobes.h | 6 ++ > 8 files changed, 136 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_trampoline.S > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index ed66c31e4..c5cae0825 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -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 > diff --git a/arch/riscv/kernel/probes/Makefile b/arch/riscv/kernel/probes/Makefile > index 7f0840dcc..ee345e7e9 100644 > --- a/arch/riscv/kernel/probes/Makefile > +++ b/arch/riscv/kernel/probes/Makefile > @@ -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) > diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/kprobes.c > index e6e950b7c..04911cc42 100644 > --- a/arch/riscv/kernel/probes/kprobes.c > +++ b/arch/riscv/kernel/probes/kprobes.c > @@ -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; > diff --git a/arch/riscv/kernel/probes/kprobes_trampoline.S b/arch/riscv/kernel/probes/kprobes_trampoline.S > index 7bdb09ded..54937f342 100644 > --- a/arch/riscv/kernel/probes/kprobes_trampoline.S > +++ b/arch/riscv/kernel/probes/kprobes_trampoline.S > @@ -2,78 +2,7 @@ > /* > * Author: Patrick Stählin <me@packi.ch> > */ > -#include <linux/linkage.h> > - > -#include <asm/asm.h> > -#include <asm/asm-offsets.h> > - > - .text > - .altmacro > - > - .macro save_all_base_regs > - REG_S x1, PT_RA(sp) > - REG_S x3, PT_GP(sp) > - REG_S x4, PT_TP(sp) > - REG_S x5, PT_T0(sp) > - REG_S x6, PT_T1(sp) > - REG_S x7, PT_T2(sp) > - REG_S x8, PT_S0(sp) > - REG_S x9, PT_S1(sp) > - REG_S x10, PT_A0(sp) > - REG_S x11, PT_A1(sp) > - REG_S x12, PT_A2(sp) > - REG_S x13, PT_A3(sp) > - REG_S x14, PT_A4(sp) > - REG_S x15, PT_A5(sp) > - REG_S x16, PT_A6(sp) > - REG_S x17, PT_A7(sp) > - REG_S x18, PT_S2(sp) > - REG_S x19, PT_S3(sp) > - REG_S x20, PT_S4(sp) > - REG_S x21, PT_S5(sp) > - REG_S x22, PT_S6(sp) > - REG_S x23, PT_S7(sp) > - REG_S x24, PT_S8(sp) > - REG_S x25, PT_S9(sp) > - REG_S x26, PT_S10(sp) > - REG_S x27, PT_S11(sp) > - REG_S x28, PT_T3(sp) > - REG_S x29, PT_T4(sp) > - REG_S x30, PT_T5(sp) > - REG_S x31, PT_T6(sp) > - .endm > - > - .macro restore_all_base_regs > - REG_L x3, PT_GP(sp) > - REG_L x4, PT_TP(sp) > - REG_L x5, PT_T0(sp) > - REG_L x6, PT_T1(sp) > - REG_L x7, PT_T2(sp) > - REG_L x8, PT_S0(sp) > - REG_L x9, PT_S1(sp) > - REG_L x10, PT_A0(sp) > - REG_L x11, PT_A1(sp) > - REG_L x12, PT_A2(sp) > - REG_L x13, PT_A3(sp) > - REG_L x14, PT_A4(sp) > - REG_L x15, PT_A5(sp) > - REG_L x16, PT_A6(sp) > - REG_L x17, PT_A7(sp) > - REG_L x18, PT_S2(sp) > - REG_L x19, PT_S3(sp) > - REG_L x20, PT_S4(sp) > - REG_L x21, PT_S5(sp) > - REG_L x22, PT_S6(sp) > - REG_L x23, PT_S7(sp) > - REG_L x24, PT_S8(sp) > - REG_L x25, PT_S9(sp) > - REG_L x26, PT_S10(sp) > - REG_L x27, PT_S11(sp) > - REG_L x28, PT_T3(sp) > - REG_L x29, PT_T4(sp) > - REG_L x30, PT_T5(sp) > - REG_L x31, PT_T6(sp) > - .endm > +#include "kprobes_trampoline.h" > > ENTRY(__kretprobe_trampoline) > addi sp, sp, -(PT_SIZE_ON_STACK) > diff --git a/arch/riscv/kernel/probes/kprobes_trampoline.h b/arch/riscv/kernel/probes/kprobes_trampoline.h > new file mode 100644 > index 000000000..48895a5e3 > --- /dev/null > +++ b/arch/riscv/kernel/probes/kprobes_trampoline.h > @@ -0,0 +1,79 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +#ifndef _KPROBES_TRAMPOLINE_H > +#define _KPROBES_TRAMPOLINE_H > +/* > + * Author: Patrick Stählin <me@packi.ch> > + */ > +#include <linux/linkage.h> > + > +#include <asm/asm.h> > +#include <asm/asm-offsets.h> > + > + .text > + .altmacro > + > + .macro save_all_base_regs > + REG_S x1, PT_RA(sp) > + REG_S x3, PT_GP(sp) > + REG_S x4, PT_TP(sp) > + REG_S x5, PT_T0(sp) > + REG_S x6, PT_T1(sp) > + REG_S x7, PT_T2(sp) > + REG_S x8, PT_S0(sp) > + REG_S x9, PT_S1(sp) > + REG_S x10, PT_A0(sp) > + REG_S x11, PT_A1(sp) > + REG_S x12, PT_A2(sp) > + REG_S x13, PT_A3(sp) > + REG_S x14, PT_A4(sp) > + REG_S x15, PT_A5(sp) > + REG_S x16, PT_A6(sp) > + REG_S x17, PT_A7(sp) > + REG_S x18, PT_S2(sp) > + REG_S x19, PT_S3(sp) > + REG_S x20, PT_S4(sp) > + REG_S x21, PT_S5(sp) > + REG_S x22, PT_S6(sp) > + REG_S x23, PT_S7(sp) > + REG_S x24, PT_S8(sp) > + REG_S x25, PT_S9(sp) > + REG_S x26, PT_S10(sp) > + REG_S x27, PT_S11(sp) > + REG_S x28, PT_T3(sp) > + REG_S x29, PT_T4(sp) > + REG_S x30, PT_T5(sp) > + REG_S x31, PT_T6(sp) > + .endm > + > + .macro restore_all_base_regs > + REG_L x3, PT_GP(sp) > + REG_L x4, PT_TP(sp) > + REG_L x5, PT_T0(sp) > + REG_L x6, PT_T1(sp) > + REG_L x7, PT_T2(sp) > + REG_L x8, PT_S0(sp) > + REG_L x9, PT_S1(sp) > + REG_L x10, PT_A0(sp) > + REG_L x11, PT_A1(sp) > + REG_L x12, PT_A2(sp) > + REG_L x13, PT_A3(sp) > + REG_L x14, PT_A4(sp) > + REG_L x15, PT_A5(sp) > + REG_L x16, PT_A6(sp) > + REG_L x17, PT_A7(sp) > + REG_L x18, PT_S2(sp) > + REG_L x19, PT_S3(sp) > + REG_L x20, PT_S4(sp) > + REG_L x21, PT_S5(sp) > + REG_L x22, PT_S6(sp) > + REG_L x23, PT_S7(sp) > + REG_L x24, PT_S8(sp) > + REG_L x25, PT_S9(sp) > + REG_L x26, PT_S10(sp) > + REG_L x27, PT_S11(sp) > + REG_L x28, PT_T3(sp) > + REG_L x29, PT_T4(sp) > + REG_L x30, PT_T5(sp) > + REG_L x31, PT_T6(sp) > + .endm > +#endif > diff --git a/arch/riscv/kernel/probes/rethook.c b/arch/riscv/kernel/probes/rethook.c > new file mode 100644 > index 000000000..4a41d5eb6 > --- /dev/null > +++ b/arch/riscv/kernel/probes/rethook.c > @@ -0,0 +1,26 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Generic return hook for riscv. > + */ > + > +#include <linux/kprobes.h> > +#include <linux/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); > + > diff --git a/arch/riscv/kernel/probes/rethook_trampoline.S b/arch/riscv/kernel/probes/rethook_trampoline.S > new file mode 100644 > index 000000000..e81c3d4e0 > --- /dev/null > +++ b/arch/riscv/kernel/probes/rethook_trampoline.S > @@ -0,0 +1,22 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Author: Patrick Stählin <me@packi.ch> > + */ > +#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) > diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h > index 55041d2f8..a3805b5b2 100644 > --- a/include/linux/kprobes.h > +++ b/include/linux/kprobes.h > @@ -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); > -- > 2.27.0 > > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v4] rethook: add riscv rethook implementation. 2022-09-22 11:28 ` Conor Dooley @ 2022-09-22 13:44 ` l3b2w1 2022-09-23 17:26 ` Conor Dooley 2022-09-24 8:54 ` Masami Hiramatsu 0 siblings, 2 replies; 6+ messages in thread From: l3b2w1 @ 2022-09-22 13:44 UTC (permalink / raw) To: paul.walmsley, palmer, aou, naveen.n.rao, anil.s.keshavamurthy, davem, mhiramat Cc: linux-riscv, linux-kernel, Binglei Wang From: Binglei Wang <l3b2w1@gmail.com> Implement the kretprobes function on riscv arch by using rethook machenism which abstracts general kretprobe info into the struct rethook_node to be embedded in the struct kretprobe_instance Signed-off-by: Binglei Wang <l3b2w1@gmail.com> --- 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 | 24 ++++++ arch/riscv/kernel/probes/rethook_trampoline.S | 22 ++++++ include/linux/kprobes.h | 6 ++ 8 files changed, 134 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_trampoline.S diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index ed66c31e4..c5cae0825 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -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 diff --git a/arch/riscv/kernel/probes/Makefile b/arch/riscv/kernel/probes/Makefile index 7f0840dcc..ee345e7e9 100644 --- a/arch/riscv/kernel/probes/Makefile +++ b/arch/riscv/kernel/probes/Makefile @@ -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) diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/kprobes.c index e6e950b7c..04911cc42 100644 --- a/arch/riscv/kernel/probes/kprobes.c +++ b/arch/riscv/kernel/probes/kprobes.c @@ -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; diff --git a/arch/riscv/kernel/probes/kprobes_trampoline.S b/arch/riscv/kernel/probes/kprobes_trampoline.S index 7bdb09ded..54937f342 100644 --- a/arch/riscv/kernel/probes/kprobes_trampoline.S +++ b/arch/riscv/kernel/probes/kprobes_trampoline.S @@ -2,78 +2,7 @@ /* * Author: Patrick Stählin <me@packi.ch> */ -#include <linux/linkage.h> - -#include <asm/asm.h> -#include <asm/asm-offsets.h> - - .text - .altmacro - - .macro save_all_base_regs - REG_S x1, PT_RA(sp) - REG_S x3, PT_GP(sp) - REG_S x4, PT_TP(sp) - REG_S x5, PT_T0(sp) - REG_S x6, PT_T1(sp) - REG_S x7, PT_T2(sp) - REG_S x8, PT_S0(sp) - REG_S x9, PT_S1(sp) - REG_S x10, PT_A0(sp) - REG_S x11, PT_A1(sp) - REG_S x12, PT_A2(sp) - REG_S x13, PT_A3(sp) - REG_S x14, PT_A4(sp) - REG_S x15, PT_A5(sp) - REG_S x16, PT_A6(sp) - REG_S x17, PT_A7(sp) - REG_S x18, PT_S2(sp) - REG_S x19, PT_S3(sp) - REG_S x20, PT_S4(sp) - REG_S x21, PT_S5(sp) - REG_S x22, PT_S6(sp) - REG_S x23, PT_S7(sp) - REG_S x24, PT_S8(sp) - REG_S x25, PT_S9(sp) - REG_S x26, PT_S10(sp) - REG_S x27, PT_S11(sp) - REG_S x28, PT_T3(sp) - REG_S x29, PT_T4(sp) - REG_S x30, PT_T5(sp) - REG_S x31, PT_T6(sp) - .endm - - .macro restore_all_base_regs - REG_L x3, PT_GP(sp) - REG_L x4, PT_TP(sp) - REG_L x5, PT_T0(sp) - REG_L x6, PT_T1(sp) - REG_L x7, PT_T2(sp) - REG_L x8, PT_S0(sp) - REG_L x9, PT_S1(sp) - REG_L x10, PT_A0(sp) - REG_L x11, PT_A1(sp) - REG_L x12, PT_A2(sp) - REG_L x13, PT_A3(sp) - REG_L x14, PT_A4(sp) - REG_L x15, PT_A5(sp) - REG_L x16, PT_A6(sp) - REG_L x17, PT_A7(sp) - REG_L x18, PT_S2(sp) - REG_L x19, PT_S3(sp) - REG_L x20, PT_S4(sp) - REG_L x21, PT_S5(sp) - REG_L x22, PT_S6(sp) - REG_L x23, PT_S7(sp) - REG_L x24, PT_S8(sp) - REG_L x25, PT_S9(sp) - REG_L x26, PT_S10(sp) - REG_L x27, PT_S11(sp) - REG_L x28, PT_T3(sp) - REG_L x29, PT_T4(sp) - REG_L x30, PT_T5(sp) - REG_L x31, PT_T6(sp) - .endm +#include "kprobes_trampoline.h" ENTRY(__kretprobe_trampoline) addi sp, sp, -(PT_SIZE_ON_STACK) diff --git a/arch/riscv/kernel/probes/kprobes_trampoline.h b/arch/riscv/kernel/probes/kprobes_trampoline.h new file mode 100644 index 000000000..48895a5e3 --- /dev/null +++ b/arch/riscv/kernel/probes/kprobes_trampoline.h @@ -0,0 +1,79 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +#ifndef _KPROBES_TRAMPOLINE_H +#define _KPROBES_TRAMPOLINE_H +/* + * Author: Patrick Stählin <me@packi.ch> + */ +#include <linux/linkage.h> + +#include <asm/asm.h> +#include <asm/asm-offsets.h> + + .text + .altmacro + + .macro save_all_base_regs + REG_S x1, PT_RA(sp) + REG_S x3, PT_GP(sp) + REG_S x4, PT_TP(sp) + REG_S x5, PT_T0(sp) + REG_S x6, PT_T1(sp) + REG_S x7, PT_T2(sp) + REG_S x8, PT_S0(sp) + REG_S x9, PT_S1(sp) + REG_S x10, PT_A0(sp) + REG_S x11, PT_A1(sp) + REG_S x12, PT_A2(sp) + REG_S x13, PT_A3(sp) + REG_S x14, PT_A4(sp) + REG_S x15, PT_A5(sp) + REG_S x16, PT_A6(sp) + REG_S x17, PT_A7(sp) + REG_S x18, PT_S2(sp) + REG_S x19, PT_S3(sp) + REG_S x20, PT_S4(sp) + REG_S x21, PT_S5(sp) + REG_S x22, PT_S6(sp) + REG_S x23, PT_S7(sp) + REG_S x24, PT_S8(sp) + REG_S x25, PT_S9(sp) + REG_S x26, PT_S10(sp) + REG_S x27, PT_S11(sp) + REG_S x28, PT_T3(sp) + REG_S x29, PT_T4(sp) + REG_S x30, PT_T5(sp) + REG_S x31, PT_T6(sp) + .endm + + .macro restore_all_base_regs + REG_L x3, PT_GP(sp) + REG_L x4, PT_TP(sp) + REG_L x5, PT_T0(sp) + REG_L x6, PT_T1(sp) + REG_L x7, PT_T2(sp) + REG_L x8, PT_S0(sp) + REG_L x9, PT_S1(sp) + REG_L x10, PT_A0(sp) + REG_L x11, PT_A1(sp) + REG_L x12, PT_A2(sp) + REG_L x13, PT_A3(sp) + REG_L x14, PT_A4(sp) + REG_L x15, PT_A5(sp) + REG_L x16, PT_A6(sp) + REG_L x17, PT_A7(sp) + REG_L x18, PT_S2(sp) + REG_L x19, PT_S3(sp) + REG_L x20, PT_S4(sp) + REG_L x21, PT_S5(sp) + REG_L x22, PT_S6(sp) + REG_L x23, PT_S7(sp) + REG_L x24, PT_S8(sp) + REG_L x25, PT_S9(sp) + REG_L x26, PT_S10(sp) + REG_L x27, PT_S11(sp) + REG_L x28, PT_T3(sp) + REG_L x29, PT_T4(sp) + REG_L x30, PT_T5(sp) + REG_L x31, PT_T6(sp) + .endm +#endif diff --git a/arch/riscv/kernel/probes/rethook.c b/arch/riscv/kernel/probes/rethook.c new file mode 100644 index 000000000..47853bc36 --- /dev/null +++ b/arch/riscv/kernel/probes/rethook.c @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Generic return hook for riscv. + */ + +#include <linux/kprobes.h> +#include <linux/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); diff --git a/arch/riscv/kernel/probes/rethook_trampoline.S b/arch/riscv/kernel/probes/rethook_trampoline.S new file mode 100644 index 000000000..e81c3d4e0 --- /dev/null +++ b/arch/riscv/kernel/probes/rethook_trampoline.S @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Author: Patrick Stählin <me@packi.ch> + */ +#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) diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 55041d2f8..a3805b5b2 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h @@ -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); base-commit: f30480cdeafc79d1f017d41335a96d8e3b973c91 -- 2.25.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v4] rethook: add riscv rethook implementation. 2022-09-22 13:44 ` [PATCH v4] " l3b2w1 @ 2022-09-23 17:26 ` Conor Dooley 2022-09-24 8:54 ` Masami Hiramatsu 1 sibling, 0 replies; 6+ messages in thread From: Conor Dooley @ 2022-09-23 17:26 UTC (permalink / raw) To: l3b2w1 Cc: paul.walmsley, palmer, aou, naveen.n.rao, anil.s.keshavamurthy, davem, mhiramat, linux-riscv, linux-kernel Hey Binglei Wang, I don't know anything about rethooks, so just more minor comments from me. Don't respin until someone more knowledgable comes back with a review of the patch itself. Please send new versions of the patch as a new mail thread & not as a reply to the existing one. On Thu, Sep 22, 2022 at 09:44:28PM +0800, l3b2w1@gmail.com wrote: > From: Binglei Wang <l3b2w1@gmail.com> > > Implement the kretprobes function on riscv arch by > using rethook machenism which abstracts general kretprobe info ^mechanism > into the struct rethook_node > to be embedded in the struct kretprobe_instance Whenever you resend, please fix the line wrapping here too. > Signed-off-by: Binglei Wang <l3b2w1@gmail.com> Again, your first version of the patch used your work email as the commit author/signer. The sending email does not need to match your authorship/signature email so is there a reason not to have your h3c email here? Thanks, Conor. > --- > 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 | 24 ++++++ > arch/riscv/kernel/probes/rethook_trampoline.S | 22 ++++++ > include/linux/kprobes.h | 6 ++ > 8 files changed, 134 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_trampoline.S > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index ed66c31e4..c5cae0825 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -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 > diff --git a/arch/riscv/kernel/probes/Makefile b/arch/riscv/kernel/probes/Makefile > index 7f0840dcc..ee345e7e9 100644 > --- a/arch/riscv/kernel/probes/Makefile > +++ b/arch/riscv/kernel/probes/Makefile > @@ -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) > diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/kprobes.c > index e6e950b7c..04911cc42 100644 > --- a/arch/riscv/kernel/probes/kprobes.c > +++ b/arch/riscv/kernel/probes/kprobes.c > @@ -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; > diff --git a/arch/riscv/kernel/probes/kprobes_trampoline.S b/arch/riscv/kernel/probes/kprobes_trampoline.S > index 7bdb09ded..54937f342 100644 > --- a/arch/riscv/kernel/probes/kprobes_trampoline.S > +++ b/arch/riscv/kernel/probes/kprobes_trampoline.S > @@ -2,78 +2,7 @@ > /* > * Author: Patrick Stählin <me@packi.ch> > */ > -#include <linux/linkage.h> > - > -#include <asm/asm.h> > -#include <asm/asm-offsets.h> > - > - .text > - .altmacro > - > - .macro save_all_base_regs > - REG_S x1, PT_RA(sp) > - REG_S x3, PT_GP(sp) > - REG_S x4, PT_TP(sp) > - REG_S x5, PT_T0(sp) > - REG_S x6, PT_T1(sp) > - REG_S x7, PT_T2(sp) > - REG_S x8, PT_S0(sp) > - REG_S x9, PT_S1(sp) > - REG_S x10, PT_A0(sp) > - REG_S x11, PT_A1(sp) > - REG_S x12, PT_A2(sp) > - REG_S x13, PT_A3(sp) > - REG_S x14, PT_A4(sp) > - REG_S x15, PT_A5(sp) > - REG_S x16, PT_A6(sp) > - REG_S x17, PT_A7(sp) > - REG_S x18, PT_S2(sp) > - REG_S x19, PT_S3(sp) > - REG_S x20, PT_S4(sp) > - REG_S x21, PT_S5(sp) > - REG_S x22, PT_S6(sp) > - REG_S x23, PT_S7(sp) > - REG_S x24, PT_S8(sp) > - REG_S x25, PT_S9(sp) > - REG_S x26, PT_S10(sp) > - REG_S x27, PT_S11(sp) > - REG_S x28, PT_T3(sp) > - REG_S x29, PT_T4(sp) > - REG_S x30, PT_T5(sp) > - REG_S x31, PT_T6(sp) > - .endm > - > - .macro restore_all_base_regs > - REG_L x3, PT_GP(sp) > - REG_L x4, PT_TP(sp) > - REG_L x5, PT_T0(sp) > - REG_L x6, PT_T1(sp) > - REG_L x7, PT_T2(sp) > - REG_L x8, PT_S0(sp) > - REG_L x9, PT_S1(sp) > - REG_L x10, PT_A0(sp) > - REG_L x11, PT_A1(sp) > - REG_L x12, PT_A2(sp) > - REG_L x13, PT_A3(sp) > - REG_L x14, PT_A4(sp) > - REG_L x15, PT_A5(sp) > - REG_L x16, PT_A6(sp) > - REG_L x17, PT_A7(sp) > - REG_L x18, PT_S2(sp) > - REG_L x19, PT_S3(sp) > - REG_L x20, PT_S4(sp) > - REG_L x21, PT_S5(sp) > - REG_L x22, PT_S6(sp) > - REG_L x23, PT_S7(sp) > - REG_L x24, PT_S8(sp) > - REG_L x25, PT_S9(sp) > - REG_L x26, PT_S10(sp) > - REG_L x27, PT_S11(sp) > - REG_L x28, PT_T3(sp) > - REG_L x29, PT_T4(sp) > - REG_L x30, PT_T5(sp) > - REG_L x31, PT_T6(sp) > - .endm > +#include "kprobes_trampoline.h" > > ENTRY(__kretprobe_trampoline) > addi sp, sp, -(PT_SIZE_ON_STACK) > diff --git a/arch/riscv/kernel/probes/kprobes_trampoline.h b/arch/riscv/kernel/probes/kprobes_trampoline.h > new file mode 100644 > index 000000000..48895a5e3 > --- /dev/null > +++ b/arch/riscv/kernel/probes/kprobes_trampoline.h > @@ -0,0 +1,79 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +#ifndef _KPROBES_TRAMPOLINE_H > +#define _KPROBES_TRAMPOLINE_H > +/* > + * Author: Patrick Stählin <me@packi.ch> > + */ > +#include <linux/linkage.h> > + > +#include <asm/asm.h> > +#include <asm/asm-offsets.h> > + > + .text > + .altmacro > + > + .macro save_all_base_regs > + REG_S x1, PT_RA(sp) > + REG_S x3, PT_GP(sp) > + REG_S x4, PT_TP(sp) > + REG_S x5, PT_T0(sp) > + REG_S x6, PT_T1(sp) > + REG_S x7, PT_T2(sp) > + REG_S x8, PT_S0(sp) > + REG_S x9, PT_S1(sp) > + REG_S x10, PT_A0(sp) > + REG_S x11, PT_A1(sp) > + REG_S x12, PT_A2(sp) > + REG_S x13, PT_A3(sp) > + REG_S x14, PT_A4(sp) > + REG_S x15, PT_A5(sp) > + REG_S x16, PT_A6(sp) > + REG_S x17, PT_A7(sp) > + REG_S x18, PT_S2(sp) > + REG_S x19, PT_S3(sp) > + REG_S x20, PT_S4(sp) > + REG_S x21, PT_S5(sp) > + REG_S x22, PT_S6(sp) > + REG_S x23, PT_S7(sp) > + REG_S x24, PT_S8(sp) > + REG_S x25, PT_S9(sp) > + REG_S x26, PT_S10(sp) > + REG_S x27, PT_S11(sp) > + REG_S x28, PT_T3(sp) > + REG_S x29, PT_T4(sp) > + REG_S x30, PT_T5(sp) > + REG_S x31, PT_T6(sp) > + .endm > + > + .macro restore_all_base_regs > + REG_L x3, PT_GP(sp) > + REG_L x4, PT_TP(sp) > + REG_L x5, PT_T0(sp) > + REG_L x6, PT_T1(sp) > + REG_L x7, PT_T2(sp) > + REG_L x8, PT_S0(sp) > + REG_L x9, PT_S1(sp) > + REG_L x10, PT_A0(sp) > + REG_L x11, PT_A1(sp) > + REG_L x12, PT_A2(sp) > + REG_L x13, PT_A3(sp) > + REG_L x14, PT_A4(sp) > + REG_L x15, PT_A5(sp) > + REG_L x16, PT_A6(sp) > + REG_L x17, PT_A7(sp) > + REG_L x18, PT_S2(sp) > + REG_L x19, PT_S3(sp) > + REG_L x20, PT_S4(sp) > + REG_L x21, PT_S5(sp) > + REG_L x22, PT_S6(sp) > + REG_L x23, PT_S7(sp) > + REG_L x24, PT_S8(sp) > + REG_L x25, PT_S9(sp) > + REG_L x26, PT_S10(sp) > + REG_L x27, PT_S11(sp) > + REG_L x28, PT_T3(sp) > + REG_L x29, PT_T4(sp) > + REG_L x30, PT_T5(sp) > + REG_L x31, PT_T6(sp) > + .endm > +#endif > diff --git a/arch/riscv/kernel/probes/rethook.c b/arch/riscv/kernel/probes/rethook.c > new file mode 100644 > index 000000000..47853bc36 > --- /dev/null > +++ b/arch/riscv/kernel/probes/rethook.c > @@ -0,0 +1,24 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Generic return hook for riscv. > + */ > + > +#include <linux/kprobes.h> > +#include <linux/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); > diff --git a/arch/riscv/kernel/probes/rethook_trampoline.S b/arch/riscv/kernel/probes/rethook_trampoline.S > new file mode 100644 > index 000000000..e81c3d4e0 > --- /dev/null > +++ b/arch/riscv/kernel/probes/rethook_trampoline.S > @@ -0,0 +1,22 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Author: Patrick Stählin <me@packi.ch> > + */ > +#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) > diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h > index 55041d2f8..a3805b5b2 100644 > --- a/include/linux/kprobes.h > +++ b/include/linux/kprobes.h > @@ -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); > > base-commit: f30480cdeafc79d1f017d41335a96d8e3b973c91 > -- > 2.25.1 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4] rethook: add riscv rethook implementation. 2022-09-22 13:44 ` [PATCH v4] " l3b2w1 2022-09-23 17:26 ` Conor Dooley @ 2022-09-24 8:54 ` Masami Hiramatsu 1 sibling, 0 replies; 6+ messages in thread From: Masami Hiramatsu @ 2022-09-24 8:54 UTC (permalink / raw) To: l3b2w1 Cc: paul.walmsley, palmer, aou, naveen.n.rao, anil.s.keshavamurthy, davem, linux-riscv, linux-kernel Hi Binglei, On Thu, 22 Sep 2022 21:44:28 +0800 l3b2w1@gmail.com wrote: > From: Binglei Wang <l3b2w1@gmail.com> > > Implement the kretprobes function on riscv arch by > using rethook machenism which abstracts general kretprobe info > into the struct rethook_node > to be embedded in the struct kretprobe_instance Thanks for working on it. BTW, you might work on older kernel. Could you check your kernel has commit 73f9b911faa7 ("kprobes: Use rethook for kretprobe if possible") ? It replaces the kretprobe implementation in kernel/kprobes.c with rethook. This means your patch also must remove the arch dependent kretprobe implementation (arch_prepare_kretprobe(), __kretprobe_trampoline, trampoline_handler() and arch_kretprobe_fixup_return()), and you don't need to create kprobes_trampoline.h, but just rename kprobes_trampoline.S to rethook_trampoline.S. Thank you, > > Signed-off-by: Binglei Wang <l3b2w1@gmail.com> > --- > 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 | 24 ++++++ > arch/riscv/kernel/probes/rethook_trampoline.S | 22 ++++++ > include/linux/kprobes.h | 6 ++ > 8 files changed, 134 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_trampoline.S > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index ed66c31e4..c5cae0825 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -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 > diff --git a/arch/riscv/kernel/probes/Makefile b/arch/riscv/kernel/probes/Makefile > index 7f0840dcc..ee345e7e9 100644 > --- a/arch/riscv/kernel/probes/Makefile > +++ b/arch/riscv/kernel/probes/Makefile > @@ -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) > diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/kprobes.c > index e6e950b7c..04911cc42 100644 > --- a/arch/riscv/kernel/probes/kprobes.c > +++ b/arch/riscv/kernel/probes/kprobes.c > @@ -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; > diff --git a/arch/riscv/kernel/probes/kprobes_trampoline.S b/arch/riscv/kernel/probes/kprobes_trampoline.S > index 7bdb09ded..54937f342 100644 > --- a/arch/riscv/kernel/probes/kprobes_trampoline.S > +++ b/arch/riscv/kernel/probes/kprobes_trampoline.S > @@ -2,78 +2,7 @@ > /* > * Author: Patrick Stählin <me@packi.ch> > */ > -#include <linux/linkage.h> > - > -#include <asm/asm.h> > -#include <asm/asm-offsets.h> > - > - .text > - .altmacro > - > - .macro save_all_base_regs > - REG_S x1, PT_RA(sp) > - REG_S x3, PT_GP(sp) > - REG_S x4, PT_TP(sp) > - REG_S x5, PT_T0(sp) > - REG_S x6, PT_T1(sp) > - REG_S x7, PT_T2(sp) > - REG_S x8, PT_S0(sp) > - REG_S x9, PT_S1(sp) > - REG_S x10, PT_A0(sp) > - REG_S x11, PT_A1(sp) > - REG_S x12, PT_A2(sp) > - REG_S x13, PT_A3(sp) > - REG_S x14, PT_A4(sp) > - REG_S x15, PT_A5(sp) > - REG_S x16, PT_A6(sp) > - REG_S x17, PT_A7(sp) > - REG_S x18, PT_S2(sp) > - REG_S x19, PT_S3(sp) > - REG_S x20, PT_S4(sp) > - REG_S x21, PT_S5(sp) > - REG_S x22, PT_S6(sp) > - REG_S x23, PT_S7(sp) > - REG_S x24, PT_S8(sp) > - REG_S x25, PT_S9(sp) > - REG_S x26, PT_S10(sp) > - REG_S x27, PT_S11(sp) > - REG_S x28, PT_T3(sp) > - REG_S x29, PT_T4(sp) > - REG_S x30, PT_T5(sp) > - REG_S x31, PT_T6(sp) > - .endm > - > - .macro restore_all_base_regs > - REG_L x3, PT_GP(sp) > - REG_L x4, PT_TP(sp) > - REG_L x5, PT_T0(sp) > - REG_L x6, PT_T1(sp) > - REG_L x7, PT_T2(sp) > - REG_L x8, PT_S0(sp) > - REG_L x9, PT_S1(sp) > - REG_L x10, PT_A0(sp) > - REG_L x11, PT_A1(sp) > - REG_L x12, PT_A2(sp) > - REG_L x13, PT_A3(sp) > - REG_L x14, PT_A4(sp) > - REG_L x15, PT_A5(sp) > - REG_L x16, PT_A6(sp) > - REG_L x17, PT_A7(sp) > - REG_L x18, PT_S2(sp) > - REG_L x19, PT_S3(sp) > - REG_L x20, PT_S4(sp) > - REG_L x21, PT_S5(sp) > - REG_L x22, PT_S6(sp) > - REG_L x23, PT_S7(sp) > - REG_L x24, PT_S8(sp) > - REG_L x25, PT_S9(sp) > - REG_L x26, PT_S10(sp) > - REG_L x27, PT_S11(sp) > - REG_L x28, PT_T3(sp) > - REG_L x29, PT_T4(sp) > - REG_L x30, PT_T5(sp) > - REG_L x31, PT_T6(sp) > - .endm > +#include "kprobes_trampoline.h" > > ENTRY(__kretprobe_trampoline) > addi sp, sp, -(PT_SIZE_ON_STACK) > diff --git a/arch/riscv/kernel/probes/kprobes_trampoline.h b/arch/riscv/kernel/probes/kprobes_trampoline.h > new file mode 100644 > index 000000000..48895a5e3 > --- /dev/null > +++ b/arch/riscv/kernel/probes/kprobes_trampoline.h > @@ -0,0 +1,79 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +#ifndef _KPROBES_TRAMPOLINE_H > +#define _KPROBES_TRAMPOLINE_H > +/* > + * Author: Patrick Stählin <me@packi.ch> > + */ > +#include <linux/linkage.h> > + > +#include <asm/asm.h> > +#include <asm/asm-offsets.h> > + > + .text > + .altmacro > + > + .macro save_all_base_regs > + REG_S x1, PT_RA(sp) > + REG_S x3, PT_GP(sp) > + REG_S x4, PT_TP(sp) > + REG_S x5, PT_T0(sp) > + REG_S x6, PT_T1(sp) > + REG_S x7, PT_T2(sp) > + REG_S x8, PT_S0(sp) > + REG_S x9, PT_S1(sp) > + REG_S x10, PT_A0(sp) > + REG_S x11, PT_A1(sp) > + REG_S x12, PT_A2(sp) > + REG_S x13, PT_A3(sp) > + REG_S x14, PT_A4(sp) > + REG_S x15, PT_A5(sp) > + REG_S x16, PT_A6(sp) > + REG_S x17, PT_A7(sp) > + REG_S x18, PT_S2(sp) > + REG_S x19, PT_S3(sp) > + REG_S x20, PT_S4(sp) > + REG_S x21, PT_S5(sp) > + REG_S x22, PT_S6(sp) > + REG_S x23, PT_S7(sp) > + REG_S x24, PT_S8(sp) > + REG_S x25, PT_S9(sp) > + REG_S x26, PT_S10(sp) > + REG_S x27, PT_S11(sp) > + REG_S x28, PT_T3(sp) > + REG_S x29, PT_T4(sp) > + REG_S x30, PT_T5(sp) > + REG_S x31, PT_T6(sp) > + .endm > + > + .macro restore_all_base_regs > + REG_L x3, PT_GP(sp) > + REG_L x4, PT_TP(sp) > + REG_L x5, PT_T0(sp) > + REG_L x6, PT_T1(sp) > + REG_L x7, PT_T2(sp) > + REG_L x8, PT_S0(sp) > + REG_L x9, PT_S1(sp) > + REG_L x10, PT_A0(sp) > + REG_L x11, PT_A1(sp) > + REG_L x12, PT_A2(sp) > + REG_L x13, PT_A3(sp) > + REG_L x14, PT_A4(sp) > + REG_L x15, PT_A5(sp) > + REG_L x16, PT_A6(sp) > + REG_L x17, PT_A7(sp) > + REG_L x18, PT_S2(sp) > + REG_L x19, PT_S3(sp) > + REG_L x20, PT_S4(sp) > + REG_L x21, PT_S5(sp) > + REG_L x22, PT_S6(sp) > + REG_L x23, PT_S7(sp) > + REG_L x24, PT_S8(sp) > + REG_L x25, PT_S9(sp) > + REG_L x26, PT_S10(sp) > + REG_L x27, PT_S11(sp) > + REG_L x28, PT_T3(sp) > + REG_L x29, PT_T4(sp) > + REG_L x30, PT_T5(sp) > + REG_L x31, PT_T6(sp) > + .endm > +#endif > diff --git a/arch/riscv/kernel/probes/rethook.c b/arch/riscv/kernel/probes/rethook.c > new file mode 100644 > index 000000000..47853bc36 > --- /dev/null > +++ b/arch/riscv/kernel/probes/rethook.c > @@ -0,0 +1,24 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Generic return hook for riscv. > + */ > + > +#include <linux/kprobes.h> > +#include <linux/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); > diff --git a/arch/riscv/kernel/probes/rethook_trampoline.S b/arch/riscv/kernel/probes/rethook_trampoline.S > new file mode 100644 > index 000000000..e81c3d4e0 > --- /dev/null > +++ b/arch/riscv/kernel/probes/rethook_trampoline.S > @@ -0,0 +1,22 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Author: Patrick Stählin <me@packi.ch> > + */ > +#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) > diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h > index 55041d2f8..a3805b5b2 100644 > --- a/include/linux/kprobes.h > +++ b/include/linux/kprobes.h > @@ -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); > > base-commit: f30480cdeafc79d1f017d41335a96d8e3b973c91 > -- > 2.25.1 > -- Masami Hiramatsu (Google) <mhiramat@kernel.org> _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-24 8:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20220922040443.605175-1-l3b2w1@gmail.com>
2022-09-22 8:40 ` [PATCH] rethook: add riscv rethook implementation kernel test robot
2022-09-22 10:23 ` kernel test robot
[not found] ` <20220922111933.607219-1-l3b2w1@gmail.com>
2022-09-22 11:28 ` Conor Dooley
2022-09-22 13:44 ` [PATCH v4] " l3b2w1
2022-09-23 17:26 ` Conor Dooley
2022-09-24 8:54 ` Masami Hiramatsu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).