Commit 11a4815d authored by James Clark's avatar James Clark Committed by Junhao He
Browse files

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

mainline inclusion
from mainline-v6.8-rc1
commit 186c91aaf54989a9c74869dcc6ba031313d8e2b8
category: cleanup
bugzilla: https://gitee.com/openeuler/kernel/issues/I9Q7QP
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=186c91aaf54989a9c74869dcc6ba031313d8e2b8



--------------------------------

-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: default avatarJames Clark <james.clark@arm.com>
Link: https://lore.kernel.org/r/20231211161331.1277825-10-james.clark@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
parent 153e1a1b

arch/arm/kernel/perf_event_v7.c

+4 −2
Original line number Diff line number Diff line
@@ -1072,8 +1072,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)

drivers/perf/apple_m1_cpu_pmu.c

+4 −2
Original line number Diff line number Diff line
@@ -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)

drivers/perf/arm_pmu.c

+5 −6
Original line number Diff line number Diff line
@@ -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;

	}



	/*

drivers/perf/arm_pmuv3.c

+4 −2
Original line number Diff line number Diff line
@@ -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.