Messages in this thread | | | From | Guo Ren <> | Date | Tue, 17 Jan 2023 11:20:39 +0800 | Subject | Re: [PATCH -next V6 7/7] samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI] |
| |
On Fri, Jan 13, 2023 at 6:48 PM Song Shuai <suagrfillet@gmail.com> wrote: > > Hi,Guo: > > Song Shuai <suagrfillet@gmail.com> 于2023年1月11日周三 09:50写道: > > > > <guoren@kernel.org> 于2023年1月7日周六 13:36写道: > > > > > > From: Song Shuai <suagrfillet@gmail.com> > > > > > > select HAVE_SAMPLE_FTRACE_DIRECT and HAVE_SAMPLE_FTRACE_DIRECT_MULTI > > > for ARCH_RV64I in arch/riscv/Kconfig. And add riscv asm code for > > > the ftrace-direct*.c files in samples/ftrace/. > > > > > > Signed-off-by: Song Shuai <suagrfillet@gmail.com> > > > Tested-by: Guo Ren <guoren@kernel.org> > > > Signed-off-by: Guo Ren <guoren@kernel.org> > > > --- > > Hi,Guo && Evgenii: > > > > As Evgenii comments, this patch has two problems to fix: > > > > 1. the modification of Kconfig is missing > > So we should add it back > > > > 2. the build error resulted by including of nospec-branch.h file > > This including is exclusive for x86 architecture, moving it under > > x86 #ifdef seems better to fix this error > > > > I fixed them in my GitHub repo, but I can't find a reasonable target > > branch in your repo to PR. > > So I paste the link of my branch here, you can pick the first 2 > > commits in the next series. > > > > - samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI] > > - samples: ftrace: Include the nospec-branch.h only for x86 > This patch for the 2nd problem mentioned above seems to be omitted in > the V7 series. > I paste the raw patch link here. Hope you can add it in the next. > > https://github.com/sugarfillet/linux/commit/9539a80dc6e7d1137ec7a96ebef2ab912a694bd7.patch Why do we need an x86 patchset in a riscv series? Without the patch, what's compile error in riscv?
> > > > Link: https://github.com/sugarfillet/linux/commits/song_ftrace_fix_up_v6 > > > > > samples/ftrace/ftrace-direct-modify.c | 33 ++++++++++++++++++ > > > samples/ftrace/ftrace-direct-multi-modify.c | 37 +++++++++++++++++++++ > > > samples/ftrace/ftrace-direct-multi.c | 22 ++++++++++++ > > > samples/ftrace/ftrace-direct-too.c | 26 +++++++++++++++ > > > samples/ftrace/ftrace-direct.c | 22 ++++++++++++ > > > 5 files changed, 140 insertions(+) > > > > > > diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-direct-modify.c > > > index de5a0f67f320..be7bf472c3c7 100644 > > > --- a/samples/ftrace/ftrace-direct-modify.c > > > +++ b/samples/ftrace/ftrace-direct-modify.c > > > @@ -23,6 +23,39 @@ extern void my_tramp2(void *); > > > > > > static unsigned long my_ip = (unsigned long)schedule; > > > > > > +#ifdef CONFIG_RISCV > > > + > > > +asm (" .pushsection .text, \"ax\", @progbits\n" > > > +" .type my_tramp1, @function\n" > > > +" .globl my_tramp1\n" > > > +" my_tramp1:\n" > > > +" addi sp,sp,-16\n" > > > +" sd t0,0(sp)\n" > > > +" sd ra,8(sp)\n" > > > +" call my_direct_func1\n" > > > +" ld t0,0(sp)\n" > > > +" ld ra,8(sp)\n" > > > +" addi sp,sp,16\n" > > > +" jr t0\n" > > > +" .size my_tramp1, .-my_tramp1\n" > > > + > > > +" .type my_tramp2, @function\n" > > > +" .globl my_tramp2\n" > > > +" my_tramp2:\n" > > > +" addi sp,sp,-16\n" > > > +" sd t0,0(sp)\n" > > > +" sd ra,8(sp)\n" > > > +" call my_direct_func2\n" > > > +" ld t0,0(sp)\n" > > > +" ld ra,8(sp)\n" > > > +" addi sp,sp,16\n" > > > +" jr t0\n" > > > +" .size my_tramp2, .-my_tramp2\n" > > > +" .popsection\n" > > > +); > > > + > > > +#endif /* CONFIG_RISCV */ > > > + > > > #ifdef CONFIG_X86_64 > > > > > > #include <asm/ibt.h> > > > diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c > > > index d52370cad0b6..10884bf418f7 100644 > > > --- a/samples/ftrace/ftrace-direct-multi-modify.c > > > +++ b/samples/ftrace/ftrace-direct-multi-modify.c > > > @@ -21,6 +21,43 @@ void my_direct_func2(unsigned long ip) > > > extern void my_tramp1(void *); > > > extern void my_tramp2(void *); > > > > > > +#ifdef CONFIG_RISCV > > > + > > > +asm (" .pushsection .text, \"ax\", @progbits\n" > > > +" .type my_tramp1, @function\n" > > > +" .globl my_tramp1\n" > > > +" my_tramp1:\n" > > > +" addi sp,sp,-24\n" > > > +" sd a0,0(sp)\n" > > > +" sd t0,8(sp)\n" > > > +" sd ra,16(sp)\n" > > > +" call my_direct_func1\n" > > > +" ld a0,0(sp)\n" > > > +" ld t0,8(sp)\n" > > > +" ld ra,16(sp)\n" > > > +" addi sp,sp,24\n" > > > +" jr t0\n" > > > +" .size my_tramp1, .-my_tramp1\n" > > > + > > > +" .type my_tramp2, @function\n" > > > +" .globl my_tramp2\n" > > > +" my_tramp2:\n" > > > +" addi sp,sp,-24\n" > > > +" sd a0,0(sp)\n" > > > +" sd t0,8(sp)\n" > > > +" sd ra,16(sp)\n" > > > +" call my_direct_func2\n" > > > +" ld a0,0(sp)\n" > > > +" ld t0,8(sp)\n" > > > +" ld ra,16(sp)\n" > > > +" addi sp,sp,24\n" > > > +" jr t0\n" > > > +" .size my_tramp2, .-my_tramp2\n" > > > +" .popsection\n" > > > +); > > > + > > > +#endif /* CONFIG_RISCV */ > > > + > > > #ifdef CONFIG_X86_64 > > > > > > #include <asm/ibt.h> > > > diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c > > > index ec1088922517..a35bf43bf6d7 100644 > > > --- a/samples/ftrace/ftrace-direct-multi.c > > > +++ b/samples/ftrace/ftrace-direct-multi.c > > > @@ -16,6 +16,28 @@ void my_direct_func(unsigned long ip) > > > > > > extern void my_tramp(void *); > > > > > > +#ifdef CONFIG_RISCV > > > + > > > +asm (" .pushsection .text, \"ax\", @progbits\n" > > > +" .type my_tramp, @function\n" > > > +" .globl my_tramp\n" > > > +" my_tramp:\n" > > > +" addi sp,sp,-24\n" > > > +" sd a0,0(sp)\n" > > > +" sd t0,8(sp)\n" > > > +" sd ra,16(sp)\n" > > > +" call my_direct_func\n" > > > +" ld a0,0(sp)\n" > > > +" ld t0,8(sp)\n" > > > +" ld ra,16(sp)\n" > > > +" addi sp,sp,24\n" > > > +" jr t0\n" > > > +" .size my_tramp, .-my_tramp\n" > > > +" .popsection\n" > > > +); > > > + > > > +#endif /* CONFIG_RISCV */ > > > + > > > #ifdef CONFIG_X86_64 > > > > > > #include <asm/ibt.h> > > > diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c > > > index e13fb59a2b47..3b62e33c2e6d 100644 > > > --- a/samples/ftrace/ftrace-direct-too.c > > > +++ b/samples/ftrace/ftrace-direct-too.c > > > @@ -18,6 +18,32 @@ void my_direct_func(struct vm_area_struct *vma, > > > > > > extern void my_tramp(void *); > > > > > > +#ifdef CONFIG_RISCV > > > + > > > +asm (" .pushsection .text, \"ax\", @progbits\n" > > > +" .type my_tramp, @function\n" > > > +" .globl my_tramp\n" > > > +" my_tramp:\n" > > > +" addi sp,sp,-40\n" > > > +" sd a0,0(sp)\n" > > > +" sd a1,8(sp)\n" > > > +" sd a2,16(sp)\n" > > > +" sd t0,24(sp)\n" > > > +" sd ra,32(sp)\n" > > > +" call my_direct_func\n" > > > +" ld a0,0(sp)\n" > > > +" ld a1,8(sp)\n" > > > +" ld a2,16(sp)\n" > > > +" ld t0,24(sp)\n" > > > +" ld ra,32(sp)\n" > > > +" addi sp,sp,40\n" > > > +" jr t0\n" > > > +" .size my_tramp, .-my_tramp\n" > > > +" .popsection\n" > > > +); > > > + > > > +#endif /* CONFIG_RISCV */ > > > + > > > #ifdef CONFIG_X86_64 > > > > > > #include <asm/ibt.h> > > > diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c > > > index 1f769d0db20f..2cfe5a7d2d70 100644 > > > --- a/samples/ftrace/ftrace-direct.c > > > +++ b/samples/ftrace/ftrace-direct.c > > > @@ -15,6 +15,28 @@ void my_direct_func(struct task_struct *p) > > > > > > extern void my_tramp(void *); > > > > > > +#ifdef CONFIG_RISCV > > > + > > > +asm (" .pushsection .text, \"ax\", @progbits\n" > > > +" .type my_tramp, @function\n" > > > +" .globl my_tramp\n" > > > +" my_tramp:\n" > > > +" addi sp,sp,-24\n" > > > +" sd a0,0(sp)\n" > > > +" sd t0,8(sp)\n" > > > +" sd ra,16(sp)\n" > > > +" call my_direct_func\n" > > > +" ld a0,0(sp)\n" > > > +" ld t0,8(sp)\n" > > > +" ld ra,16(sp)\n" > > > +" addi sp,sp,24\n" > > > +" jr t0\n" > > > +" .size my_tramp, .-my_tramp\n" > > > +" .popsection\n" > > > +); > > > + > > > +#endif /* CONFIG_RISCV */ > > > + > > > #ifdef CONFIG_X86_64 > > > > > > #include <asm/ibt.h> > > > -- > > > 2.36.1 > > > > > > > > > -- > > Thanks, > > Song > > > > -- > Thanks, > Song
-- Best Regards Guo Ren
| |