[PATCH 04/19] perf/starfive: Fix group validation
Robin Murphy <[email protected]>
| Newsgroups | gmane.comp.freedesktop.xorg.drivers.intel,gmane.linux.kernel.perf.user,gmane.linux.kernel,gmane.linux.ports.alpha,gmane.linux.kernel.arc,gmane.linux.ports.arm.kernel,gmane.linux.ports.mips,gmane.linux.ports.ppc64.devel,gmane.linux.ports.sh.devel,gmane.linux.ports.sparc,gmane.linux.power-management.general,gmane.linux.ports.arm.rockchip,gmane.comp.freedesktop.amd-gfx,gmane.comp.video.dri.devel,gmane.linux.ports.arm.msm,gmane.linux.ports.riscv |
|---|---|
| Message-ID | <6b9c9cf887c102c9154a1f28aea643a66787858f.1755096883.git.robin.murphy@arm.com> |
The group validation code here is superficially the right shape, but is failing to count the group leader, while also erroneously counting software siblings. Just correctly count the events which belong to our PMU, and let perf core worry about the rest. Signed-off-by: Robin Murphy <[email protected]> --- drivers/perf/starfive_starlink_pmu.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/perf/starfive_starlink_pmu.c b/drivers/perf/starfive_starlink_pmu.c index 5e5a672b4229..e185f307e639 100644 --- a/drivers/perf/starfive_starlink_pmu.c +++ b/drivers/perf/starfive_starlink_pmu.c @@ -347,19 +347,15 @@ static bool starlink_pmu_validate_event_group(struct perf_event *event) struct perf_event *sibling; int counter = 1; - /* - * Ensure hardware events in the group are on the same PMU, - * software events are acceptable. - */ - if (event->group_leader->pmu != event->pmu && - !is_software_event(event->group_leader)) - return false; + if (leader == event) + return true; + + if (leader->pmu == event->pmu) + counter++; for_each_sibling_event(sibling, leader) { - if (sibling->pmu != event->pmu && !is_software_event(sibling)) - return false; - - counter++; + if (sibling->pmu == event->pmu) + counter++; } return counter <= STARLINK_PMU_NUM_COUNTERS; -- 2.39.2.101.g768bb238c484.dirty