arm: pmu: Move error message and -EOPNOTSUPP to individual PMUs

-EPERM or -EINVAL always get converted to -EOPNOTSUPP, so replace them.
This will allow __hw_perf_event_init() to return a different code or not
print that particular message for a different error in the next commit.

Signed-off-by: James Clark <james.clark@arm.com>
Link: https://lore.kernel.org/r/20231211161331.1277825-10-james.clark@arm.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c
index c890354b04e9f9e60b651bbf32af4326e636129a..a3322e2b3ea44d4124325ada066ea62613f64bcc 100644 (file)
--- a/arch/arm/kernel/perf_event_v7.c
+++ b/arch/arm/kernel/perf_event_v7.c
@@ -1052,8 +1052,10 @@ static int armv7pmu_set_event_filter(struct hw_perf_event *event,
 {
        unsigned long config_base = 0;
 
-       if (attr->exclude_idle)
-               return -EPERM;
+       if (attr->exclude_idle) {
+               pr_debug("ARM performance counters do not support mode exclusion\n");
+               return -EOPNOTSUPP;
+       }
        if (attr->exclude_user)
                config_base |= ARMV7_EXCLUDE_USER;
        if (attr->exclude_kernel)

diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pmu.c
index cd2de44b61b91fddf172aef24efb602baf1486d5..f322e5ca1114b9be8b7cac6c244c336b27bd72af 100644 (file)
--- a/drivers/perf/apple_m1_cpu_pmu.c
+++ b/drivers/perf/apple_m1_cpu_pmu.c
@@ -524,8 +524,10 @@ static int m1_pmu_set_event_filter(struct hw_perf_event *event,
 {
        unsigned long config_base = 0;
 
-       if (!attr->exclude_guest)
-               return -EINVAL;
+       if (!attr->exclude_guest) {
+               pr_debug("ARM performance counters do not support mode exclusion\n");
+               return -EOPNOTSUPP;
+       }
        if (!attr->exclude_kernel)
                config_base |= M1_PMU_CFG_COUNT_KERNEL;
        if (!attr->exclude_user)

diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 379479b50bdd7347c087c318725d80b6c8dd2ce0..8458fe2cebb4fb8ced7a165f7da313587216f418 100644 (file)
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -445,7 +445,7 @@ __hw_perf_event_init(struct perf_event *event)
 {
        struct arm_pmu *armpmu = to_arm_pmu(event->pmu);
        struct hw_perf_event *hwc = &event->hw;
-       int mapping;
+       int mapping, ret;
 
        hwc->flags = 0;
        mapping = armpmu->map_event(event);
@@ -470,11 +470,10 @@ __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)) {
-               pr_debug("ARM performance counters do not support "
-                        "mode exclusion\n");
-               return -EOPNOTSUPP;
+       if (armpmu->set_event_filter) {
+               ret = armpmu->set_event_filter(hwc, &event->attr);
+               if (ret)
+                       return ret;
        }
 
        /*

diff --git a/drivers/perf/arm_pmuv3.c b/drivers/perf/arm_pmuv3.c
index 8a573db81da175af8095cfc7ed7e15e5db65a60d..2ba215f74d92f2f7e17046480f9ebdda5c9fd581 100644 (file)
--- a/drivers/perf/arm_pmuv3.c
+++ b/drivers/perf/arm_pmuv3.c
@@ -936,8 +936,10 @@ static int armv8pmu_set_event_filter(struct hw_perf_event *event,
 {
        unsigned long config_base = 0;
 
-       if (attr->exclude_idle)
-               return -EPERM;
+       if (attr->exclude_idle) {
+               pr_debug("ARM performance counters do not support mode exclusion\n");
+               return -EOPNOTSUPP;
+       }
 
        /*
         * If we're running in hyp mode, then we *are* the hypervisor.