Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcb0b557 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Remove TRACE_EVENT_FL_USE_CALL_FILTER logic 



Nothing sets TRACE_EVENT_FL_USE_CALL_FILTER anymore. Remove it.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 904d1857

include/linux/trace_events.h

+0 −3
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ enum { 
	TRACE_EVENT_FL_NO_SET_FILTER_BIT,

	TRACE_EVENT_FL_IGNORE_ENABLE_BIT,

	TRACE_EVENT_FL_WAS_ENABLED_BIT,

	TRACE_EVENT_FL_USE_CALL_FILTER_BIT,

	TRACE_EVENT_FL_TRACEPOINT_BIT,

	TRACE_EVENT_FL_KPROBE_BIT,

	TRACE_EVENT_FL_UPROBE_BIT,
@@ -229,7 +228,6 @@ enum { 
 *  WAS_ENABLED   - Set and stays set when an event was ever enabled

 *                    (used for module unloading, if a module event is enabled,

 *                     it is best to clear the buffers that used it).

 *  USE_CALL_FILTER - For trace internal events, don't use file filter

 *  TRACEPOINT    - Event is a tracepoint

 *  KPROBE        - Event is a kprobe

 *  UPROBE        - Event is a uprobe
@@ -240,7 +238,6 @@ enum { 
	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),

	TRACE_EVENT_FL_WAS_ENABLED	= (1 << TRACE_EVENT_FL_WAS_ENABLED_BIT),

	TRACE_EVENT_FL_USE_CALL_FILTER	= (1 << TRACE_EVENT_FL_USE_CALL_FILTER_BIT),

	TRACE_EVENT_FL_TRACEPOINT	= (1 << TRACE_EVENT_FL_TRACEPOINT_BIT),

	TRACE_EVENT_FL_KPROBE		= (1 << TRACE_EVENT_FL_KPROBE_BIT),

	TRACE_EVENT_FL_UPROBE		= (1 << TRACE_EVENT_FL_UPROBE_BIT),

kernel/trace/trace_events_filter.c

+10 −61
Original line number Diff line number Diff line
@@ -689,9 +689,6 @@ static void append_filter_err(struct filter_parse_state *ps, 


static inline struct event_filter *event_filter(struct trace_event_file *file)

{

	if (file->event_call->flags & TRACE_EVENT_FL_USE_CALL_FILTER)

		return file->event_call->filter;

	else

	return file->filter;

}
@@ -826,11 +823,6 @@ static void __free_preds(struct event_filter *filter) 


static void filter_disable(struct trace_event_file *file)

{

	struct trace_event_call *call = file->event_call;



	if (call->flags & TRACE_EVENT_FL_USE_CALL_FILTER)

		call->flags &= ~TRACE_EVENT_FL_FILTERED;

	else

	file->flags &= ~EVENT_FILE_FL_FILTERED;

}
@@ -883,12 +875,7 @@ static int __alloc_preds(struct event_filter *filter, int n_preds) 


static inline void __remove_filter(struct trace_event_file *file)

{

	struct trace_event_call *call = file->event_call;



	filter_disable(file);

	if (call->flags & TRACE_EVENT_FL_USE_CALL_FILTER)

		remove_filter_string(call->filter);

	else

	remove_filter_string(file->filter);

}
@@ -906,16 +893,9 @@ static void filter_free_subsystem_preds(struct trace_subsystem_dir *dir, 


static inline void __free_subsystem_filter(struct trace_event_file *file)

{

	struct trace_event_call *call = file->event_call;



	if (call->flags & TRACE_EVENT_FL_USE_CALL_FILTER) {

		__free_filter(call->filter);

		call->filter = NULL;

	} else {

	__free_filter(file->filter);

	file->filter = NULL;

}

}



static void filter_free_subsystem_filters(struct trace_subsystem_dir *dir,

					  struct trace_array *tr)
@@ -1718,69 +1698,38 @@ static int replace_preds(struct trace_event_call *call, 


static inline void event_set_filtered_flag(struct trace_event_file *file)

{

	struct trace_event_call *call = file->event_call;



	if (call->flags & TRACE_EVENT_FL_USE_CALL_FILTER)

		call->flags |= TRACE_EVENT_FL_FILTERED;

	else

	file->flags |= EVENT_FILE_FL_FILTERED;

}



static inline void event_set_filter(struct trace_event_file *file,

				    struct event_filter *filter)

{

	struct trace_event_call *call = file->event_call;



	if (call->flags & TRACE_EVENT_FL_USE_CALL_FILTER)

		rcu_assign_pointer(call->filter, filter);

	else

	rcu_assign_pointer(file->filter, filter);

}



static inline void event_clear_filter(struct trace_event_file *file)

{

	struct trace_event_call *call = file->event_call;



	if (call->flags & TRACE_EVENT_FL_USE_CALL_FILTER)

		RCU_INIT_POINTER(call->filter, NULL);

	else

	RCU_INIT_POINTER(file->filter, NULL);

}



static inline void

event_set_no_set_filter_flag(struct trace_event_file *file)

{

	struct trace_event_call *call = file->event_call;



	if (call->flags & TRACE_EVENT_FL_USE_CALL_FILTER)

		call->flags |= TRACE_EVENT_FL_NO_SET_FILTER;

	else

	file->flags |= EVENT_FILE_FL_NO_SET_FILTER;

}



static inline void

event_clear_no_set_filter_flag(struct trace_event_file *file)

{

	struct trace_event_call *call = file->event_call;



	if (call->flags & TRACE_EVENT_FL_USE_CALL_FILTER)

		call->flags &= ~TRACE_EVENT_FL_NO_SET_FILTER;

	else

	file->flags &= ~EVENT_FILE_FL_NO_SET_FILTER;

}



static inline bool

event_no_set_filter_flag(struct trace_event_file *file)

{

	struct trace_event_call *call = file->event_call;



	if (file->flags & EVENT_FILE_FL_NO_SET_FILTER)

		return true;



	if ((call->flags & TRACE_EVENT_FL_USE_CALL_FILTER) &&

	    (call->flags & TRACE_EVENT_FL_NO_SET_FILTER))

		return true;



	return false;

}