Skip to contentSkip to conversation

ftrace: Updates for 6.13

PATCH New Steven Rostedt 1 participant 4 messages Oct 15, 2024

Subsystems (4)
lore
Share & tools
lore

Steven Rostedt

author maintainer
#0 lore raw

cover ftrace: Updates for 6.13

git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
ftrace/for-next

Head SHA1: 2d17932da44fdc1ba835ad05110ab996d2912dbf

Masami Hiramatsu (Google) (2):
ftrace: Use arch_ftrace_regs() for ftrace_regs_*() macros
ftrace: Rename ftrace_regs_return_value to ftrace_regs_get_return_value

Steven Rostedt (1):
selftests/ftrace: Fix check of return value in fgraph-retval.tc test

----

 include/linux/ftrace_regs.h                                | 14 +++++++-------
 .../selftests/ftrace/test.d/ftrace/fgraph-retval.tc        |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
author maintainer
#1 lore raw

PATCH 1/3 ftrace: Use arch_ftrace_regs() for ftrace_regs_*() macros

From: "Masami Hiramatsu (Google)" <[email protected]>

Since the arch_ftrace_get_regs(fregs) is only valid when the FL_SAVE_REGS is set, we need to use &arch_ftrace_regs()->regs for ftrace_regs_*() APIs because those APIs are for ftrace_regs, not complete pt_regs.

Cc Alexei Starovoitov <[email protected]>
Cc Florent Revest <[email protected]>
Cc Martin KaFai Lau <[email protected]>
Cc Alexei Starovoitov <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Alan Maguire <[email protected]>
Cc Mark Rutland <[email protected]>
Fixes e4cf33ca4812 ("ftrace: Consolidate ftrace_regs accessor functions for archs using pt_regs")
---
 include/linux/ftrace_regs.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
include/linux/ftrace_regs.h +6 -6
index dea6a0851b74..b78a0a60515b 100644
@@ -17,17 +17,17 @@ struct __arch_ftrace_regs {
 struct ftrace_regs;
 
 #define ftrace_regs_get_instruction_pointer(fregs) \
-	instruction_pointer(arch_ftrace_get_regs(fregs))
+	instruction_pointer(&arch_ftrace_regs(fregs)->regs)
 #define ftrace_regs_get_argument(fregs, n) \
-	regs_get_kernel_argument(arch_ftrace_get_regs(fregs), n)
+	regs_get_kernel_argument(&arch_ftrace_regs(fregs)->regs, n)
 #define ftrace_regs_get_stack_pointer(fregs) \
-	kernel_stack_pointer(arch_ftrace_get_regs(fregs))
+	kernel_stack_pointer(&arch_ftrace_regs(fregs)->regs)
 #define ftrace_regs_return_value(fregs) \
-	regs_return_value(arch_ftrace_get_regs(fregs))
+	regs_return_value(&arch_ftrace_regs(fregs)->regs)
 #define ftrace_regs_set_return_value(fregs, ret) \
-	regs_set_return_value(arch_ftrace_get_regs(fregs), ret)
+	regs_set_return_value(&arch_ftrace_regs(fregs)->regs, ret)
 #define ftrace_override_function_with_return(fregs) \
-	override_function_with_return(arch_ftrace_get_regs(fregs))
+	override_function_with_return(&arch_ftrace_regs(fregs)->regs)
 #define ftrace_regs_query_register_offset(name) \
 	regs_query_register_offset(name)
 
Signature · 1 line
2.45.2
author maintainer
#2 lore raw

PATCH 2/3 selftests/ftrace: Fix check of return value in fgraph-retval.tc test

In reply to Steven Rostedt

From: Steven Rostedt <[email protected]>

The addition of recording both the function name and return address to the function graph tracer updated the selftest to check for "=-5" from "= -5". But this causes the test to fail on certain configs, as "= -5" is still a value that can be returned if function addresses are not enabled (older kernels).

Check for both "=-5" and " -5" as a success value.

Cc Masami Hiramatsu <[email protected]>
Cc Mathieu Desnoyers <[email protected]>
Cc Shuah Khan <[email protected]>
Cc Donglin Peng <[email protected]>
Fixes 21e92806d39c6 ("function_graph: Support recording and printing the function return address")
---
 tools/testing/selftests/ftrace/test.d/ftrace/fgraph-retval.tc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/ftrace/test.d/ftrace/fgraph-retval.tc +1 -1
index e8e46378b88d..4307d4eef417 100644
@@ -29,7 +29,7 @@ set -e
 
 : "Test printing the error code in signed decimal format"
 echo 0 > options/funcgraph-retval-hex
-count=`cat trace | grep 'proc_reg_write' | grep '=-5' | wc -l`
+count=`cat trace | grep 'proc_reg_write' | grep -e '=-5 ' -e '= -5 '  | wc -l`
 if [ $count -eq 0 ]; then
     fail "Return value can not be printed in signed decimal format"
 fi
Signature · 1 line
2.45.2
author maintainer
#3 lore raw

PATCH 3/3 ftrace: Rename ftrace_regs_return_value to ftrace_regs_get_return_value

In reply to Steven Rostedt

From: "Masami Hiramatsu (Google)" <[email protected]>

Rename ftrace_regs_return_value to ftrace_regs_get_return_value as same as other ftrace_regs_get/set_* APIs. arm64 and riscv are already using this new name.

---
 include/linux/ftrace_regs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/ftrace_regs.h +1 -1
index b78a0a60515b..be1ed0c891d0 100644
@@ -22,7 +22,7 @@ struct ftrace_regs;
 	regs_get_kernel_argument(&arch_ftrace_regs(fregs)->regs, n)
 #define ftrace_regs_get_stack_pointer(fregs) \
 	kernel_stack_pointer(&arch_ftrace_regs(fregs)->regs)
-#define ftrace_regs_return_value(fregs) \
+#define ftrace_regs_get_return_value(fregs) \
 	regs_return_value(&arch_ftrace_regs(fregs)->regs)
 #define ftrace_regs_set_return_value(fregs, ret) \
 	regs_set_return_value(&arch_ftrace_regs(fregs)->regs, ret)
Signature · 1 line
2.45.2