Merge tag 'perf-urgent-2024-04-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit a1505c47e78a · 2024-04-14T10:26:27.000-07:00
Pull perf event fix from Ingo Molnar:
 "Fix the x86 PMU multi-counter code returning invalid data in certain
  circumstances"

* tag 'perf-urgent-2024-04-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Fix out of range data
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
@@ -1644,6 +1644,7 @@ static void x86_pmu_del(struct perf_event *event, int flags)
 	while (++i < cpuc->n_events) {
 		cpuc->event_list[i-1] = cpuc->event_list[i];
 		cpuc->event_constraint[i-1] = cpuc->event_constraint[i];
+		cpuc->assign[i-1] = cpuc->assign[i];
 	}
 	cpuc->event_constraint[i-1] = NULL;
 	--cpuc->n_events;

Original file line number	Diff line number	Diff line change
`@@ -1644,6 +1644,7 @@ static void x86_pmu_del(struct perf_event *event, int flags)`
`1644`	`1644`	`while (++i < cpuc->n_events) {`
`1645`	`1645`	`cpuc->event_list[i-1] = cpuc->event_list[i];`
`1646`	`1646`	`cpuc->event_constraint[i-1] = cpuc->event_constraint[i];`
	`1647`	`+ cpuc->assign[i-1] = cpuc->assign[i];`
`1647`	`1648`	`}`
`1648`	`1649`	`cpuc->event_constraint[i-1] = NULL;`
`1649`	`1650`	`--cpuc->n_events;`