[PATCH] perf/arm-smmuv3: Fix lockdep assert in ->event_init()
From: Chun-Tse Shao
Date: Thu Nov 07 2024 - 17:00:09 EST
Same as
https://lore.kernel.org/all/20240514180050.182454-1-namhyung@xxxxxxxxxx/,
we should skip `for_each_sibling_event()` for group leader since it
doesn't have the ctx yet.
Fixes: f3c0eba28704 ("perf: Add a few assertions")
Reported-by: Greg Thelen <gthelen@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Robin Murphy <robin.murphy@xxxxxxx>
Cc: Tuan Phan <tuanphan@xxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Chun-Tse Shao <ctshao@xxxxxxxxxx>
---
drivers/perf/arm_smmuv3_pmu.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c
index d5fa92ba8373..09789599fccc 100644
--- a/drivers/perf/arm_smmuv3_pmu.c
+++ b/drivers/perf/arm_smmuv3_pmu.c
@@ -431,6 +431,11 @@ static int smmu_pmu_event_init(struct perf_event *event)
return -EINVAL;
}
+ hwc->idx = -1;
+
+ if (event->group_leader == event)
+ return 0;
+
for_each_sibling_event(sibling, event->group_leader) {
if (is_software_event(sibling))
continue;
@@ -442,8 +447,6 @@ static int smmu_pmu_event_init(struct perf_event *event)
return -EINVAL;
}
- hwc->idx = -1;
-
/*
* Ensure all events are on the same cpu so all events are in the
* same cpu context, to avoid races on pmu_enable etc.
--
2.47.0.277.g8800431eea-goog