Commit fe948326 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-urgent-2026-01-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf event fix from Ingo Molnar:
 "Fix perf swevent hrtimer deinit regression"

* tag 'perf-urgent-2026-01-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Ensure swevent hrtimer is properly destroyed
parents 88730166 ff5860f5

kernel/events/core.c

+6 −0
Original line number Diff line number Diff line
@@ -11906,6 +11906,11 @@ static void perf_swevent_cancel_hrtimer(struct perf_event *event) 
	}

}



static void perf_swevent_destroy_hrtimer(struct perf_event *event)

{

	hrtimer_cancel(&event->hw.hrtimer);

}



static void perf_swevent_init_hrtimer(struct perf_event *event)

{

	struct hw_perf_event *hwc = &event->hw;
@@ -11914,6 +11919,7 @@ static void perf_swevent_init_hrtimer(struct perf_event *event) 
		return;



	hrtimer_setup(&hwc->hrtimer, perf_swevent_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);

	event->destroy = perf_swevent_destroy_hrtimer;



	/*

	 * Since hrtimers have a fixed rate, we can do a static freq->period