Skip to content

Commit c264534

Browse files
HSM6236rostedt
authored andcommitted
fgraph: Remove coarse PID filtering from graph_entry()
With PID filtering working via ftrace_pids_enabled() and fgraph_pid_func, the coarse-grained ftrace_trace_task() check in graph_entry() is obsolete. It was only a fallback for uninitialized op->private (now fixed), and its removal ensures consistent PID filtering with standard function tracing. Also remove unused ftrace_trace_task() definition from trace.h. 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/20251126173552333XoJZN20143fWbsdTEtWoU@zte.com.cn Signed-off-by: Shengming Hu <hu.shengming@zte.com.cn> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent 1650a1b commit c264534

2 files changed

Lines changed: 0 additions & 12 deletions

File tree

kernel/trace/trace.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,11 +1154,6 @@ struct ftrace_func_command {
11541154
char *params, int enable);
11551155
};
11561156
extern bool ftrace_filter_param __initdata;
1157-
static inline int ftrace_trace_task(struct trace_array *tr)
1158-
{
1159-
return this_cpu_read(tr->array_buffer.data->ftrace_ignore_pid) !=
1160-
FTRACE_PID_IGNORE;
1161-
}
11621157
extern int ftrace_is_dead(void);
11631158
int ftrace_create_function_files(struct trace_array *tr,
11641159
struct dentry *parent);
@@ -1176,10 +1171,6 @@ void ftrace_clear_pids(struct trace_array *tr);
11761171
int init_function_trace(void);
11771172
void ftrace_pid_follow_fork(struct trace_array *tr, bool enable);
11781173
#else
1179-
static inline int ftrace_trace_task(struct trace_array *tr)
1180-
{
1181-
return 1;
1182-
}
11831174
static inline int ftrace_is_dead(void) { return 0; }
11841175
static inline int
11851176
ftrace_create_function_files(struct trace_array *tr,

kernel/trace/trace_functions_graph.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,6 @@ static int graph_entry(struct ftrace_graph_ent *trace,
232232
return 1;
233233
}
234234

235-
if (!ftrace_trace_task(tr))
236-
return 0;
237-
238235
if (ftrace_graph_ignore_func(gops, trace))
239236
return 0;
240237

0 commit comments

Comments
 (0)