From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1947053AbcHRKvy (ORCPT ); Thu, 18 Aug 2016 06:51:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57758 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1945937AbcHRKvt (ORCPT ); Thu, 18 Aug 2016 06:51:49 -0400 Date: Thu, 18 Aug 2016 03:51:16 -0700 From: tip-bot for Mathieu Poirier Message-ID: Cc: mathieu.poirier@linaro.org, torvalds@linux-foundation.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, jolsa@redhat.com, alexander.shishkin@linux.intel.com, vincent.weaver@maine.edu, peterz@infradead.org, acme@redhat.com, mingo@kernel.org, hpa@zytor.com, eranian@google.com Reply-To: mathieu.poirier@linaro.org, torvalds@linux-foundation.org, tglx@linutronix.de, acme@redhat.com, mingo@kernel.org, vincent.weaver@maine.edu, peterz@infradead.org, jolsa@redhat.com, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, eranian@google.com, hpa@zytor.com In-Reply-To: <1468860187-318-2-git-send-email-mathieu.poirier@linaro.org> References: <1468860187-318-2-git-send-email-mathieu.poirier@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/core: Fix file name handling for start/stop filters Git-Commit-ID: 4059ffd09d694f704e18a4baf97fc0016c32e9ad 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: 4059ffd09d694f704e18a4baf97fc0016c32e9ad Gitweb: http://git.kernel.org/tip/4059ffd09d694f704e18a4baf97fc0016c32e9ad Author: Mathieu Poirier AuthorDate: Mon, 18 Jul 2016 10:43:05 -0600 Committer: Ingo Molnar CommitDate: Thu, 18 Aug 2016 10:35:50 +0200 perf/core: Fix file name handling for start/stop filters Binary file names have to be supplied for both range and start/stop filters but the current code only processes the filename if an address range filter is specified. This code adds processing of the filename for start/stop filters. 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-2-git-send-email-mathieu.poirier@linaro.org Signed-off-by: Ingo Molnar --- kernel/events/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 6e454bf..52780ef 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7972,8 +7972,10 @@ perf_event_parse_addr_filter(struct perf_event *event, char *fstr, goto fail; } - if (token == IF_SRC_FILE) { - filename = match_strdup(&args[2]); + if (token == IF_SRC_FILE || token == IF_SRC_FILEADDR) { + int fpos = filter->range ? 2 : 1; + + filename = match_strdup(&args[fpos]); if (!filename) { ret = -ENOMEM; goto fail;