Unverified Commit 629291dd authored by Song Shuai's avatar Song Shuai Committed by Palmer Dabbelt
Browse files

samples: ftrace: Add RISC-V support for SAMPLE_FTRACE_DIRECT[_MULTI] 



Add RISC-V variants of the ftrace-direct* samples.

Tested-by: default avatarEvgenii Shatokhin <e.shatokhin@yadro.com>
Signed-off-by: default avatarSong Shuai <suagrfillet@gmail.com>
Tested-by: default avatarGuo Ren <guoren@kernel.org>
Signed-off-by: default avatarGuo Ren <guoren@kernel.org>
Acked-by: default avatarBjörn Töpel <bjorn@rivosinc.com>
Link: https://lore.kernel.org/r/20231130121531.1178502-5-bjorn@kernel.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 196c79f1

arch/riscv/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ config RISCV 
	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RETHOOK if !XIP_KERNEL

	select HAVE_RSEQ

	select HAVE_SAMPLE_FTRACE_DIRECT

	select HAVE_SAMPLE_FTRACE_DIRECT_MULTI

	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select HOTPLUG_CORE_SYNC_DEAD if HOTPLUG_CPU

samples/ftrace/ftrace-direct-modify.c

+35 −0
Original line number Diff line number Diff line
@@ -24,6 +24,41 @@ extern void my_tramp2(void *); 


static unsigned long my_ip = (unsigned long)schedule;



#ifdef CONFIG_RISCV

#include <asm/asm.h>



asm (

"	.pushsection    .text, \"ax\", @progbits\n"

"	.type		my_tramp1, @function\n"

"	.globl		my_tramp1\n"

"   my_tramp1:\n"

"	addi	sp,sp,-2*"SZREG"\n"

"	"REG_S"	t0,0*"SZREG"(sp)\n"

"	"REG_S"	ra,1*"SZREG"(sp)\n"

"	call	my_direct_func1\n"

"	"REG_L"	t0,0*"SZREG"(sp)\n"

"	"REG_L"	ra,1*"SZREG"(sp)\n"

"	addi	sp,sp,2*"SZREG"\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,-2*"SZREG"\n"

"	"REG_S"	t0,0*"SZREG"(sp)\n"

"	"REG_S"	ra,1*"SZREG"(sp)\n"

"	call	my_direct_func2\n"

"	"REG_L"	t0,0*"SZREG"(sp)\n"

"	"REG_L"	ra,1*"SZREG"(sp)\n"

"	addi	sp,sp,2*"SZREG"\n"

"	jr	t0\n"

"	.size		my_tramp2, .-my_tramp2\n"

"	.popsection\n"

);



#endif /* CONFIG_RISCV */



#ifdef CONFIG_X86_64



#include <asm/ibt.h>

samples/ftrace/ftrace-direct-multi-modify.c

+41 −0
Original line number Diff line number Diff line
@@ -22,6 +22,47 @@ void my_direct_func2(unsigned long ip) 
extern void my_tramp1(void *);

extern void my_tramp2(void *);



#ifdef CONFIG_RISCV

#include <asm/asm.h>



asm (

"	.pushsection    .text, \"ax\", @progbits\n"

"	.type		my_tramp1, @function\n"

"	.globl		my_tramp1\n"

"   my_tramp1:\n"

"       addi	sp,sp,-3*"SZREG"\n"

"       "REG_S"	a0,0*"SZREG"(sp)\n"

"       "REG_S"	t0,1*"SZREG"(sp)\n"

"       "REG_S"	ra,2*"SZREG"(sp)\n"

"       mv	a0,t0\n"

"       call	my_direct_func1\n"

"       "REG_L"	a0,0*"SZREG"(sp)\n"

"       "REG_L"	t0,1*"SZREG"(sp)\n"

"       "REG_L"	ra,2*"SZREG"(sp)\n"

"       addi	sp,sp,3*"SZREG"\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,-3*"SZREG"\n"

"       "REG_S"	a0,0*"SZREG"(sp)\n"

"       "REG_S"	t0,1*"SZREG"(sp)\n"

"       "REG_S"	ra,2*"SZREG"(sp)\n"

"       mv	a0,t0\n"

"       call	my_direct_func2\n"

"       "REG_L"	a0,0*"SZREG"(sp)\n"

"       "REG_L"	t0,1*"SZREG"(sp)\n"

"       "REG_L"	ra,2*"SZREG"(sp)\n"

"       addi	sp,sp,3*"SZREG"\n"

"	jr	t0\n"

"	.size		my_tramp2, .-my_tramp2\n"

"	.popsection\n"

);



#endif /* CONFIG_RISCV */



#ifdef CONFIG_X86_64



#include <asm/ibt.h>

samples/ftrace/ftrace-direct-multi.c

+25 −0
Original line number Diff line number Diff line
@@ -17,6 +17,31 @@ void my_direct_func(unsigned long ip) 


extern void my_tramp(void *);



#ifdef CONFIG_RISCV

#include <asm/asm.h>



asm (

"       .pushsection    .text, \"ax\", @progbits\n"

"       .type           my_tramp, @function\n"

"       .globl          my_tramp\n"

"   my_tramp:\n"

"       addi	sp,sp,-3*"SZREG"\n"

"       "REG_S"	a0,0*"SZREG"(sp)\n"

"       "REG_S"	t0,1*"SZREG"(sp)\n"

"       "REG_S"	ra,2*"SZREG"(sp)\n"

"       mv	a0,t0\n"

"       call	my_direct_func\n"

"       "REG_L"	a0,0*"SZREG"(sp)\n"

"       "REG_L"	t0,1*"SZREG"(sp)\n"

"       "REG_L"	ra,2*"SZREG"(sp)\n"

"       addi	sp,sp,3*"SZREG"\n"

"       jr	t0\n"

"       .size           my_tramp, .-my_tramp\n"

"       .popsection\n"

);



#endif /* CONFIG_RISCV */



#ifdef CONFIG_X86_64



#include <asm/ibt.h>

samples/ftrace/ftrace-direct-too.c

+28 −0
Original line number Diff line number Diff line
@@ -19,6 +19,34 @@ void my_direct_func(struct vm_area_struct *vma, unsigned long address, 


extern void my_tramp(void *);



#ifdef CONFIG_RISCV

#include <asm/asm.h>



asm (

"       .pushsection    .text, \"ax\", @progbits\n"

"       .type           my_tramp, @function\n"

"       .globl          my_tramp\n"

"   my_tramp:\n"

"       addi	sp,sp,-5*"SZREG"\n"

"       "REG_S"	a0,0*"SZREG"(sp)\n"

"       "REG_S"	a1,1*"SZREG"(sp)\n"

"       "REG_S"	a2,2*"SZREG"(sp)\n"

"       "REG_S"	t0,3*"SZREG"(sp)\n"

"       "REG_S"	ra,4*"SZREG"(sp)\n"

"       call	my_direct_func\n"

"       "REG_L"	a0,0*"SZREG"(sp)\n"

"       "REG_L"	a1,1*"SZREG"(sp)\n"

"       "REG_L"	a2,2*"SZREG"(sp)\n"

"       "REG_L"	t0,3*"SZREG"(sp)\n"

"       "REG_L"	ra,4*"SZREG"(sp)\n"

"       addi	sp,sp,5*"SZREG"\n"

"       jr	t0\n"

"       .size           my_tramp, .-my_tramp\n"

"       .popsection\n"

);



#endif /* CONFIG_RISCV */



#ifdef CONFIG_X86_64



#include <asm/ibt.h>