Skip to content

Commit 1667e63

Browse files
committed
Merge tag 'perf_urgent_for_v6.5_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fix from Borislav Petkov: - Fix a lockdep warning when the event given is the first one, no event group exists yet but the code still goes and iterates over event siblings * tag 'perf_urgent_for_v6.5_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86: Fix lockdep warning in for_each_sibling_event() on SPR
2 parents 8a3e4a6 + 27c68c2 commit 1667e63

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

arch/x86/events/intel/core.c

+7
Original file line numberDiff line numberDiff line change
@@ -3993,6 +3993,13 @@ static int intel_pmu_hw_config(struct perf_event *event)
39933993
struct perf_event *leader = event->group_leader;
39943994
struct perf_event *sibling = NULL;
39953995

3996+
/*
3997+
* When this memload event is also the first event (no group
3998+
* exists yet), then there is no aux event before it.
3999+
*/
4000+
if (leader == event)
4001+
return -ENODATA;
4002+
39964003
if (!is_mem_loads_aux_event(leader)) {
39974004
for_each_sibling_event(sibling, leader) {
39984005
if (is_mem_loads_aux_event(sibling))

0 commit comments

Comments
 (0)