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

Commit ed0449af authored by Li Zefan's avatar Li Zefan Committed by Steven Rostedt
Browse files

tracing: Restore system filter behavior 

Though not all events have field 'prev_pid', it was allowed to do this:

  # echo 'prev_pid == 100' > events/sched/filter

but commit 75b8e982 (tracing/filter: Swap
entire filter of events) broke it without any reason.

Link: http://lkml.kernel.org/r/4EAF46CF.8040408@cn.fujitsu.com



Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent d6310975

include/linux/ftrace_event.h

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ enum { 
	TRACE_EVENT_FL_FILTERED_BIT,

	TRACE_EVENT_FL_RECORDED_CMD_BIT,

	TRACE_EVENT_FL_CAP_ANY_BIT,

	TRACE_EVENT_FL_NO_SET_FILTER_BIT,

};



enum {
@@ -179,6 +180,7 @@ enum { 
	TRACE_EVENT_FL_FILTERED		= (1 << TRACE_EVENT_FL_FILTERED_BIT),

	TRACE_EVENT_FL_RECORDED_CMD	= (1 << TRACE_EVENT_FL_RECORDED_CMD_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),

};



struct ftrace_event_call {

kernel/trace/trace_events_filter.c

+6 −1
Original line number Diff line number Diff line
@@ -1649,7 +1649,9 @@ static int replace_system_preds(struct event_subsystem *system, 
		 */

		err = replace_preds(call, NULL, ps, filter_string, true);

		if (err)

			goto fail;

			call->flags |= TRACE_EVENT_FL_NO_SET_FILTER;

		else

			call->flags &= ~TRACE_EVENT_FL_NO_SET_FILTER;

	}



	list_for_each_entry(call, &ftrace_events, list) {
@@ -1658,6 +1660,9 @@ static int replace_system_preds(struct event_subsystem *system, 
		if (strcmp(call->class->system, system->name) != 0)

			continue;



		if (call->flags & TRACE_EVENT_FL_NO_SET_FILTER)

			continue;



		filter_item = kzalloc(sizeof(*filter_item), GFP_KERNEL);

		if (!filter_item)

			goto fail_mem;