perf/drivers: Strengthen exclusion checks with PERF_PMU_CAP_NO_EXCLUDE

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.

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>
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-9-git-send-email-andrew.murray@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/drivers/perf/qcom_l2_pmu.c b/drivers/perf/qcom_l2_pmu.c
index 842135cf35a3acba6f72b4d27c9ebb2335d40ee9..091b4d7d32c4885a4434b20f05f577784097c2bf 100644 (file)
--- 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)) {
@@ -982,6 +974,7 @@ static int l2_cache_pmu_probe(struct platform_device *pdev)
                .stop           = l2_cache_event_stop,
                .read           = l2_cache_event_read,
                .attr_groups    = l2_cache_pmu_attr_grps,
+               .capabilities   = PERF_PMU_CAP_NO_EXCLUDE,
        };
 
        l2cache_pmu->num_counters = get_num_counters();

diff --git a/drivers/perf/qcom_l3_pmu.c b/drivers/perf/qcom_l3_pmu.c
index 2dc63d61f2ea885991977bb3c830b0f9b2f6cc27..5d70646da8c78c64a6ec704bfe9bcc95facc4a53 100644 (file)
--- a/drivers/perf/qcom_l3_pmu.c
+++ b/drivers/perf/qcom_l3_pmu.c
@@ -494,13 +494,6 @@ static int qcom_l3_cache__event_init(struct perf_event *event)
        if (event->attr.type != event->pmu->type)
                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.
         */
@@ -777,6 +770,7 @@ static int qcom_l3_cache_pmu_probe(struct platform_device *pdev)
                .read           = qcom_l3_cache__event_read,
 
                .attr_groups    = qcom_l3_cache_pmu_attr_grps,
+               .capabilities   = PERF_PMU_CAP_NO_EXCLUDE,
        };
 
        memrc = platform_get_resource(pdev, IORESOURCE_MEM, 0);

diff --git a/drivers/perf/xgene_pmu.c b/drivers/perf/xgene_pmu.c
index 0dc9ff0f88940c6b1fe8b74003f5284736c305c4..d4ec04868d598c73ffff3c0c35c1f09db4b2d9d5 100644 (file)
--- a/drivers/perf/xgene_pmu.c
+++ b/drivers/perf/xgene_pmu.c
@@ -917,11 +917,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;
        /*
@@ -1136,6 +1131,7 @@ static int xgene_init_perf(struct xgene_pmu_dev *pmu_dev, char *name)
                .start          = xgene_perf_start,
                .stop           = xgene_perf_stop,
                .read           = xgene_perf_read,
+               .capabilities   = PERF_PMU_CAP_NO_EXCLUDE,
        };
 
        /* Hardware counter init */