riscv: Optimize function trace
v10 cover riscv: Optimize function trace
Changes in v10:
- add Acked-by from Björn Töpel in patch 2 and patch 4
- replace move with mv in patch3
- prettify patch 2/4 with proper tabs
You can directly try it with:
https://github.com/sugarfillet/linux/tree/6.4-rc1-rv-ftrace-v10
This series optimizes function trace. The first 3 independent patches has been picked in the V7 version of this series, the subsequent version continues the following 4 patches:
select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY [1] (patch 1)
==========================================================
In RISC-V, -fpatchable-function-entry option is used to support dynamic ftrace in this commit afc76b8b8011 ("riscv: Using PATCHABLE_FUNCTION_ENTRY instead of MCOUNT"). So recordmcount don't have to be called to create the __mcount_loc section before the vmlinux linking.
Here selects FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY to tell Makefile not to run recordmcount.
Make function graph use ftrace directly [2] (patch 2)
========================================================
In RISC-V architecture, when we enable the ftrace_graph tracer on some functions, the function tracings on other functions will suffer extra graph tracing work. In essence, graph_ops isn't limited by its func_hash due to the global ftrace_graph_[regs]_call label. That should be corrected.
What inspires me is the commit 0c0593b45c9b ("x86/ftrace: Make function graph use ftrace directly") that uses graph_ops::func function to install return_hooker and makes the function called against its func_hash.
Add WITH_DIRECT_CALLS support [3] (patch 3, 4)
==============================================
This series adds DYNAMIC_FTRACE_WITH_DIRECT_CALLS support for RISC-V. SAMPLE_FTRACE_DIRECT and SAMPLE_FTRACE_DIRECT_MULTI are also included here as the samples for testing DIRECT_CALLS related interface.
First, select the DYNAMIC_FTRACE_WITH_DIRECT_CALLS to provide register_ftrace_direct[_multi] interfaces allowing user to register the customed trampoline (direct_caller) as the mcount for one or more target functions. And modify_ftrace_direct[_multi] are also provided for modify direct_caller.
At the same time, the samples in ./samples/ftrace/ can be built as kerenl module for testing these interfaces with SAMPLE_FTRACE_DIRECT and SAMPLE_FTRACE_DIRECT_MULTI selected.
Second, to make the direct_caller and the other ftrace hooks (eg. function/fgraph tracer, k[ret]probes) co-exist, a temporary register
are nominated to store the address of direct_caller in ftrace_regs_caller.
After the setting of the address direct_caller by direct_ops->func and the RESTORE_REGS in ftrace_regs_caller, direct_caller will be jumped to by the jr inst.
The series's old changes related these patches
==========================================
Changes in v9:
https://lore.kernel.org/linux-riscv/[email protected]/
1. add Acked-by from Björn Töpel in patch 1
2. rebase patch2/patch3 on Linux v6.4-rc1
- patch 2: to make the SAVE_ABI_REGS configurable, revert the modification of mcount-dyn.S from commit (45b32b946a97 "riscv:
entry: Consolidate general regs saving/restoring")
- patch 3: to pass the trace_selftest, add the implement of ftrace_stub_direct_tramp from commit (fee86a4ed536 "ftrace:
selftest: remove broken trace_direct_tramp") ; and fixup the context conflict in Kconfig
Changes in v8:
https://lore.kernel.org/linux-riscv/[email protected]/
- Fix incorrect address values in the 4nd patch
- Rebased on v6.3-rc2
Changes in v7:
https://lore.kernel.org/linux-riscv/[email protected]/
- Fixup RESTORE_ABI_REGS by remove PT_T0(sp) overwrite.
- Add FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY [1]
- Fixup kconfig with HAVE_SAMPLE_FTRACE_DIRECT & HAVE_SAMPLE_FTRACE_DIRECT_MULTI
Changes in v6:
https://lore.kernel.org/linux-riscv/[email protected]/
- Replace 8 with MCOUNT_INSN_SIZE
- Replace "REG_L a1, PT_RA(sp)" with "mv a1, ra"
- Add Evgenii Shatokhin comment
Changes in v5:
https://lore.kernel.org/linux-riscv/[email protected]/
- Sort Kconfig entries in alphabetical order.
Changes in v4:
https://lore.kernel.org/linux-riscv/[email protected]/
- Include [3] for maintenance. [Song Shuai]
Changes in V3:
https://lore.kernel.org/linux-riscv/[email protected]/
- Include [2] for maintenance. [Song Shuai]
[1]: https://lore.kernel.org/linux-riscv/CAAYs2=j3Eak9vU6xbAw0zPuoh00rh8v5C2U3fePkokZFibWs2g@mail.gmail.com/T/#t
[2]: https://lore.kernel.org/lkml/[email protected]/
[3]: https://lore.kernel.org/linux-riscv/[email protected]/
Song Shuai (4):
riscv: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY
riscv: ftrace: Add ftrace_graph_func
riscv: ftrace: Add DYNAMIC_FTRACE_WITH_DIRECT_CALLS support
samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI]
arch/riscv/Kconfig | 4 + arch/riscv/include/asm/ftrace.h | 19 +- arch/riscv/kernel/ftrace.c | 30 ++- arch/riscv/kernel/mcount-dyn.S | 200 ++++++++++++++++---- samples/ftrace/ftrace-direct-modify.c | 34 ++++ samples/ftrace/ftrace-direct-multi-modify.c | 40 ++++ samples/ftrace/ftrace-direct-multi.c | 24 +++ samples/ftrace/ftrace-direct-too.c | 27 +++ samples/ftrace/ftrace-direct.c | 23 +++ 9 files changed, 345 insertions(+), 56 deletions(-)
Signature · 1 line
2.20.1
PATCH v10 1/4 riscv: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY
In RISC-V, -fpatchable-function-entry option is used to support dynamic ftrace in this commit afc76b8b8011 ("riscv: Using PATCHABLE_FUNCTION_ENTRY instead of MCOUNT"). So recordmcount don't have to be called to create the __mcount_loc section before the vmlinux linking.
Here selects FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY to tell Makefile not to run recordmcount.
--- arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/riscv/Kconfig +1 -0
@@ -58,6 +58,7 @@ config RISCV select COMMON_CLK select CPU_PM if CPU_IDLE || HIBERNATION select EDAC_SUPPORT + select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY if DYNAMIC_FTRACE select GENERIC_ARCH_TOPOLOGY select GENERIC_ATOMIC64 if !64BIT select GENERIC_CLOCKEVENTS_BROADCAST if SMP
Signature · 7 lines
2.20.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v10 2/4 riscv: ftrace: Add ftrace_graph_func
In reply to Song ShuaiHere implements ftrace_graph_func as the function graph tracing function with FTRACE_WITH_REGS defined.
function_graph_func gets the point of the parent IP and the frame pointer from fregs and call prepare_ftrace_return for function graph tracing.
If FTRACE_WITH_REGS isn't defined, the enable/disable helpers of ftrace_graph_[regs]_call are revised for serving only ftrace_graph_call in the !FTRACE_WITH_REGS version ftrace_caller.
--- arch/riscv/include/asm/ftrace.h | 11 +- arch/riscv/kernel/ftrace.c | 30 +++-- arch/riscv/kernel/mcount-dyn.S | 190 +++++++++++++++++++++++++------- 3 files changed, 175 insertions(+), 56 deletions(-)
arch/riscv/include/asm/ftrace.h +10 -1
@@ -107,7 +107,16 @@ do { \struct dyn_ftrace ;int ftrace_init_nop (struct module *mod,struct dyn_ftrace *rec);#define ftrace_init_nop ftrace_init_nop -#endif + +#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS +struct ftrace_ops ; +struct ftrace_regs ; +void ftrace_graph_func (unsigned long ip,unsigned long parent_ip, +struct ftrace_ops *op,struct ftrace_regs *fregs); +#define ftrace_graph_func ftrace_graph_func +#endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ + +#endif /* __ASSEMBLY__ */ #endif /* CONFIG_DYNAMIC_FTRACE */
arch/riscv/kernel/ftrace.c +13 -17
@@ -178,32 +178,28 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, }#ifdef CONFIG_DYNAMIC_FTRACE +#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS +void ftrace_graph_func (unsigned long ip,unsigned long parent_ip, +struct ftrace_ops *op,struct ftrace_regs *fregs) +{ +struct pt_regs *regs =arch_ftrace_get_regs (fregs); +unsigned long *parent = (unsigned long *)®s->ra; + +prepare_ftrace_return (parent, ip,frame_pointer (regs)); +} +#else /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ extern void ftrace_graph_call (void ); -extern void ftrace_graph_regs_call (void );int ftrace_enable_ftrace_graph_caller (void ) { -int ret; - - ret =__ftrace_modify_call ((unsigned long )&ftrace_graph_call, - (unsigned long )&prepare_ftrace_return, true, true); -if (ret) -return ret; - -return __ftrace_modify_call ((unsigned long )&ftrace_graph_regs_call, +return __ftrace_modify_call ((unsigned long )&ftrace_graph_call, (unsigned long )&prepare_ftrace_return, true, true); }int ftrace_disable_ftrace_graph_caller (void ) { -int ret; - - ret =__ftrace_modify_call ((unsigned long )&ftrace_graph_call, - (unsigned long )&prepare_ftrace_return, false, true); -if (ret) -return ret; - -return __ftrace_modify_call ((unsigned long )&ftrace_graph_regs_call, +return __ftrace_modify_call ((unsigned long )&ftrace_graph_call, (unsigned long )&prepare_ftrace_return, false, true); } +#endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ #endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
arch/riscv/kernel/mcount-dyn.S +152 -38
219 lines not on this page · raw message
Signature · 7 lines
2.20.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v10 3/4 riscv: ftrace: Add DYNAMIC_FTRACE_WITH_DIRECT_CALLS support
In reply to Song ShuaiThis patch adds DYNAMIC_FTRACE_WITH_DIRECT_CALLS support for RISC-V.
select the DYNAMIC_FTRACE_WITH_DIRECT_CALLS to provide the register_ftrace_direct[_multi] interfaces allowing users to register the customed trampoline (direct_caller) as the mcount for one or more target functions. And modify_ftrace_direct[_multi] are also provided for modifying direct_caller.
To make the direct_caller and the other ftrace hooks (eg. function/fgraph tracer, k[ret]probes) co-exist, a temporary register is nominated to store the address of direct_caller in ftrace_regs_caller. After the setting of the address direct_caller by direct_ops->func and the RESTORE_REGS in ftrace_regs_caller, direct_caller will be jumped to by the jr inst.
--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/ftrace.h | 8 ++++++++ arch/riscv/kernel/mcount-dyn.S | 10 ++++++++++ 3 files changed, 19 insertions(+)
arch/riscv/Kconfig +1 -0
@@ -144,6 +144,7 @@ config RISCV select UACCESS_MEMCPY if !MMU select ZONE_DMA32 if 64BIT select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && (CLANG_SUPPORTS_DYNAMIC_FTRACE || GCC_SUPPORTS_DYNAMIC_FTRACE) + select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL select HAVE_FUNCTION_GRAPH_TRACER
arch/riscv/include/asm/ftrace.h +8 -0
@@ -114,6 +114,14 @@ struct ftrace_regs;void ftrace_graph_func (unsigned long ip,unsigned long parent_ip,struct ftrace_ops *op,struct ftrace_regs *fregs);#define ftrace_graph_func ftrace_graph_func + +static inline void +__arch_ftrace_set_direct_caller (struct pt_regs *regs,unsigned long addr) +{ + regs->t1 = addr; +} +#define arch_ftrace_set_direct_caller (fregs, addr) \ + __arch_ftrace_set_direct_caller(&(fregs)->regs, addr)#endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ #endif /* __ASSEMBLY__ */
arch/riscv/kernel/mcount-dyn.S +10 -0
@@ -231,6 +231,7 @@ ENDPROC(ftrace_caller) #else /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ ENTRY(ftrace_regs_caller) + mv t1, zero SAVE_ABI_REGS 1 PREPARE_ARGS
@@ -239,7 +240,10 @@ ftrace_regs_call: call ftrace_stub RESTORE_ABI_REGS 1 + bnez t1,.Ldirect jr t0 +.Ldirect: + jr t1 ENDPROC(ftrace_regs_caller) ENTRY(ftrace_caller)
@@ -254,3 +258,9 @@ ftrace_call: jr t0 ENDPROC(ftrace_caller) #endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ + +#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS +SYM_CODE_START(ftrace_stub_direct_tramp) + jr t0 +SYM_CODE_END(ftrace_stub_direct_tramp) +#endif /* CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS */
Signature · 7 lines
2.20.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH V10 3/4] riscv: ftrace: Add DYNAMIC_FTRACE_WITH_DIRECT_CALLS support
Quoted 15 lines · Song Shuai
This patch adds
DYNAMIC_FTRACE_WITH_DIRECT_CALLSsupport for RISC-V.select the
DYNAMIC_FTRACE_WITH_DIRECT_CALLSto provide the register_ftrace_direct[_multi] interfaces allowing users to register the customed trampoline (direct_caller) as the mcount for one or more target functions. And modify_ftrace_direct[_multi] are also provided for modifyingdirect_caller.To make the
direct_callerand the other ftrace hooks (eg. function/fgraph tracer, k[ret]probes) co-exist, a temporary register is nominated to store the address ofdirect_callerinftrace_regs_caller. After the setting of the addressdirect_callerbydirect_ops->funcand theRESTORE_REGSinftrace_regs_caller,direct_callerwill be jumped to by thejrinst.
Quoted 3 lines
Signed-off-by Song Shuai <[email protected]>Tested-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>
Thank you for addressing my comments, and for your work on WITH_DIRECT_CALLS!
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v10 4/4 samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI]
In reply to Song Shuaiselect 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/.
--- arch/riscv/Kconfig | 2 ++ samples/ftrace/ftrace-direct-modify.c | 34 ++++++++++++++++++ samples/ftrace/ftrace-direct-multi-modify.c | 40 +++++++++++++++++++++ samples/ftrace/ftrace-direct-multi.c | 24 +++++++++++++ samples/ftrace/ftrace-direct-too.c | 27 ++++++++++++++ samples/ftrace/ftrace-direct.c | 23 ++++++++++++ 6 files changed, 150 insertions(+)
arch/riscv/Kconfig +2 -0
@@ -121,6 +121,8 @@ config RISCV select HAVE_POSIX_CPU_TIMERS_TASK_WORK select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RSEQ + select HAVE_SAMPLE_FTRACE_DIRECT + select HAVE_SAMPLE_FTRACE_DIRECT_MULTI select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS select IRQ_DOMAIN
samples/ftrace/ftrace-direct-modify.c +34 -0
@@ -22,6 +22,40 @@ 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>
samples/ftrace/ftrace-direct-multi-modify.c +40 -0
@@ -20,6 +20,46 @@ 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" +" mv a0,t0\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" +" mv a0,t0\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>
samples/ftrace/ftrace-direct-multi.c +24 -0
@@ -15,6 +15,30 @@ 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" +" mv a0,t0\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>
samples/ftrace/ftrace-direct-too.c +27 -0
@@ -17,6 +17,33 @@ 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>
samples/ftrace/ftrace-direct.c +23 -0
@@ -14,6 +14,29 @@ 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>
Signature · 7 lines
2.20.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Steven Rostedt
maintainerRe: [PATCH V10 4/4] samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI]
Quoted 10 lines · On Thu, 11 May 2023 17:32:34 +0800 Song Shuai <[email protected]> wrote:
select
HAVE_SAMPLE_FTRACE_DIRECTandHAVE_SAMPLE_FTRACE_DIRECT_MULTIforARCH_RV64Iinarch/riscv/Kconfig. And add riscv asm code for the ftrace-direct*.c files insamples/ftrace/.Link https://lore.kernel.org/linux-riscv/[email protected]/T/#ma13012560331c66b051b580b3ab4a04ba44455ec open hereTested-by Evgenii Shatokhin <[email protected]>Signed-off-by Song Shuai <[email protected]>Tested-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Acked-by Björn Töpel <[email protected]>
Quoted 8 lines
--- arch/riscv/Kconfig | 2 ++ samples/ftrace/ftrace-direct-modify.c | 34 ++++++++++++++++++ samples/ftrace/ftrace-direct-multi-modify.c | 40 +++++++++++++++++++++ samples/ftrace/ftrace-direct-multi.c | 24 +++++++++++++ samples/ftrace/ftrace-direct-too.c | 27 ++++++++++++++ samples/ftrace/ftrace-direct.c | 23 ++++++++++++ 6 files changed, 150 insertions(+)
I acked v8 (which you will need my ack to get these in). Unless this patch changed since v8, you should include my ack in further versions.
Or you may be waiting longer for its acceptance.
If the patch did change, please acknowledge that in the next version (or this one if it did change), asking me to ack it again.
-- Steve
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Steven Rostedt
maintainerRe: [PATCH V10 4/4] samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI]
Quoted 22 lines · On Mon, 15 May 2023 14:37:00 -0400 Steven Rostedt <[email protected]> wrote:
Quoted 10 lines · On Thu, 11 May 2023 17:32:34 +0800 Song Shuai <[email protected]> wrote:
select
HAVE_SAMPLE_FTRACE_DIRECTandHAVE_SAMPLE_FTRACE_DIRECT_MULTIforARCH_RV64Iinarch/riscv/Kconfig. And add riscv asm code for the ftrace-direct*.c files insamples/ftrace/.Link https://lore.kernel.org/linux-riscv/[email protected]/T/#ma13012560331c66b051b580b3ab4a04ba44455ec open hereTested-by Evgenii Shatokhin <[email protected]>Signed-off-by Song Shuai <[email protected]>Tested-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Acked-by Björn Töpel <[email protected]>Quoted 8 lines
--- arch/riscv/Kconfig | 2 ++ samples/ftrace/ftrace-direct-modify.c | 34 ++++++++++++++++++ samples/ftrace/ftrace-direct-multi-modify.c | 40 +++++++++++++++++++++ samples/ftrace/ftrace-direct-multi.c | 24 +++++++++++++ samples/ftrace/ftrace-direct-too.c | 27 ++++++++++++++ samples/ftrace/ftrace-direct.c | 23 ++++++++++++ 6 files changed, 150 insertions(+)
Quoted 8 lines
I acked v8 (which you will need my ack to get these in). Unless this patch changed since v8, you should include my ack in further versions.
Or you may be waiting longer for its acceptance.
If the patch did change, please acknowledge that in the next version (or this one if it did change), asking me to ack it again.
Nevermind, I'm an idiot (and my inbox is not in date order). You sent this *after* I acked v8, when I should have been acking this one. ;-)
Sorry about that! I've been traveling and my inbox is a mess :-p
-- Steve
Re: [PATCH V10 4/4] samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI]
In reply to Steven RostedtQuoted 23 lines · Steven Rostedt <[email protected]> 于2023年5月15日周一 18:37写道:
Quoted 10 lines · On Thu, 11 May 2023 17:32:34 +0800 Song Shuai <[email protected]> wrote:
select
HAVE_SAMPLE_FTRACE_DIRECTandHAVE_SAMPLE_FTRACE_DIRECT_MULTIforARCH_RV64Iinarch/riscv/Kconfig. And add riscv asm code for the ftrace-direct*.c files insamples/ftrace/.Link https://lore.kernel.org/linux-riscv/[email protected]/T/#ma13012560331c66b051b580b3ab4a04ba44455ec open hereTested-by Evgenii Shatokhin <[email protected]>Signed-off-by Song Shuai <[email protected]>Tested-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Acked-by Björn Töpel <[email protected]>Quoted 8 lines
--- arch/riscv/Kconfig | 2 ++ samples/ftrace/ftrace-direct-modify.c | 34 ++++++++++++++++++ samples/ftrace/ftrace-direct-multi-modify.c | 40 +++++++++++++++++++++ samples/ftrace/ftrace-direct-multi.c | 24 +++++++++++++ samples/ftrace/ftrace-direct-too.c | 27 ++++++++++++++ samples/ftrace/ftrace-direct.c | 23 ++++++++++++ 6 files changed, 150 insertions(+)
Quoted 3 lines
I acked v8 (which you will need my ack to get these in). Unless this patch changed since v8, you should include my ack in further versions.
There were no changes in this patch, except for a few tab pretties since v8. your Acked-by will still be included.
Quoted 6 lines
Or you may be waiting longer for its acceptance.
If the patch did change, please acknowledge that in the next version (or this one if it did change), asking me to ack it again.
-- Steve
Signature · 2 lines
Thanks, Song
Palmer Dabbelt
maintainerRe: [PATCH V10 4/4] samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI]
Quoted 24 lines · On Tue, 16 May 2023 02:37:53 PDT (-0700), [email protected] wrote:
Quoted 23 lines · Steven Rostedt <[email protected]> 于2023年5月15日周一 18:37写道:
Quoted 18 lines · On Thu, 11 May 2023 17:32:34 +0800 Song Shuai <[email protected]> wrote:
select
HAVE_SAMPLE_FTRACE_DIRECTandHAVE_SAMPLE_FTRACE_DIRECT_MULTIforARCH_RV64Iinarch/riscv/Kconfig. And add riscv asm code for the ftrace-direct*.c files insamples/ftrace/.Link https://lore.kernel.org/linux-riscv/[email protected]/T/#ma13012560331c66b051b580b3ab4a04ba44455ec open hereTested-by Evgenii Shatokhin <[email protected]>Signed-off-by Song Shuai <[email protected]>Tested-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Acked-by Björn Töpel <[email protected]>--- arch/riscv/Kconfig | 2 ++ samples/ftrace/ftrace-direct-modify.c | 34 ++++++++++++++++++ samples/ftrace/ftrace-direct-multi-modify.c | 40 +++++++++++++++++++++ samples/ftrace/ftrace-direct-multi.c | 24 +++++++++++++ samples/ftrace/ftrace-direct-too.c | 27 ++++++++++++++ samples/ftrace/ftrace-direct.c | 23 ++++++++++++ 6 files changed, 150 insertions(+)
Quoted 9 lines
Quoted 3 lines
I acked v8 (which you will need my ack to get these in). Unless this patch changed since v8, you should include my ack in further versions.
There were no changes in this patch, except for a few tab pretties since v8. your Acked-by will still be included.
Quoted 4 lines
Or you may be waiting longer for its acceptance.
If the patch did change, please acknowledge that in the next version (or this one if it did change), asking me to ack it again.
The samples fail to build on rv32, they're rv64-specific. I think something like this should do it
samples/ftrace/ftrace-direct-too.c +0 -0
@@ -24,19 +24,19 @@ asm (
" .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" +" addi sp,sp,-8*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" -" 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" +" 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,8*SZREG\n" " jr t0\n" " .size my_tramp, .-my_tramp\n" " .popsection\n"
probably for all of them. Do you mind sending a v11 with that fixed?
Quoted 8 lines
Quoted 2 lines
-- Steve
Signature · 2 lines
Thanks, Song
Quoted 12 lines · Song Shuai <[email protected]> 于2023年5月11日周四 09:32写道:
Changes in v10:
- add Acked-by from Björn Töpel in patch 2 and patch 4
- replacemovewithmvin patch3
- prettify patch 2/4 with proper tabsYou can directly try it with:
https://github.com/sugarfillet/linux/tree/6.4-rc1-rv-ftrace-v10
Hi, plamer:
This series is ready for its acceptance, you can pick it up.
Quoted 126 lines
This series optimizes function trace. The first 3 independent patches has been picked in the V7 version of this series, the subsequent version continues the following 4 patches:
select
FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY[1] (patch 1)
==========================================================In RISC-V, -fpatchable-function-entry option is used to support dynamic ftrace in this commit
afc76b8b8011("riscv: UsingPATCHABLE_FUNCTION_ENTRYinstead of MCOUNT"). So recordmcount don't have to be called to create the__mcount_locsection before the vmlinux linking.Here selects
FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRYto tellMakefilenot to run recordmcount.Make function graph use ftrace directly [2] (patch 2)
========================================================In RISC-V architecture, when we enable the
ftrace_graphtracer on some functions, the function tracings on other functions will suffer extra graph tracing work. In essence,graph_opsisn't limited by itsfunc_hashdue to the global ftrace_graph_[regs]_call label. That should be corrected.What inspires me is the commit
0c0593b45c9b("x86/ftrace: Make function graph use ftrace directly") that usesgraph_ops::funcfunction to installreturn_hookerand makes the function called against itsfunc_hash.Add
WITH_DIRECT_CALLSsupport [3] (patch 3, 4)
==============================================This series adds
DYNAMIC_FTRACE_WITH_DIRECT_CALLSsupport for RISC-V.SAMPLE_FTRACE_DIRECTandSAMPLE_FTRACE_DIRECT_MULTIare also included here as the samples for testingDIRECT_CALLSrelated interface.First, select the
DYNAMIC_FTRACE_WITH_DIRECT_CALLSto provide register_ftrace_direct[_multi] interfaces allowing user to register the customed trampoline (direct_caller) as the mcount for one or more target functions. And modify_ftrace_direct[_multi] are also provided for modifydirect_caller.At the same time, the samples in
./samples/ftrace/can be built as kerenl module for testing these interfaces withSAMPLE_FTRACE_DIRECTandSAMPLE_FTRACE_DIRECT_MULTIselected.Second, to make the
direct_callerand the other ftrace hooks (eg. function/fgraph tracer, k[ret]probes) co-exist, a temporary register
are nominated to store the address ofdirect_callerinftrace_regs_caller.
After the setting of the addressdirect_callerbydirect_ops->funcand theRESTORE_REGSinftrace_regs_caller,direct_callerwill be jumped to by thejrinst.The series's old changes related these patches
==========================================Changes in v9:
https://lore.kernel.org/linux-riscv/[email protected]/1. add Acked-by from Björn Töpel in patch 1
2. rebase patch2/patch3 on Linux v6.4-rc1
- patch 2: to make the
SAVE_ABI_REGSconfigurable, revert the modification ofmcount-dyn.Sfrom commit (45b32b946a97"riscv:
entry: Consolidate general regs saving/restoring")- patch 3: to pass the
trace_selftest, add the implement offtrace_stub_direct_trampfrom commit (fee86a4ed536"ftrace:
selftest: remove brokentrace_direct_tramp") ; and fixup the context conflict inKconfigChanges in v8:
https://lore.kernel.org/linux-riscv/[email protected]/
- Fix incorrect address values in the 4nd patch
- Rebased on v6.3-rc2Changes in v7:
https://lore.kernel.org/linux-riscv/[email protected]/
- FixupRESTORE_ABI_REGSby removePT_T0(sp)overwrite.
- AddFTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY[1]
- Fixup kconfig withHAVE_SAMPLE_FTRACE_DIRECT&HAVE_SAMPLE_FTRACE_DIRECT_MULTIChanges in v6:
https://lore.kernel.org/linux-riscv/[email protected]/
- Replace 8 withMCOUNT_INSN_SIZE
- Replace "REG_La1,PT_RA(sp)" with "mv a1, ra"
- Add Evgenii Shatokhin commentChanges in v5:
https://lore.kernel.org/linux-riscv/[email protected]/
- SortKconfigentries in alphabetical order.Changes in v4:
https://lore.kernel.org/linux-riscv/[email protected]/
- Include [3] for maintenance. [Song Shuai]Changes in V3:
https://lore.kernel.org/linux-riscv/[email protected]/
- Include [2] for maintenance. [Song Shuai][1]: https://lore.kernel.org/linux-riscv/CAAYs2=j3Eak9vU6xbAw0zPuoh00rh8v5C2U3fePkokZFibWs2g@mail.gmail.com/T/#t
[2]: https://lore.kernel.org/lkml/[email protected]/
[3]: https://lore.kernel.org/linux-riscv/[email protected]/Song Shuai (4):
riscv: selectFTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY
riscv: ftrace: Addftrace_graph_func
riscv: ftrace: AddDYNAMIC_FTRACE_WITH_DIRECT_CALLSsupport
samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI]arch/riscv/Kconfig | 4 + arch/riscv/include/asm/ftrace.h | 19 +- arch/riscv/kernel/ftrace.c | 30 ++- arch/riscv/kernel/mcount-dyn.S | 200 ++++++++++++++++---- samples/ftrace/ftrace-direct-modify.c | 34 ++++ samples/ftrace/ftrace-direct-multi-modify.c | 40 ++++ samples/ftrace/ftrace-direct-multi.c | 24 +++ samples/ftrace/ftrace-direct-too.c | 27 +++ samples/ftrace/ftrace-direct.c | 23 +++ 9 files changed, 345 insertions(+), 56 deletions(-)
Quoted 3 lines
--
2.20.1
--
Thanks,
Song
Quoted 10 lines · Song Shuai <[email protected]> 于2023年5月16日周二 09:50写道:
Quoted 7 lines · Song Shuai <[email protected]> 于2023年5月11日周四 09:32写道:
Changes in v10:
- add Acked-by from Björn Töpel in patch 2 and patch 4
- replacemovewithmvin patch3
- prettify patch 2/4 with proper tabs
Quoted 8 lines
Quoted 5 lines
You can directly try it with:
https://github.com/sugarfillet/linux/tree/6.4-rc1-rv-ftrace-v10
Hi, plamer:
This series is ready for its acceptance, you can pick it up.
Apologize for the typo in your name, Palmer.
Quoted 134 lines
Quoted 126 lines
This series optimizes function trace. The first 3 independent patches has been picked in the V7 version of this series, the subsequent version continues the following 4 patches:
select
FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY[1] (patch 1)
==========================================================In RISC-V, -fpatchable-function-entry option is used to support dynamic ftrace in this commit
afc76b8b8011("riscv: UsingPATCHABLE_FUNCTION_ENTRYinstead of MCOUNT"). So recordmcount don't have to be called to create the__mcount_locsection before the vmlinux linking.Here selects
FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRYto tellMakefilenot to run recordmcount.Make function graph use ftrace directly [2] (patch 2)
========================================================In RISC-V architecture, when we enable the
ftrace_graphtracer on some functions, the function tracings on other functions will suffer extra graph tracing work. In essence,graph_opsisn't limited by itsfunc_hashdue to the global ftrace_graph_[regs]_call label. That should be corrected.What inspires me is the commit
0c0593b45c9b("x86/ftrace: Make function graph use ftrace directly") that usesgraph_ops::funcfunction to installreturn_hookerand makes the function called against itsfunc_hash.Add
WITH_DIRECT_CALLSsupport [3] (patch 3, 4)
==============================================This series adds
DYNAMIC_FTRACE_WITH_DIRECT_CALLSsupport for RISC-V.SAMPLE_FTRACE_DIRECTandSAMPLE_FTRACE_DIRECT_MULTIare also included here as the samples for testingDIRECT_CALLSrelated interface.First, select the
DYNAMIC_FTRACE_WITH_DIRECT_CALLSto provide register_ftrace_direct[_multi] interfaces allowing user to register the customed trampoline (direct_caller) as the mcount for one or more target functions. And modify_ftrace_direct[_multi] are also provided for modifydirect_caller.At the same time, the samples in
./samples/ftrace/can be built as kerenl module for testing these interfaces withSAMPLE_FTRACE_DIRECTandSAMPLE_FTRACE_DIRECT_MULTIselected.Second, to make the
direct_callerand the other ftrace hooks (eg. function/fgraph tracer, k[ret]probes) co-exist, a temporary register
are nominated to store the address ofdirect_callerinftrace_regs_caller.
After the setting of the addressdirect_callerbydirect_ops->funcand theRESTORE_REGSinftrace_regs_caller,direct_callerwill be jumped to by thejrinst.The series's old changes related these patches
==========================================Changes in v9:
https://lore.kernel.org/linux-riscv/[email protected]/1. add Acked-by from Björn Töpel in patch 1
2. rebase patch2/patch3 on Linux v6.4-rc1
- patch 2: to make the
SAVE_ABI_REGSconfigurable, revert the modification ofmcount-dyn.Sfrom commit (45b32b946a97"riscv:
entry: Consolidate general regs saving/restoring")- patch 3: to pass the
trace_selftest, add the implement offtrace_stub_direct_trampfrom commit (fee86a4ed536"ftrace:
selftest: remove brokentrace_direct_tramp") ; and fixup the context conflict inKconfigChanges in v8:
https://lore.kernel.org/linux-riscv/[email protected]/
- Fix incorrect address values in the 4nd patch
- Rebased on v6.3-rc2Changes in v7:
https://lore.kernel.org/linux-riscv/[email protected]/
- FixupRESTORE_ABI_REGSby removePT_T0(sp)overwrite.
- AddFTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY[1]
- Fixup kconfig withHAVE_SAMPLE_FTRACE_DIRECT&HAVE_SAMPLE_FTRACE_DIRECT_MULTIChanges in v6:
https://lore.kernel.org/linux-riscv/[email protected]/
- Replace 8 withMCOUNT_INSN_SIZE
- Replace "REG_La1,PT_RA(sp)" with "mv a1, ra"
- Add Evgenii Shatokhin commentChanges in v5:
https://lore.kernel.org/linux-riscv/[email protected]/
- SortKconfigentries in alphabetical order.Changes in v4:
https://lore.kernel.org/linux-riscv/[email protected]/
- Include [3] for maintenance. [Song Shuai]Changes in V3:
https://lore.kernel.org/linux-riscv/[email protected]/
- Include [2] for maintenance. [Song Shuai][1]: https://lore.kernel.org/linux-riscv/CAAYs2=j3Eak9vU6xbAw0zPuoh00rh8v5C2U3fePkokZFibWs2g@mail.gmail.com/T/#t
[2]: https://lore.kernel.org/lkml/[email protected]/
[3]: https://lore.kernel.org/linux-riscv/[email protected]/Song Shuai (4):
riscv: selectFTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY
riscv: ftrace: Addftrace_graph_func
riscv: ftrace: AddDYNAMIC_FTRACE_WITH_DIRECT_CALLSsupport
samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI]arch/riscv/Kconfig | 4 + arch/riscv/include/asm/ftrace.h | 19 +- arch/riscv/kernel/ftrace.c | 30 ++- arch/riscv/kernel/mcount-dyn.S | 200 ++++++++++++++++---- samples/ftrace/ftrace-direct-modify.c | 34 ++++ samples/ftrace/ftrace-direct-multi-modify.c | 40 ++++ samples/ftrace/ftrace-direct-multi.c | 24 +++ samples/ftrace/ftrace-direct-too.c | 27 +++ samples/ftrace/ftrace-direct.c | 23 +++ 9 files changed, 345 insertions(+), 56 deletions(-)Quoted 3 lines
--
2.20.1--
Thanks,
Song
Signature · 2 lines
Thanks, Song