From: Andrew Murray <andrew.murray@arm.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Will Deacon <will.deacon@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>,
x86@kernel.org, Ralf Baechle <ralf@linux-mips.org>,
Paul Burton <paul.burton@mips.com>,
James Hogan <jhogan@kernel.org>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
"David S . Miller" <davem@davemloft.net>,
sparclinux@vger.kernel.org, Michael Ellerman <mpe@ellerman.id.au>
Cc: linux-s390@vger.kernel.org, linux-mips@linux-mips.org,
linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 09/20] drivers/perf: perf/core: remove unnecessary checks for exclusion
Date: Mon, 26 Nov 2018 11:12:25 +0000 [thread overview]
Message-ID: <1543230756-15319-10-git-send-email-andrew.murray@arm.com> (raw)
In-Reply-To: <1543230756-15319-1-git-send-email-andrew.murray@arm.com>
For drivers that do not support context exclusion we do not
advertise the PERF_PMU_CAP_EXCLUDE capability. This ensures
that perf will prevent us from handling events where any exclusion
flags are set. Let's remove the now unnecessary check for
exclusion flags.
Signed-off-by: Andrew Murray <andrew.murray@arm.com>
---
drivers/perf/arm-cci.c | 9 ---------
drivers/perf/arm-ccn.c | 5 +----
drivers/perf/arm_dsu_pmu.c | 8 +-------
drivers/perf/hisilicon/hisi_uncore_pmu.c | 9 ---------
4 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c
index 1bfeb16..501b497 100644
--- a/drivers/perf/arm-cci.c
+++ b/drivers/perf/arm-cci.c
@@ -1327,15 +1327,6 @@ static int cci_pmu_event_init(struct perf_event *event)
if (is_sampling_event(event) || event->attach_state & PERF_ATTACH_TASK)
return -EOPNOTSUPP;
- /* We have no filtering of any kind */
- if (event->attr.exclude_user ||
- event->attr.exclude_kernel ||
- event->attr.exclude_hv ||
- event->attr.exclude_idle ||
- event->attr.exclude_host ||
- event->attr.exclude_guest)
- return -EINVAL;
-
/*
* Following the example set by other "uncore" PMUs, we accept any CPU
* and rewrite its affinity dynamically rather than having perf core
diff --git a/drivers/perf/arm-ccn.c b/drivers/perf/arm-ccn.c
index 7dd850e..decf881 100644
--- a/drivers/perf/arm-ccn.c
+++ b/drivers/perf/arm-ccn.c
@@ -741,10 +741,7 @@ static int arm_ccn_pmu_event_init(struct perf_event *event)
return -EOPNOTSUPP;
}
- if (has_branch_stack(event) || event->attr.exclude_user ||
- event->attr.exclude_kernel || event->attr.exclude_hv ||
- event->attr.exclude_idle || event->attr.exclude_host ||
- event->attr.exclude_guest) {
+ if (has_branch_stack(event)) {
dev_dbg(ccn->dev, "Can't exclude execution levels!\n");
return -EINVAL;
}
diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c
index 660cb8a..036414c 100644
--- a/drivers/perf/arm_dsu_pmu.c
+++ b/drivers/perf/arm_dsu_pmu.c
@@ -562,13 +562,7 @@ static int dsu_pmu_event_init(struct perf_event *event)
return -EINVAL;
}
- if (has_branch_stack(event) ||
- event->attr.exclude_user ||
- event->attr.exclude_kernel ||
- event->attr.exclude_hv ||
- event->attr.exclude_idle ||
- event->attr.exclude_host ||
- event->attr.exclude_guest) {
+ if (has_branch_stack(event)) {
dev_dbg(dsu_pmu->pmu.dev, "Can't support filtering\n");
return -EINVAL;
}
diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.c b/drivers/perf/hisilicon/hisi_uncore_pmu.c
index 9efd241..f028cbc 100644
--- a/drivers/perf/hisilicon/hisi_uncore_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_pmu.c
@@ -142,15 +142,6 @@ int hisi_uncore_pmu_event_init(struct perf_event *event)
if (is_sampling_event(event) || event->attach_state & PERF_ATTACH_TASK)
return -EOPNOTSUPP;
- /* counters do not have these bits */
- if (event->attr.exclude_user ||
- event->attr.exclude_kernel ||
- event->attr.exclude_host ||
- event->attr.exclude_guest ||
- event->attr.exclude_hv ||
- event->attr.exclude_idle)
- return -EINVAL;
-
/*
* The uncore counters not specific to any CPU, so cannot
* support per-task
--
2.7.4
next prev parent reply other threads:[~2018-11-26 11:45 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-26 11:12 [PATCH v2 00/20] perf/core: Generalise event exclusion checking Andrew Murray
2018-11-26 11:12 ` [PATCH v2 01/20] perf/doc: update design.txt for exclude_{host|guest} flags Andrew Murray
2018-11-26 18:22 ` Suzuki K Poulose
2018-11-26 11:12 ` [PATCH v2 02/20] perf/core: add function to test for event exclusion flags Andrew Murray
2018-11-26 11:12 ` [PATCH v2 03/20] perf/core: add PERF_PMU_CAP_EXCLUDE for exclusion capable PMUs Andrew Murray
2018-11-26 14:10 ` Robin Murphy
2018-11-26 14:55 ` Andrew Murray
2018-11-26 11:12 ` [PATCH v2 04/20] perf/hw_breakpoint: perf/core: advertise PMU exclusion capability Andrew Murray
2018-11-26 11:12 ` [PATCH v2 05/20] alpha: perf/core: remove unnecessary checks for exclusion Andrew Murray
2018-11-26 11:12 ` [PATCH v2 06/20] arc: perf/core: advertise PMU exclusion capability Andrew Murray
2018-11-26 11:12 ` [PATCH v2 07/20] arm: perf: conditionally " Andrew Murray
2018-11-26 11:12 ` [PATCH v2 08/20] arm: perf/core: remove unnecessary checks for exclusion Andrew Murray
2018-11-26 11:12 ` Andrew Murray [this message]
2018-11-26 11:12 ` [PATCH v2 10/20] drivers/perf: " Andrew Murray
2018-11-26 11:12 ` [PATCH v2 11/20] drivers/perf: perf/core: advertise PMU exclusion capability Andrew Murray
2018-11-26 11:12 ` [PATCH v2 12/20] mips: " Andrew Murray
2018-11-26 11:12 ` [PATCH v2 13/20] powerpc: " Andrew Murray
2018-11-26 11:12 ` [PATCH v2 14/20] powerpc: perf/core: remove unnecessary checks for exclusion Andrew Murray
2018-11-26 11:12 ` [PATCH v2 15/20] s390: perf/events: advertise PMU exclusion capability Andrew Murray
2018-11-27 8:19 ` Hendrik Brueckner
2018-11-26 11:12 ` [PATCH v2 16/20] sparc: perf/core: " Andrew Murray
2018-11-26 18:00 ` David Miller
2018-11-26 11:12 ` [PATCH v2 17/20] x86: perf/core: remove unnecessary checks for exclusion Andrew Murray
2018-11-26 11:12 ` [PATCH v2 18/20] x86: perf/core " Andrew Murray
2018-11-26 11:12 ` [PATCH v2 19/20] x86: perf/core: advertise PMU exclusion capability Andrew Murray
2018-11-26 11:12 ` [PATCH v2 20/20] perf/core: remove unused perf_flags 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=1543230756-15319-10-git-send-email-andrew.murray@arm.com \
--to=andrew.murray@arm.com \
--cc=acme@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=bp@alien8.de \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=jhogan@kernel.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=paul.burton@mips.com \
--cc=peterz@infradead.org \
--cc=ralf@linux-mips.org \
--cc=s.hauer@pengutronix.de \
--cc=schwidefsky@de.ibm.com \
--cc=shawnguo@kernel.org \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
/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).