linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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,
	linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-alpha@vger.kernel.org
Subject: [PATCH v2 10/20] drivers/perf: perf/core: remove unnecessary checks for exclusion
Date: Mon, 26 Nov 2018 11:12:26 +0000	[thread overview]
Message-ID: <1543230756-15319-11-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.

This change means that qcom_{l2|l3}_pmu will now also indicate that
they do not support exclude_{host|guest} and that xgene_pmu does
not also support exclude_idle and exclude_hv.

Note that for qcom_l2_pmu we now implictly return -EINVAL instead
of -EOPNOTSUPP. This change will result in the perf userspace
utility retrying the perf_event_open system call with fallback
event attributes that do not fail.

Signed-off-by: Andrew Murray <andrew.murray@arm.com>
---
 drivers/perf/qcom_l2_pmu.c | 8 --------
 drivers/perf/qcom_l3_pmu.c | 7 -------
 drivers/perf/xgene_pmu.c   | 5 -----
 3 files changed, 20 deletions(-)

diff --git a/drivers/perf/qcom_l2_pmu.c b/drivers/perf/qcom_l2_pmu.c
index 842135c..518e18c 100644
--- a/drivers/perf/qcom_l2_pmu.c
+++ b/drivers/perf/qcom_l2_pmu.c
@@ -509,14 +509,6 @@ static int l2_cache_event_init(struct perf_event *event)
 		return -EOPNOTSUPP;
 	}
 
-	/* We cannot filter accurately so we just don't allow it. */
-	if (event->attr.exclude_user || event->attr.exclude_kernel ||
-	    event->attr.exclude_hv || event->attr.exclude_idle) {
-		dev_dbg_ratelimited(&l2cache_pmu->pdev->dev,
-				    "Can't exclude execution levels\n");
-		return -EOPNOTSUPP;
-	}
-
 	if (((L2_EVT_GROUP(event->attr.config) > L2_EVT_GROUP_MAX) ||
 	     ((event->attr.config & ~L2_EVT_MASK) != 0)) &&
 	    (event->attr.config != L2CYCLE_CTR_RAW_CODE)) {
diff --git a/drivers/perf/qcom_l3_pmu.c b/drivers/perf/qcom_l3_pmu.c
index 2dc63d6..e28bd2f 100644
--- a/drivers/perf/qcom_l3_pmu.c
+++ b/drivers/perf/qcom_l3_pmu.c
@@ -495,13 +495,6 @@ static int qcom_l3_cache__event_init(struct perf_event *event)
 		return -ENOENT;
 
 	/*
-	 * There are no per-counter mode filters in the PMU.
-	 */
-	if (event->attr.exclude_user || event->attr.exclude_kernel ||
-	    event->attr.exclude_hv || event->attr.exclude_idle)
-		return -EINVAL;
-
-	/*
 	 * Sampling not supported since these events are not core-attributable.
 	 */
 	if (hwc->sample_period)
diff --git a/drivers/perf/xgene_pmu.c b/drivers/perf/xgene_pmu.c
index 0e31f13..bdc55de 100644
--- a/drivers/perf/xgene_pmu.c
+++ b/drivers/perf/xgene_pmu.c
@@ -914,11 +914,6 @@ static int xgene_perf_event_init(struct perf_event *event)
 	if (is_sampling_event(event) || event->attach_state & PERF_ATTACH_TASK)
 		return -EINVAL;
 
-	/* SOC counters do not have usr/os/guest/host bits */
-	if (event->attr.exclude_user || event->attr.exclude_kernel ||
-	    event->attr.exclude_host || event->attr.exclude_guest)
-		return -EINVAL;
-
 	if (event->cpu < 0)
 		return -EINVAL;
 	/*
-- 
2.7.4


  parent reply	other threads:[~2018-11-26 11:14 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 ` [PATCH v2 09/20] drivers/perf: " Andrew Murray
2018-11-26 11:12 ` Andrew Murray [this message]
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-11-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).