From: tip-bot for Andrew Murray <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@kernel.org, mingo@kernel.org, mattst88@gmail.com,
shawnguo@kernel.org, s.hauer@pengutronix.de, will.deacon@arm.com,
bp@alien8.de, ink@jurassic.park.msu.ru, linux@armlinux.org.uk,
benh@kernel.crashing.org, tglx@linutronix.de,
peterz@infradead.org, mpe@ellerman.id.au, rth@twiddle.net,
paulus@samba.org, andrew.murray@arm.com, mark.rutland@arm.com,
linux-kernel@vger.kernel.org, torvalds@linux-foundation.org,
hpa@zytor.com
Subject: [tip:perf/core] perf/core, arch/arm: Use PERF_PMU_CAP_NO_EXCLUDE conditionally
Date: Mon, 21 Jan 2019 03:18:35 -0800 [thread overview]
Message-ID: <tip-1d899c0e9bc2a17895762b9457ac336cdee8e072@git.kernel.org> (raw)
In-Reply-To: <1547128414-50693-6-git-send-email-andrew.murray@arm.com>
Commit-ID: 1d899c0e9bc2a17895762b9457ac336cdee8e072
Gitweb: https://git.kernel.org/tip/1d899c0e9bc2a17895762b9457ac336cdee8e072
Author: Andrew Murray <andrew.murray@arm.com>
AuthorDate: Thu, 10 Jan 2019 13:53:27 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 21 Jan 2019 11:01:22 +0100
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>
---
drivers/perf/arm_pmu.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index d0b7dd8fb184..eec75b97e7ea 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -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;
next prev parent reply other threads:[~2019-01-21 11:19 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 13:53 [PATCH v5 00/12] perf/core: Generalise event exclusion checking Andrew Murray
2019-01-10 13:53 ` [PATCH v5 01/12] perf/doc: update design.txt for exclude_{host|guest} flags Andrew Murray
2019-01-21 11:16 ` [tip:perf/core] perf/doc: Update " tip-bot for Andrew Murray
2019-01-10 13:53 ` [PATCH v5 02/12] perf/core: add function to test for event exclusion flags Andrew Murray
2019-01-21 11:16 ` [tip:perf/core] perf/core: Add " tip-bot for Andrew Murray
2019-01-10 13:53 ` [PATCH v5 03/12] perf/core: add PERF_PMU_CAP_NO_EXCLUDE for exclusion incapable PMUs Andrew Murray
2019-01-21 11:17 ` [tip:perf/core] perf/core: Add " tip-bot for Andrew Murray
2019-01-10 13:53 ` [PATCH v5 04/12] alpha: perf/core: strengthen exclude checks with PERF_PMU_CAP_NO_EXCLUDE Andrew Murray
2019-01-21 11:17 ` [tip:perf/core] perf/core, arch/alpha: Strengthen exclusion " tip-bot for Andrew Murray
2019-01-10 13:53 ` [PATCH v5 05/12] arm: perf: conditionally use PERF_PMU_CAP_NO_EXCLUDE Andrew Murray
2019-01-21 11:18 ` tip-bot for Andrew Murray [this message]
2019-01-10 13:53 ` [PATCH v5 06/12] arm: perf/core: use PERF_PMU_CAP_NO_EXCLUDE for exclude incapable PMUs Andrew Murray
2019-01-21 11:19 ` [tip:perf/core] perf/core, arch/arm: Use PERF_PMU_CAP_NO_EXCLUDE for exclusion " tip-bot for Andrew Murray
2019-01-10 13:53 ` [PATCH v5 07/12] drivers/perf: perf/core: use PERF_PMU_CAP_NO_EXCLUDE for exclude " Andrew Murray
2019-01-21 11:19 ` [tip:perf/core] For drivers that do not support context exclusion let's advertise the PERF_PMU_CAP_NO_EXCLUDE capability. This ensures that perf will prevent us from handling events where any exclusion flags are set. Let's also remove the now unnecessary check for exclusion flags tip-bot for Andrew Murray
2019-01-10 13:53 ` [PATCH v5 08/12] drivers/perf: perf/core: strengthen exclude checks with PERF_PMU_CAP_NO_EXCLUDE Andrew Murray
2019-01-21 11:20 ` [tip:perf/core] perf/drivers: Strengthen exclusion " tip-bot for Andrew Murray
2019-01-10 13:53 ` [PATCH v5 09/12] powerpc: perf/core: use PERF_PMU_CAP_NO_EXCLUDE for exclude incapable PMUs Andrew Murray
2019-01-21 11:21 ` [tip:perf/core] perf/core, arch/powerpc: use PERF_PMU_CAP_NO_EXCLUDE for exclusion " tip-bot for Andrew Murray
2019-01-10 13:53 ` [PATCH v5 10/12] x86: perf/core: use PERF_PMU_CAP_NO_EXCLUDE for exclude " Andrew Murray
2019-01-21 11:21 ` [tip:perf/core] perf/core, arch/x86: Use PERF_PMU_CAP_NO_EXCLUDE for exclusion " tip-bot for Andrew Murray
2019-01-10 13:53 ` [PATCH v5 11/12] x86: perf/core: strengthen exclude checks with PERF_PMU_CAP_NO_EXCLUDE Andrew Murray
2019-01-21 11:22 ` [tip:perf/core] perf/core, arch/x86: Strengthen exclusion " tip-bot for Andrew Murray
2019-01-10 13:53 ` [PATCH v5 12/12] perf/core: remove unused perf_flags Andrew Murray
2019-01-21 11:23 ` [tip:perf/core] perf/core: Remove " tip-bot for Andrew Murray
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-1d899c0e9bc2a17895762b9457ac336cdee8e072@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@kernel.org \
--cc=andrew.murray@arm.com \
--cc=benh@kernel.crashing.org \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=mattst88@gmail.com \
--cc=mingo@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=rth@twiddle.net \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).