From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756748AbcEEJqc (ORCPT ); Thu, 5 May 2016 05:46:32 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44542 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756283AbcEEJqb (ORCPT ); Thu, 5 May 2016 05:46:31 -0400 Date: Thu, 5 May 2016 02:45:17 -0700 From: tip-bot for Alexander Shishkin Message-ID: Cc: alexander.shishkin@linux.intel.com, vincent.weaver@maine.edu, hpa@zytor.com, mathieu.poirier@linaro.org, bp@alien8.de, acme@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, acme@infradead.org, peterz@infradead.org, eranian@google.com, tglx@linutronix.de, torvalds@linux-foundation.org, jolsa@redhat.com Reply-To: tglx@linutronix.de, torvalds@linux-foundation.org, jolsa@redhat.com, eranian@google.com, linux-kernel@vger.kernel.org, mingo@kernel.org, peterz@infradead.org, acme@infradead.org, mathieu.poirier@linaro.org, alexander.shishkin@linux.intel.com, vincent.weaver@maine.edu, hpa@zytor.com, acme@redhat.com, bp@alien8.de In-Reply-To: <1461771888-10409-2-git-send-email-alexander.shishkin@linux.intel.com> References: <1461771888-10409-2-git-send-email-alexander.shishkin@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/core: Move set_filter() out of CONFIG_EVENT_TRACING Git-Commit-ID: c796bbbe8dccd9c91ebbb99ffef33e0f73ced7bf 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: c796bbbe8dccd9c91ebbb99ffef33e0f73ced7bf Gitweb: http://git.kernel.org/tip/c796bbbe8dccd9c91ebbb99ffef33e0f73ced7bf Author: Alexander Shishkin AuthorDate: Wed, 27 Apr 2016 18:44:42 +0300 Committer: Ingo Molnar CommitDate: Thu, 5 May 2016 10:13:55 +0200 perf/core: Move set_filter() out of CONFIG_EVENT_TRACING For instruction trace filtering, namely, for communicating filter definitions from userspace, I'd like to re-use the SET_FILTER code that the tracepoints are using currently. To that end, move the relevant code out from behind the CONFIG_EVENT_TRACING dependency. Signed-off-by: Alexander Shishkin Signed-off-by: Peter Zijlstra (Intel) Cc: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: Jiri Olsa Cc: Linus Torvalds Cc: Mathieu Poirier Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: vince@deater.net Link: http://lkml.kernel.org/r/1461771888-10409-2-git-send-email-alexander.shishkin@linux.intel.com Signed-off-by: Ingo Molnar --- kernel/events/core.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 9de459a..13956ee 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7235,24 +7235,6 @@ static inline void perf_tp_register(void) perf_pmu_register(&perf_tracepoint, "tracepoint", PERF_TYPE_TRACEPOINT); } -static int perf_event_set_filter(struct perf_event *event, void __user *arg) -{ - char *filter_str; - int ret; - - if (event->attr.type != PERF_TYPE_TRACEPOINT) - return -EINVAL; - - filter_str = strndup_user(arg, PAGE_SIZE); - if (IS_ERR(filter_str)) - return PTR_ERR(filter_str); - - ret = ftrace_profile_set_filter(event, event->attr.config, filter_str); - - kfree(filter_str); - return ret; -} - static void perf_event_free_filter(struct perf_event *event) { ftrace_profile_free_filter(event); @@ -7307,11 +7289,6 @@ static inline void perf_tp_register(void) { } -static int perf_event_set_filter(struct perf_event *event, void __user *arg) -{ - return -ENOENT; -} - static void perf_event_free_filter(struct perf_event *event) { } @@ -7339,6 +7316,28 @@ void perf_bp_event(struct perf_event *bp, void *data) } #endif +static int perf_event_set_filter(struct perf_event *event, void __user *arg) +{ + char *filter_str; + int ret = -EINVAL; + + if (event->attr.type != PERF_TYPE_TRACEPOINT || + !IS_ENABLED(CONFIG_EVENT_TRACING)) + return -EINVAL; + + filter_str = strndup_user(arg, PAGE_SIZE); + if (IS_ERR(filter_str)) + return PTR_ERR(filter_str); + + if (IS_ENABLED(CONFIG_EVENT_TRACING) && + event->attr.type == PERF_TYPE_TRACEPOINT) + ret = ftrace_profile_set_filter(event, event->attr.config, + filter_str); + + kfree(filter_str); + return ret; +} + /* * hrtimer based swevent callback */