Skip to contentSkip to conversation

riscv/ftrace: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY

PATCH Superseded Song Shuai 2 participants 3 messages Nov 28, 2022 – Nov 30, 2022 RISC-V

v2 of 11 Superseded Latest is v11 →

lore
Share & tools
lore

Song Shuai

author
#0 lore raw

PATCH v2 1/1 riscv/ftrace: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY

From: Song Shuai <[email protected]>

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
index fa78595a6089..afc520a45ded 100644
@@ -277,6 +277,7 @@ config ARCH_RV64I
 	select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && $(cc-option,-fpatchable-function-entry=8)
 	select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
 	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
+	select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY if DYNAMIC_FTRACE
 	select HAVE_FUNCTION_GRAPH_TRACER
 	select HAVE_FUNCTION_TRACER if !XIP_KERNEL
 	select SWIOTLB if MMU
Signature · 1 line
2.34.1
author
#1 lore raw
Quoted 9 lines · Song Shuai <[email protected]> 于2022年11月28日周一 15:45写道:

From: Song Shuai <[email protected]>

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.

Quoted 6 lines

Here selects FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY to tell Makefile not to run recordmcount.

This patch has conflicts with the commit ("riscv: ftrace: Add DYNAMIC_FTRACE_WITH_DIRECT_CALLS
support") and its next commit in this file.

How about reposting this patch based on the above commits and folding it into the v5 version?

Here pastes the link for your convenience.
https://lore.kernel.org/linux-riscv/[email protected]/T/#u

Quoted 17 lines
---
 arch/riscv/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/riscv/Kconfig +1 -1
index fa78595a6089..afc520a45ded 100644
@@ -277,6 +277,7 @@ config ARCH_RV64I
        select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && $(cc-option,-fpatchable-function-entry=8)
        select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
        select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
+       select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY if DYNAMIC_FTRACE
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACER if !XIP_KERNEL
        select SWIOTLB if MMU
--
Quoted 2 lines

2.34.1

--
Thanks,
Song

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

#2 lore raw
Quoted 17 lines · Song Shuai
Quoted 9 lines · Song Shuai <[email protected]> 于2022年11月28日周一 15:45写道:

From: Song Shuai <[email protected]>

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.

Quoted 6 lines

Here selects FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY to tell Makefile not to run recordmcount.

Quoted 6 lines

This patch has conflicts with the commit ("riscv: ftrace: Add DYNAMIC_FTRACE_WITH_DIRECT_CALLS
support") and its next commit in this file.

How about reposting this patch based on the above commits and folding it into the v5 version?

Okay, it's the proper reason to merge them. Thx!

Quoted 28 lines

Here pastes the link for your convenience.
https://lore.kernel.org/linux-riscv/[email protected]/T/#u

Quoted 17 lines
---
 arch/riscv/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/riscv/Kconfig +1 -1
index fa78595a6089..afc520a45ded 100644
@@ -277,6 +277,7 @@ config ARCH_RV64I
        select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && $(cc-option,-fpatchable-function-entry=8)
        select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
        select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
+       select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY if DYNAMIC_FTRACE
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACER if !XIP_KERNEL
        select SWIOTLB if MMU
--
Quoted 2 lines

2.34.1

--
Thanks,
Song

Signature · 2 lines
Best Regards
 Guo Ren