]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
function_graph: Fix args pointer mismatch in print_graph_retval()
authorDonglin Peng <pengdonglin@xiaomi.com>
Mon, 12 Jan 2026 02:16:01 +0000 (10:16 +0800)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Fri, 23 Jan 2026 18:34:38 +0000 (13:34 -0500)
When funcgraph-args and funcgraph-retaddr are both enabled, many kernel
functions display invalid parameters in trace logs.

The issue occurs because print_graph_retval() passes a mismatched args
pointer to print_function_args(). Fix this by retrieving the correct
args pointer using the FGRAPH_ENTRY_ARGS() macro.

Link: https://patch.msgid.link/20260112021601.1300479-1-dolinux.peng@gmail.com
Fixes: f83ac7544fbf ("function_graph: Enable funcgraph-args and funcgraph-retaddr to work simultaneously")
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Donglin Peng <pengdonglin@xiaomi.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
kernel/trace/trace_functions_graph.c

index b1e9c9913309640acc183de1782e919510a5dc2e..1de6f157362131eec108daa55eae8ddda45cb894 100644 (file)
@@ -901,7 +901,7 @@ static void print_graph_retval(struct trace_seq *s, struct ftrace_graph_ent_entr
                trace_seq_printf(s, "%ps", func);
 
                if (args_size >= FTRACE_REGS_MAX_ARGS * sizeof(long)) {
-                       print_function_args(s, entry->args, (unsigned long)func);
+                       print_function_args(s, FGRAPH_ENTRY_ARGS(entry), (unsigned long)func);
                        trace_seq_putc(s, ';');
                } else
                        trace_seq_puts(s, "();");