Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'timers-urgent-2025-09-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar:
"Fix a lost-timeout CPU hotplug bug in the hrtimer code, which can
trigger with certain hardware configs and regular HZ"
* tag 'timers-urgent-2025-09-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
hrtimers: Unconditionally update target CPU base after offline timer migration
+3
-8
+3
-8
kernel/time/hrtimer.c
+3
-8
kernel/time/hrtimer.c
···
787
787
* of the next expiring timer is enough. The return from the SMP
788
788
* function call will take care of the reprogramming in case the
789
789
* CPU was in a NOHZ idle sleep.
790
+
*
791
+
* In periodic low resolution mode, the next softirq expiration
792
+
* must also be updated.
790
793
*/
791
-
if (!hrtimer_hres_active(base) && !tick_nohz_active)
792
-
return;
793
-
794
794
raw_spin_lock(&base->lock);
795
795
hrtimer_update_base(base);
796
796
if (hrtimer_hres_active(base))
···
2295
2295
&new_base->clock_base[i]);
2296
2296
}
2297
2297
2298
-
/*
2299
-
* The migration might have changed the first expiring softirq
2300
-
* timer on this CPU. Update it.
2301
-
*/
2302
-
__hrtimer_get_next_event(new_base, HRTIMER_ACTIVE_SOFT);
2303
2298
/* Tell the other CPU to retrigger the next event */
2304
2299
smp_call_function_single(ncpu, retrigger_next_event, NULL, 0);
2305
2300