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.

Signed-off-by: Andrew Murray <andrew.mur...@arm.com>
Acked-by: Will Deacon <will.dea...@arm.com>
---
 drivers/perf/arm-cci.c                        | 10 +---------
 drivers/perf/arm-ccn.c                        |  6 ++----
 drivers/perf/arm_dsu_pmu.c                    |  9 ++-------
 drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c |  1 +
 drivers/perf/hisilicon/hisi_uncore_hha_pmu.c  |  1 +
 drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c  |  1 +
 drivers/perf/hisilicon/hisi_uncore_pmu.c      |  9 ---------
 drivers/perf/thunderx2_pmu.c                  | 10 +---------
 8 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c
index 1bfeb16..bfd03e0 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
@@ -1433,6 +1424,7 @@ static int cci_pmu_init(struct cci_pmu *cci_pmu, struct 
platform_device *pdev)
                .stop           = cci_pmu_stop,
                .read           = pmu_read,
                .attr_groups    = pmu_attr_groups,
+               .capabilities   = PERF_PMU_CAP_NO_EXCLUDE,
        };
 
        cci_pmu->plat_device = pdev;
diff --git a/drivers/perf/arm-ccn.c b/drivers/perf/arm-ccn.c
index 7dd850e..2ae7602 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;
        }
@@ -1290,6 +1287,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn)
                .read = arm_ccn_pmu_event_read,
                .pmu_enable = arm_ccn_pmu_enable,
                .pmu_disable = arm_ccn_pmu_disable,
+               .capabilities = PERF_PMU_CAP_NO_EXCLUDE,
        };
 
        /* No overflow interrupt? Have to use a timer instead. */
diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c
index 660cb8a..5851de5 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;
        }
@@ -735,6 +729,7 @@ static int dsu_pmu_device_probe(struct platform_device 
*pdev)
                .read           = dsu_pmu_read,
 
                .attr_groups    = dsu_pmu_attr_groups,
+               .capabilities   = PERF_PMU_CAP_NO_EXCLUDE,
        };
 
        rc = perf_pmu_register(&dsu_pmu->pmu, name, -1);
diff --git a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c 
b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c
index 69372e2..0eba947 100644
--- a/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c
@@ -396,6 +396,7 @@ static int hisi_ddrc_pmu_probe(struct platform_device *pdev)
                .stop           = hisi_uncore_pmu_stop,
                .read           = hisi_uncore_pmu_read,
                .attr_groups    = hisi_ddrc_pmu_attr_groups,
+               .capabilities   = PERF_PMU_CAP_NO_EXCLUDE,
        };
 
        ret = perf_pmu_register(&ddrc_pmu->pmu, name, -1);
diff --git a/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c 
b/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
index 443906e..2553a84 100644
--- a/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
@@ -407,6 +407,7 @@ static int hisi_hha_pmu_probe(struct platform_device *pdev)
                .stop           = hisi_uncore_pmu_stop,
                .read           = hisi_uncore_pmu_read,
                .attr_groups    = hisi_hha_pmu_attr_groups,
+               .capabilities   = PERF_PMU_CAP_NO_EXCLUDE,
        };
 
        ret = perf_pmu_register(&hha_pmu->pmu, name, -1);
diff --git a/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c 
b/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c
index 0bde5d9..cf1cc34 100644
--- a/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c
@@ -397,6 +397,7 @@ static int hisi_l3c_pmu_probe(struct platform_device *pdev)
                .stop           = hisi_uncore_pmu_stop,
                .read           = hisi_uncore_pmu_read,
                .attr_groups    = hisi_l3c_pmu_attr_groups,
+               .capabilities   = PERF_PMU_CAP_NO_EXCLUDE,
        };
 
        ret = perf_pmu_register(&l3c_pmu->pmu, name, -1);
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
diff --git a/drivers/perf/thunderx2_pmu.c b/drivers/perf/thunderx2_pmu.c
index c9a1701..43d76c8 100644
--- a/drivers/perf/thunderx2_pmu.c
+++ b/drivers/perf/thunderx2_pmu.c
@@ -424,15 +424,6 @@ static int tx2_uncore_event_init(struct perf_event *event)
        if (is_sampling_event(event) || event->attach_state & PERF_ATTACH_TASK)
                return -EINVAL;
 
-       /* 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;
-
        if (event->cpu < 0)
                return -EINVAL;
 
@@ -572,6 +563,7 @@ static int tx2_uncore_pmu_register(
                .start          = tx2_uncore_event_start,
                .stop           = tx2_uncore_event_stop,
                .read           = tx2_uncore_event_read,
+               .capabilities   = PERF_PMU_CAP_NO_EXCLUDE,
        };
 
        tx2_pmu->pmu.name = devm_kasprintf(dev, GFP_KERNEL,
-- 
2.7.4

Reply via email to