Skip to content

Commit 186c91a

Browse files
James-A-Clarkwilldeacon
authored andcommitted
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>
1 parent c7b98bf commit 186c91a

4 files changed

Lines changed: 17 additions & 12 deletions

File tree

arch/arm/kernel/perf_event_v7.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,8 +1052,10 @@ static int armv7pmu_set_event_filter(struct hw_perf_event *event,
10521052
{
10531053
unsigned long config_base = 0;
10541054

1055-
if (attr->exclude_idle)
1056-
return -EPERM;
1055+
if (attr->exclude_idle) {
1056+
pr_debug("ARM performance counters do not support mode exclusion\n");
1057+
return -EOPNOTSUPP;
1058+
}
10571059
if (attr->exclude_user)
10581060
config_base |= ARMV7_EXCLUDE_USER;
10591061
if (attr->exclude_kernel)

drivers/perf/apple_m1_cpu_pmu.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,10 @@ static int m1_pmu_set_event_filter(struct hw_perf_event *event,
524524
{
525525
unsigned long config_base = 0;
526526

527-
if (!attr->exclude_guest)
528-
return -EINVAL;
527+
if (!attr->exclude_guest) {
528+
pr_debug("ARM performance counters do not support mode exclusion\n");
529+
return -EOPNOTSUPP;
530+
}
529531
if (!attr->exclude_kernel)
530532
config_base |= M1_PMU_CFG_COUNT_KERNEL;
531533
if (!attr->exclude_user)

drivers/perf/arm_pmu.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ __hw_perf_event_init(struct perf_event *event)
445445
{
446446
struct arm_pmu *armpmu = to_arm_pmu(event->pmu);
447447
struct hw_perf_event *hwc = &event->hw;
448-
int mapping;
448+
int mapping, ret;
449449

450450
hwc->flags = 0;
451451
mapping = armpmu->map_event(event);
@@ -470,11 +470,10 @@ __hw_perf_event_init(struct perf_event *event)
470470
/*
471471
* Check whether we need to exclude the counter from certain modes.
472472
*/
473-
if (armpmu->set_event_filter &&
474-
armpmu->set_event_filter(hwc, &event->attr)) {
475-
pr_debug("ARM performance counters do not support "
476-
"mode exclusion\n");
477-
return -EOPNOTSUPP;
473+
if (armpmu->set_event_filter) {
474+
ret = armpmu->set_event_filter(hwc, &event->attr);
475+
if (ret)
476+
return ret;
478477
}
479478

480479
/*

drivers/perf/arm_pmuv3.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -936,8 +936,10 @@ static int armv8pmu_set_event_filter(struct hw_perf_event *event,
936936
{
937937
unsigned long config_base = 0;
938938

939-
if (attr->exclude_idle)
940-
return -EPERM;
939+
if (attr->exclude_idle) {
940+
pr_debug("ARM performance counters do not support mode exclusion\n");
941+
return -EOPNOTSUPP;
942+
}
941943

942944
/*
943945
* If we're running in hyp mode, then we *are* the hypervisor.

0 commit comments

Comments
 (0)