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

torvalds · torvalds · commit fe948326e95d · 2026-01-11T06:55:27.000-10:00
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
diff --git a/kernel/events/core.c b/kernel/events/core.c
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -11906,6 +11906,11 @@ static void perf_swevent_cancel_hrtimer(struct perf_event *event)`
`11906`	`11906`	`}`
`11907`	`11907`	`}`
`11908`	`11908`
	`11909`	`+static void perf_swevent_destroy_hrtimer(struct perf_event *event)`
	`11910`	`+{`
	`11911`	`+ hrtimer_cancel(&event->hw.hrtimer);`
	`11912`	`+}`
	`11913`	`+`
`11909`	`11914`	`static void perf_swevent_init_hrtimer(struct perf_event *event)`
`11910`	`11915`	`{`
`11911`	`11916`	`struct hw_perf_event *hwc = &event->hw;`
`@@ -11914,6 +11919,7 @@ static void perf_swevent_init_hrtimer(struct perf_event *event)`
`11914`	`11919`	`return;`
`11915`	`11920`
`11916`	`11921`	`hrtimer_setup(&hwc->hrtimer, perf_swevent_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);`
	`11922`	`+ event->destroy = perf_swevent_destroy_hrtimer;`
`11917`	`11923`
`11918`	`11924`	`/*`
`11919`	`11925`	`* Since hrtimers have a fixed rate, we can do a static freq->period`