From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757196AbcEEJst (ORCPT ); Thu, 5 May 2016 05:48:49 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44736 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756513AbcEEJss (ORCPT ); Thu, 5 May 2016 05:48:48 -0400 Date: Thu, 5 May 2016 02:47:38 -0700 From: tip-bot for Alexander Shishkin Message-ID: Cc: torvalds@linux-foundation.org, eranian@google.com, vincent.weaver@maine.edu, tglx@linutronix.de, bp@alien8.de, linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org, hpa@zytor.com, peterz@infradead.org, acme@redhat.com, jolsa@redhat.com, alexander.shishkin@linux.intel.com, mingo@kernel.org, acme@infradead.org Reply-To: linux-kernel@vger.kernel.org, hpa@zytor.com, peterz@infradead.org, mathieu.poirier@linaro.org, acme@redhat.com, torvalds@linux-foundation.org, vincent.weaver@maine.edu, tglx@linutronix.de, eranian@google.com, bp@alien8.de, jolsa@redhat.com, alexander.shishkin@linux.intel.com, acme@infradead.org, mingo@kernel.org In-Reply-To: <1461771888-10409-8-git-send-email-alexander.shishkin@linux.intel.com> References: <1461771888-10409-8-git-send-email-alexander.shishkin@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/core: Let userspace know if the PMU supports address filters Git-Commit-ID: 6e855cd4f4b5258016cf707f94f96bfa51c32f32 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: 6e855cd4f4b5258016cf707f94f96bfa51c32f32 Gitweb: http://git.kernel.org/tip/6e855cd4f4b5258016cf707f94f96bfa51c32f32 Author: Alexander Shishkin AuthorDate: Wed, 27 Apr 2016 18:44:48 +0300 Committer: Ingo Molnar CommitDate: Thu, 5 May 2016 10:13:58 +0200 perf/core: Let userspace know if the PMU supports address filters Export an additional common attribute for PMUs that support address range filtering to let the perf userspace identify such PMUs in a uniform way. 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-8-git-send-email-alexander.shishkin@linux.intel.com Signed-off-by: Ingo Molnar --- kernel/events/core.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/kernel/events/core.c b/kernel/events/core.c index ffdc096..63be654 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8273,6 +8273,20 @@ static void free_pmu_context(struct pmu *pmu) out: mutex_unlock(&pmus_lock); } + +/* + * Let userspace know that this PMU supports address range filtering: + */ +static ssize_t nr_addr_filters_show(struct device *dev, + struct device_attribute *attr, + char *page) +{ + struct pmu *pmu = dev_get_drvdata(dev); + + return snprintf(page, PAGE_SIZE - 1, "%d\n", pmu->nr_addr_filters); +} +DEVICE_ATTR_RO(nr_addr_filters); + static struct idr pmu_idr; static ssize_t @@ -8374,9 +8388,19 @@ static int pmu_dev_alloc(struct pmu *pmu) if (ret) goto free_dev; + /* For PMUs with address filters, throw in an extra attribute: */ + if (pmu->nr_addr_filters) + ret = device_create_file(pmu->dev, &dev_attr_nr_addr_filters); + + if (ret) + goto del_dev; + out: return ret; +del_dev: + device_del(pmu->dev); + free_dev: put_device(pmu->dev); goto out; @@ -8512,6 +8536,8 @@ void perf_pmu_unregister(struct pmu *pmu) free_percpu(pmu->pmu_disable_count); if (pmu->type >= PERF_TYPE_MAX) idr_remove(&pmu_idr, pmu->type); + if (pmu->nr_addr_filters) + device_remove_file(pmu->dev, &dev_attr_nr_addr_filters); device_del(pmu->dev); put_device(pmu->dev); free_pmu_context(pmu);