From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753835AbcHRKxD (ORCPT ); Thu, 18 Aug 2016 06:53:03 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57818 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752429AbcHRKxB (ORCPT ); Thu, 18 Aug 2016 06:53:01 -0400 Date: Thu, 18 Aug 2016 03:52:08 -0700 From: tip-bot for Mathieu Poirier Message-ID: Cc: hpa@zytor.com, eranian@google.com, torvalds@linux-foundation.org, peterz@infradead.org, mingo@kernel.org, mathieu.poirier@linaro.org, acme@redhat.com, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, vincent.weaver@maine.edu, jolsa@redhat.com Reply-To: vincent.weaver@maine.edu, tglx@linutronix.de, jolsa@redhat.com, alexander.shishkin@linux.intel.com, acme@redhat.com, linux-kernel@vger.kernel.org, peterz@infradead.org, torvalds@linux-foundation.org, mingo@kernel.org, mathieu.poirier@linaro.org, hpa@zytor.com, eranian@google.com In-Reply-To: <1468860187-318-4-git-send-email-mathieu.poirier@linaro.org> References: <1468860187-318-4-git-send-email-mathieu.poirier@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/core: Enable mapping of the stop filters Git-Commit-ID: 99f5bc9bfa9094e7c264a8e09f9507b391a3d1d1 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: 99f5bc9bfa9094e7c264a8e09f9507b391a3d1d1 Gitweb: http://git.kernel.org/tip/99f5bc9bfa9094e7c264a8e09f9507b391a3d1d1 Author: Mathieu Poirier AuthorDate: Mon, 18 Jul 2016 10:43:07 -0600 Committer: Ingo Molnar CommitDate: Thu, 18 Aug 2016 10:35:51 +0200 perf/core: Enable mapping of the stop filters At this time the perf_addr_filter_needs_mmap() function will _not_ return true on a user space 'stop' filter. But stop filters need exactly the same kind of mapping that range and start filters get. Signed-off-by: Mathieu Poirier Signed-off-by: Peter Zijlstra (Intel) Acked-by: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/1468860187-318-4-git-send-email-mathieu.poirier@linaro.org Signed-off-by: Ingo Molnar --- kernel/events/core.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 9a030a9..a5fc5c8 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6620,15 +6620,6 @@ got_name: } /* - * Whether this @filter depends on a dynamic object which is not loaded - * yet or its load addresses are not known. - */ -static bool perf_addr_filter_needs_mmap(struct perf_addr_filter *filter) -{ - return filter->filter && filter->inode; -} - -/* * Check whether inode and address range match filter criteria. */ static bool perf_addr_filter_match(struct perf_addr_filter *filter, @@ -7848,7 +7839,11 @@ static void perf_event_addr_filters_apply(struct perf_event *event) list_for_each_entry(filter, &ifh->list, entry) { event->addr_filters_offs[count] = 0; - if (perf_addr_filter_needs_mmap(filter)) + /* + * Adjust base offset if the filter is associated to a binary + * that needs to be mapped: + */ + if (filter->inode) event->addr_filters_offs[count] = perf_addr_filter_apply(filter, mm);