From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751749AbbKJGlV (ORCPT ); Tue, 10 Nov 2015 01:41:21 -0500 Received: from terminus.zytor.com ([198.137.202.10]:46691 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751477AbbKJGlD (ORCPT ); Tue, 10 Nov 2015 01:41:03 -0500 Date: Mon, 9 Nov 2015 22:40:07 -0800 From: tip-bot for Peter Zijlstra Message-ID: Cc: jolsa@redhat.com, rostedt@goodmis.org, fweisbec@gmail.com, hpa@zytor.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, wangnan0@huawei.com, peterz@infradead.org, dsahern@gmail.com, acme@redhat.com, adrian.hunter@intel.com, jolsa@kernel.org, mingo@kernel.org, acme@kernel.org Reply-To: fweisbec@gmail.com, jolsa@redhat.com, rostedt@goodmis.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, tglx@linutronix.de, wangnan0@huawei.com, hpa@zytor.com, dsahern@gmail.com, peterz@infradead.org, mingo@kernel.org, acme@kernel.org, jolsa@kernel.org, acme@redhat.com, adrian.hunter@intel.com In-Reply-To: <20151102095051.GN17308@twins.programming.kicks-ass.net> References: <20151102095051.GN17308@twins.programming.kicks-ass.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf: Fix inherited events vs. tracepoint filters Git-Commit-ID: b71b437eedaed985062492565d9d421d975ae845 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b71b437eedaed985062492565d9d421d975ae845 Gitweb: http://git.kernel.org/tip/b71b437eedaed985062492565d9d421d975ae845 Author: Peter Zijlstra AuthorDate: Mon, 2 Nov 2015 10:50:51 +0100 Committer: Ingo Molnar CommitDate: Mon, 9 Nov 2015 16:13:11 +0100 perf: Fix inherited events vs. tracepoint filters 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 Tested-by: Arnaldo Carvalho de Melo Signed-off-by: Peter Zijlstra (Intel) Cc: Adrian Hunter Cc: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Frédéric Weisbecker Cc: Jiri Olsa Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Thomas Gleixner Cc: Wang Nan Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20151102095051.GN17308@twins.programming.kicks-ass.net Signed-off-by: Ingo Molnar --- kernel/events/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/events/core.c b/kernel/events/core.c index f8e5c44..98a4b9d 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6909,6 +6909,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;