Commit 49e4154f authored by Zheng Yejian's avatar Zheng Yejian Committed by Steven Rostedt (Google)
Browse files

tracing: Remove TRACE_EVENT_FL_FILTERED logic 

After commit dcb0b557 ("tracing: Remove TRACE_EVENT_FL_USE_CALL_FILTER
 logic"), no one's going to set the TRACE_EVENT_FL_FILTERED or change the
call->filter, so remove related logic.

Link: https://lore.kernel.org/20240911010026.2302849-1-zhengyejian@huaweicloud.com


Signed-off-by: default avatarZheng Yejian <zhengyejian@huaweicloud.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 2aa746ec

include/linux/trace_events.h

+0 −4
Original line number Diff line number Diff line
@@ -326,7 +326,6 @@ void *trace_event_buffer_reserve(struct trace_event_buffer *fbuffer, 
void trace_event_buffer_commit(struct trace_event_buffer *fbuffer);



enum {

	TRACE_EVENT_FL_FILTERED_BIT,

	TRACE_EVENT_FL_CAP_ANY_BIT,

	TRACE_EVENT_FL_NO_SET_FILTER_BIT,

	TRACE_EVENT_FL_IGNORE_ENABLE_BIT,
@@ -341,7 +340,6 @@ enum { 


/*

 * Event flags:

 *  FILTERED	  - The event has a filter attached

 *  CAP_ANY	  - Any user can enable for perf

 *  NO_SET_FILTER - Set when filter has error and is to be ignored

 *  IGNORE_ENABLE - For trace internal events, do not enable with debugfs file
@@ -356,7 +354,6 @@ enum { 
 *                   to a tracepoint yet, then it is cleared when it is.

 */

enum {

	TRACE_EVENT_FL_FILTERED		= (1 << TRACE_EVENT_FL_FILTERED_BIT),

	TRACE_EVENT_FL_CAP_ANY		= (1 << TRACE_EVENT_FL_CAP_ANY_BIT),

	TRACE_EVENT_FL_NO_SET_FILTER	= (1 << TRACE_EVENT_FL_NO_SET_FILTER_BIT),

	TRACE_EVENT_FL_IGNORE_ENABLE	= (1 << TRACE_EVENT_FL_IGNORE_ENABLE_BIT),
@@ -381,7 +378,6 @@ struct trace_event_call { 
	};

	struct trace_event	event;

	char			*print_fmt;

	struct event_filter	*filter;

	/*

	 * Static events can disappear with modules,

	 * where as dynamic ones need their own ref count.

kernel/trace/trace.c

+9 −35
Original line number Diff line number Diff line
@@ -593,19 +593,6 @@ int tracing_check_open_get_tr(struct trace_array *tr) 
	return 0;

}



int call_filter_check_discard(struct trace_event_call *call, void *rec,

			      struct trace_buffer *buffer,

			      struct ring_buffer_event *event)

{

	if (unlikely(call->flags & TRACE_EVENT_FL_FILTERED) &&

	    !filter_match_preds(call->filter, rec)) {

		__trace_event_discard_commit(buffer, event);

		return 1;

	}



	return 0;

}



/**

 * trace_find_filtered_pid - check if a pid exists in a filtered_pid list

 * @filtered_pids: The list of pids to check
@@ -2889,7 +2876,6 @@ void 
trace_function(struct trace_array *tr, unsigned long ip, unsigned long

	       parent_ip, unsigned int trace_ctx)

{

	struct trace_event_call *call = &event_function;

	struct trace_buffer *buffer = tr->array_buffer.buffer;

	struct ring_buffer_event *event;

	struct ftrace_entry *entry;
@@ -2902,12 +2888,10 @@ trace_function(struct trace_array *tr, unsigned long ip, unsigned long 
	entry->ip			= ip;

	entry->parent_ip		= parent_ip;



	if (!call_filter_check_discard(call, entry, buffer, event)) {

	if (static_branch_unlikely(&trace_function_exports_enabled))

		ftrace_exports(event, TRACE_EXPORT_FUNCTION);

	__buffer_unlock_commit(buffer, event);

}

}



#ifdef CONFIG_STACKTRACE
@@ -2932,7 +2916,6 @@ static void __ftrace_trace_stack(struct trace_buffer *buffer, 
				 unsigned int trace_ctx,

				 int skip, struct pt_regs *regs)

{

	struct trace_event_call *call = &event_kernel_stack;

	struct ring_buffer_event *event;

	unsigned int size, nr_entries;

	struct ftrace_stack *fstack;
@@ -2986,7 +2969,6 @@ static void __ftrace_trace_stack(struct trace_buffer *buffer, 
	memcpy(&entry->caller, fstack->calls,

	       flex_array_size(entry, caller, nr_entries));



	if (!call_filter_check_discard(call, entry, buffer, event))

	__buffer_unlock_commit(buffer, event);



 out:
@@ -3060,7 +3042,6 @@ static void 
ftrace_trace_userstack(struct trace_array *tr,

		       struct trace_buffer *buffer, unsigned int trace_ctx)

{

	struct trace_event_call *call = &event_user_stack;

	struct ring_buffer_event *event;

	struct userstack_entry *entry;
@@ -3094,7 +3075,6 @@ ftrace_trace_userstack(struct trace_array *tr, 
	memset(&entry->caller, 0, sizeof(entry->caller));



	stack_trace_save_user(entry->caller, FTRACE_STACK_ENTRIES);

	if (!call_filter_check_discard(call, entry, buffer, event))

	__buffer_unlock_commit(buffer, event);



 out_drop_count:
@@ -3264,7 +3244,6 @@ static void trace_printk_start_stop_comm(int enabled) 
 */

int trace_vbprintk(unsigned long ip, const char *fmt, va_list args)

{

	struct trace_event_call *call = &event_bprint;

	struct ring_buffer_event *event;

	struct trace_buffer *buffer;

	struct trace_array *tr = READ_ONCE(printk_trace);
@@ -3308,10 +3287,8 @@ int trace_vbprintk(unsigned long ip, const char *fmt, va_list args) 
	entry->fmt			= fmt;



	memcpy(entry->buf, tbuffer, sizeof(u32) * len);

	if (!call_filter_check_discard(call, entry, buffer, event)) {

	__buffer_unlock_commit(buffer, event);

	ftrace_trace_stack(tr, buffer, trace_ctx, 6, NULL);

	}



out:

	ring_buffer_nest_end(buffer);
@@ -3331,7 +3308,6 @@ static int 
__trace_array_vprintk(struct trace_buffer *buffer,

		      unsigned long ip, const char *fmt, va_list args)

{

	struct trace_event_call *call = &event_print;

	struct ring_buffer_event *event;

	int len = 0, size;

	struct print_entry *entry;
@@ -3366,10 +3342,8 @@ __trace_array_vprintk(struct trace_buffer *buffer, 
	entry->ip = ip;



	memcpy(&entry->buf, tbuffer, len + 1);

	if (!call_filter_check_discard(call, entry, buffer, event)) {

	__buffer_unlock_commit(buffer, event);

	ftrace_trace_stack(printk_trace, buffer, trace_ctx, 6, NULL);

	}



out:

	ring_buffer_nest_end(buffer);

kernel/trace/trace.h

+0 −4
Original line number Diff line number Diff line
@@ -1429,10 +1429,6 @@ struct trace_subsystem_dir { 
	int				nr_events;

};



extern int call_filter_check_discard(struct trace_event_call *call, void *rec,

				     struct trace_buffer *buffer,

				     struct ring_buffer_event *event);



void trace_buffer_unlock_commit_regs(struct trace_array *tr,

				     struct trace_buffer *buffer,

				     struct ring_buffer_event *event,

kernel/trace/trace_branch.c

+1 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ static struct trace_array *branch_tracer; 
static void

probe_likely_condition(struct ftrace_likely_data *f, int val, int expect)

{

	struct trace_event_call *call = &event_branch;

	struct trace_array *tr = branch_tracer;

	struct trace_buffer *buffer;

	struct trace_array_cpu *data;
@@ -80,7 +79,6 @@ probe_likely_condition(struct ftrace_likely_data *f, int val, int expect) 
	entry->line = f->data.line;

	entry->correct = val == expect;



	if (!call_filter_check_discard(call, entry, buffer, event))

	trace_buffer_unlock_commit_nostack(buffer, event);



 out:

kernel/trace/trace_events.c

+0 −2
Original line number Diff line number Diff line
@@ -3149,8 +3149,6 @@ static void __trace_remove_event_call(struct trace_event_call *call) 
{

	event_remove(call);

	trace_destroy_fields(call);

	free_event_filter(call->filter);

	call->filter = NULL;

}



static int probe_remove_event_call(struct trace_event_call *call)