diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2011-11-01 09:09:35 +0800 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2011-11-02 13:56:25 -0400 |
| commit | ed0449af5373abd766c79fbf83254bebc996bd23 (patch) | |
| tree | e72b0cde1827e4558c8748e7a410086ba124ef7f /kernel/trace | |
| parent | d631097577f6fe027f4903f62eabced6445d19bf (diff) | |
| download | linux-ed0449af5373abd766c79fbf83254bebc996bd23.tar.gz linux-ed0449af5373abd766c79fbf83254bebc996bd23.tar.bz2 linux-ed0449af5373abd766c79fbf83254bebc996bd23.zip | |
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 75b8e98263fdb0bfbdeba60d4db463259f1fe8a2 (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>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_events_filter.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index 816d3d074979..86040d9c1acc 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -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; |