From: Palmer Dabbelt <palmer@rivosinc.com>
Date: Thu, 18 Jan 2024 02:17:29 +0000 (-0800)
Subject: Merge patch series "riscv: ftrace: Miscellaneous ftrace improvements"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3074e8b175382b97545e4d9e26c98a5077b02cb1;p=linux.git

Merge patch series "riscv: ftrace: Miscellaneous ftrace improvements"

Björn Töpel <bjorn@kernel.org> says:

This series includes a three ftrace improvements for RISC-V:

1. Do not require to run recordmcount at build time (patch 1)
2. Simplification of the function graph functionality (patch 2)
3. Enable DYNAMIC_FTRACE_WITH_DIRECT_CALLS (patch 3 and 4)

The series has been tested on Qemu/rv64 virt/Debian sid with the
following test configs:
  CONFIG_FTRACE_SELFTEST=y
  CONFIG_FTRACE_STARTUP_TEST=y
  CONFIG_SAMPLE_FTRACE_DIRECT=m
  CONFIG_SAMPLE_FTRACE_DIRECT_MULTI=m
  CONFIG_SAMPLE_FTRACE_OPS=m

All tests pass.

* b4-shazam-merge:
  samples: ftrace: Add RISC-V support for SAMPLE_FTRACE_DIRECT[_MULTI]
  riscv: ftrace: Add DYNAMIC_FTRACE_WITH_DIRECT_CALLS support
  riscv: ftrace: Make function graph use ftrace directly
  riscv: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY

Link: https://lore.kernel.org/r/20231130121531.1178502-1-bjorn@kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---

3074e8b175382b97545e4d9e26c98a5077b02cb1
diff --cc arch/riscv/Kconfig
index 1070728c83211,0ee79a92918dd..d6f3fc3930973
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -67,9 -65,10 +67,10 @@@ config RISC
  	select CLINT_TIMER if !MMU
  	select CLONE_BACKWARDS
  	select COMMON_CLK
 -	select CPU_PM if CPU_IDLE || HIBERNATION
 +	select CPU_PM if CPU_IDLE || HIBERNATION || SUSPEND
  	select EDAC_SUPPORT
  	select FRAME_POINTER if PERF_EVENTS || (FUNCTION_TRACER && !DYNAMIC_FTRACE)
+ 	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