Commit 69fd6b99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf_urgent_for_v6.17_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fix from Borislav Petkov:

 - Fix a case where the events throttling logic operates on inactive
   events

* tag 'perf_urgent_for_v6.17_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Avoid undefined behavior from stopping/starting inactive events
parents 0f74d9cf b64fdd42

kernel/events/core.c

+6 −0
Original line number Diff line number Diff line
@@ -2665,6 +2665,9 @@ static void perf_log_itrace_start(struct perf_event *event); 


static void perf_event_unthrottle(struct perf_event *event, bool start)

{

	if (event->state != PERF_EVENT_STATE_ACTIVE)

		return;



	event->hw.interrupts = 0;

	if (start)

		event->pmu->start(event, 0);
@@ -2674,6 +2677,9 @@ static void perf_event_unthrottle(struct perf_event *event, bool start) 


static void perf_event_throttle(struct perf_event *event)

{

	if (event->state != PERF_EVENT_STATE_ACTIVE)

		return;



	event->hw.interrupts = MAX_INTERRUPTS;

	event->pmu->stop(event, 0);

	if (event == event->group_leader)