Fix for missed/kprobe_recursion

ci/diffs/2000-s390-fgraph-Fix-to-remove-ftrace_test_recursion_tryl.patch

@@ -0,0 +1,46 @@
+From faf291ff4beaef8dedebd166f11f815cdee257dc Mon Sep 17 00:00:00 2001
+From: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
+Date: Wed, 29 Jan 2025 00:29:37 +0900
+Subject: [PATCH 2000/2001] s390: fgraph: Fix to remove
+ ftrace_test_recursion_trylock()
+
+Fix to remove ftrace_test_recursion_trylock() from ftrace_graph_func()
+because commit d576aec24df9 ("fgraph: Get ftrace recursion lock in
+function_graph_enter") has been moved it to function_graph_enter_regs()
+already.
+
+Reported-by: Jiri Olsa <olsajiri@gmail.com>
+Closes: https://lore.kernel.org/all/Z5O0shrdgeExZ2kF@krava/
+Fixes: d576aec24df9 ("fgraph: Get ftrace recursion lock in function_graph_enter")
+Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
+Tested-by: Jiri Olsa <jolsa@kernel.org>
+---
+ arch/s390/kernel/ftrace.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
+index c0b2c97efefb..63ba6306632e 100644
+--- a/arch/s390/kernel/ftrace.c
++++ b/arch/s390/kernel/ftrace.c
+@@ -266,18 +266,13 @@ void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
+ 		       struct ftrace_ops *op, struct ftrace_regs *fregs)
+ {
+ 	unsigned long *parent = &arch_ftrace_regs(fregs)->regs.gprs[14];
+-	int bit;
+
+ 	if (unlikely(ftrace_graph_is_dead()))
+ 		return;
+ 	if (unlikely(atomic_read(&current->tracing_graph_pause)))
+ 		return;
+-	bit = ftrace_test_recursion_trylock(ip, *parent);
+-	if (bit < 0)
+-		return;
+ 	if (!function_graph_enter_regs(*parent, ip, 0, parent, fregs))
+ 		*parent = (unsigned long)&return_to_handler;
+-	ftrace_test_recursion_unlock(bit);
+ }
+
+ #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
+-- 
+2.48.1
+

ci/diffs/2001-s390-tracing-Define-ftrace_get_symaddr-for-s390.patch

@@ -0,0 +1,28 @@
+From 04fce0d606f59a62105729094013c4784492ec7b Mon Sep 17 00:00:00 2001
+From: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
+Date: Wed, 29 Jan 2025 00:29:48 +0900
+Subject: [PATCH 2001/2001] s390: tracing: Define ftrace_get_symaddr() for s390
+
+Add ftrace_get_symaddr() for s390, which returns the symbol address
+from ftrace's 'ip' parameter.
+
+Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
+---
+ arch/s390/include/asm/ftrace.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/s390/include/asm/ftrace.h b/arch/s390/include/asm/ftrace.h
+index a3b73a4f626e..185331e91f83 100644
+--- a/arch/s390/include/asm/ftrace.h
++++ b/arch/s390/include/asm/ftrace.h
+@@ -51,6 +51,7 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr)
+ {
+ 	return addr;
+ }
++#define ftrace_get_symaddr(fentry_ip) ((unsigned long)(fentry_ip))
+
+ #include <linux/ftrace_regs.h>
+
+-- 
+2.48.1
+

ci/vmtest/configs/DENYLIST.s390x

@@ -9,4 +9,3 @@ tailcalls
 trace_ext
 xdp_bpf2bpf
 xdp_metadata
-missed/kprobe_recursion