fgraph: Check ftrace_pids_enabled on registration for early filtering

commit 1650a1b6cb1ae6cb99bb4fce21b30ebdf9fc238e upstream.

When registering ftrace_graph, check if ftrace_pids_enabled is active.
If enabled, assign entryfunc to fgraph_pid_func to ensure filtering
is performed before executing the saved original entry function.

Cc: stable@vger.kernel.org
Cc: <wang.yaxin@zte.com.cn>
Cc: <mhiramat@kernel.org>
Cc: <mark.rutland@arm.com>
Cc: <mathieu.desnoyers@efficios.com>
Cc: <zhang.run@zte.com.cn>
Cc: <yang.yang29@zte.com.cn>
Link: https://patch.msgid.link/20251126173331679XGVF98NLhyLJRdtNkVZ6w@zte.com.cn
Fixes: df3ec5da6a1e7 ("function_graph: Add pid tracing back to function graph tracer")
Signed-off-by: Shengming Hu <hu.shengming@zte.com.cn>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c
index 2637013086d68986420a231e75353a26de12a414..910da0e4531ae42468d8f7951bd91f1c952e2fa6 100644 (file)
--- a/kernel/trace/fgraph.c
+++ b/kernel/trace/fgraph.c
@@ -1286,6 +1286,13 @@ int register_ftrace_graph(struct fgraph_ops *gops)
 
        ftrace_graph_active++;
 
+       /* Always save the function, and reset at unregistering */
+       gops->saved_func = gops->entryfunc;
+#ifdef CONFIG_DYNAMIC_FTRACE
+       if (ftrace_pids_enabled(&gops->ops))
+               gops->entryfunc = fgraph_pid_func;
+#endif
+
        if (ftrace_graph_active == 2)
                ftrace_graph_disable_direct(true);
 
@@ -1305,8 +1312,6 @@ int register_ftrace_graph(struct fgraph_ops *gops)
        } else {
                init_task_vars(gops->idx);
        }
-       /* Always save the function, and reset at unregistering */
-       gops->saved_func = gops->entryfunc;
 
        ret = ftrace_startup_subops(&graph_ops, &gops->ops, command);
        if (!ret)