Commit 1667e630 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8a3e4a64 27c68c21

arch/x86/events/intel/core.c

+7 −0
Original line number Diff line number Diff line
@@ -3993,6 +3993,13 @@ static int intel_pmu_hw_config(struct perf_event *event) 
		struct perf_event *leader = event->group_leader;

		struct perf_event *sibling = NULL;



		/*

		 * When this memload event is also the first event (no group

		 * exists yet), then there is no aux event before it.

		 */

		if (leader == event)

			return -ENODATA;



		if (!is_mem_loads_aux_event(leader)) {

			for_each_sibling_event(sibling, leader) {

				if (is_mem_loads_aux_event(sibling))