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 75b8e98263
(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: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
parent
cb59974742
commit
27b14b56af
|
@ -172,6 +172,7 @@ enum {
|
||||||
TRACE_EVENT_FL_FILTERED_BIT,
|
TRACE_EVENT_FL_FILTERED_BIT,
|
||||||
TRACE_EVENT_FL_RECORDED_CMD_BIT,
|
TRACE_EVENT_FL_RECORDED_CMD_BIT,
|
||||||
TRACE_EVENT_FL_CAP_ANY_BIT,
|
TRACE_EVENT_FL_CAP_ANY_BIT,
|
||||||
|
TRACE_EVENT_FL_NO_SET_FILTER_BIT,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
@ -179,6 +180,7 @@ enum {
|
||||||
TRACE_EVENT_FL_FILTERED = (1 << TRACE_EVENT_FL_FILTERED_BIT),
|
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_RECORDED_CMD = (1 << TRACE_EVENT_FL_RECORDED_CMD_BIT),
|
||||||
TRACE_EVENT_FL_CAP_ANY = (1 << TRACE_EVENT_FL_CAP_ANY_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 {
|
struct ftrace_event_call {
|
||||||
|
|
|
@ -1649,7 +1649,9 @@ static int replace_system_preds(struct event_subsystem *system,
|
||||||
*/
|
*/
|
||||||
err = replace_preds(call, NULL, ps, filter_string, true);
|
err = replace_preds(call, NULL, ps, filter_string, true);
|
||||||
if (err)
|
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) {
|
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)
|
if (strcmp(call->class->system, system->name) != 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
if (call->flags & TRACE_EVENT_FL_NO_SET_FILTER)
|
||||||
|
continue;
|
||||||
|
|
||||||
filter_item = kzalloc(sizeof(*filter_item), GFP_KERNEL);
|
filter_item = kzalloc(sizeof(*filter_item), GFP_KERNEL);
|
||||||
if (!filter_item)
|
if (!filter_item)
|
||||||
goto fail_mem;
|
goto fail_mem;
|
||||||
|
|
Loading…
Reference in a new issue