Commit 1d899c0e authored Jan 10, 2019 by Andrew Murray Committed by Ingo Molnar Jan 21, 2019

perf/core, arch/arm: Use PERF_PMU_CAP_NO_EXCLUDE conditionally



The ARM PMU driver can be used to represent a variety of ARM based
PMUs. Some of these PMUs do not provide support for context
exclusion, where this is the case we advertise the
PERF_PMU_CAP_NO_EXCLUDE capability to ensure that perf prevents us
from handling events where any exclusion flags are set.

Where an ARM PMU driver has the set_event_filter function implemented,
we rely on it to perform exclusion checks. At present some of these
functions do not test for all of the available exclude flags.

Signed-off-by: Andrew Murray <andrew.murray@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: robin.murphy@arm.com
Cc: suzuki.poulose@arm.com
Link: https://lkml.kernel.org/r/1547128414-50693-6-git-send-email-andrew.murray@arm.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 6dd273f4

drivers/perf/arm_pmu.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -356,13 +356,6 @@ static irqreturn_t armpmu_dispatch_irq(int irq, void *dev)
		return ret;
		}

		static int
		event_requires_mode_exclusion(struct perf_event_attr *attr)
		{
		return attr->exclude_idle \|\| attr->exclude_user \|\|
		attr->exclude_kernel \|\| attr->exclude_hv;
		}

		static int
		__hw_perf_event_init(struct perf_event *event)
		{
		@@ -393,9 +386,8 @@ __hw_perf_event_init(struct perf_event *event)
		/*
		* Check whether we need to exclude the counter from certain modes.
		*/
		if ((!armpmu->set_event_filter \|\|
		armpmu->set_event_filter(hwc, &event->attr)) &&
		event_requires_mode_exclusion(&event->attr)) {
		if (armpmu->set_event_filter &&
		armpmu->set_event_filter(hwc, &event->attr)) {
		pr_debug("ARM performance counters do not support "
		"mode exclusion\n");
		return -EOPNOTSUPP;
		@@ -867,6 +859,9 @@ int armpmu_register(struct arm_pmu *pmu)
		if (ret)
		return ret;

		if (!pmu->set_event_filter)
		pmu->pmu.capabilities \|= PERF_PMU_CAP_NO_EXCLUDE;

		ret = perf_pmu_register(&pmu->pmu, pmu->name, -1);
		if (ret)
		goto out_destroy;