From: Peter Zijlstra <pet...@infradead.org> 3.4.113-rc1 review patch. If anyone has any objections, please let me know.
------------------ commit b71b437eedaed985062492565d9d421d975ae845 upstream. Arnaldo reported that tracepoint filters seem to misbehave (ie. not apply) on inherited events. The fix is obvious; filters are only set on the actual (parent) event, use the normal pattern of using this parent event for filters. This is safe because each child event has a reference to it. Reported-by: Arnaldo Carvalho de Melo <a...@kernel.org> Tested-by: Arnaldo Carvalho de Melo <a...@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Cc: Adrian Hunter <adrian.hun...@intel.com> Cc: Arnaldo Carvalho de Melo <a...@redhat.com> Cc: David Ahern <dsah...@gmail.com> Cc: Frédéric Weisbecker <fweis...@gmail.com> Cc: Jiri Olsa <jo...@kernel.org> Cc: Jiri Olsa <jo...@redhat.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Steven Rostedt <rost...@goodmis.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Wang Nan <wangn...@huawei.com> Link: http://lkml.kernel.org/r/20151102095051.gn17...@twins.programming.kicks-ass.net Signed-off-by: Ingo Molnar <mi...@kernel.org> Signed-off-by: Zefan Li <lize...@huawei.com> --- kernel/events/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/events/core.c b/kernel/events/core.c index 2e6c2484..4713480 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5366,6 +5366,10 @@ static int perf_tp_filter_match(struct perf_event *event, { void *record = data->raw->data; + /* only top level events have filters set */ + if (event->parent) + event = event->parent; + if (likely(!event->filter) || filter_match_preds(event->filter, record)) return 1; return 0; -- 1.9.1
