Skip to content

Commit e895f8e

Browse files
fenghusthuKAGA-KOKO
authored andcommitted
hrtimers: Unconditionally update target CPU base after offline timer migration
When testing softirq based hrtimers on an ARM32 board, with high resolution mode and NOHZ inactive, softirq based hrtimers fail to expire after being moved away from an offline CPU: CPU0 CPU1 hrtimer_start(..., HRTIMER_MODE_SOFT); cpu_down(CPU1) ... hrtimers_cpu_dying() // Migrate timers to CPU0 smp_call_function_single(CPU0, returgger_next_event); retrigger_next_event() if (!highres && !nohz) return; As retrigger_next_event() is a NOOP when both high resolution timers and NOHZ are inactive CPU0's hrtimer_cpu_base::softirq_expires_next is not updated and the migrated softirq timers never expire unless there is a softirq based hrtimer queued on CPU0 later. Fix this by removing the hrtimer_hres_active() and tick_nohz_active() check in retrigger_next_event(), which enforces a full update of the CPU base. As this is not a fast path the extra cost does not matter. [ tglx: Massaged change log ] Fixes: 5c0930c ("hrtimers: Push pending hrtimers away from outgoing CPU earlier") Co-developed-by: Frederic Weisbecker <[email protected]> Signed-off-by: Frederic Weisbecker <[email protected]> Signed-off-by: Xiongfeng Wang <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent 76eeb9b commit e895f8e

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

kernel/time/hrtimer.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -787,10 +787,10 @@ static void retrigger_next_event(void *arg)
787787
* of the next expiring timer is enough. The return from the SMP
788788
* function call will take care of the reprogramming in case the
789789
* CPU was in a NOHZ idle sleep.
790+
*
791+
* In periodic low resolution mode, the next softirq expiration
792+
* must also be updated.
790793
*/
791-
if (!hrtimer_hres_active(base) && !tick_nohz_active)
792-
return;
793-
794794
raw_spin_lock(&base->lock);
795795
hrtimer_update_base(base);
796796
if (hrtimer_hres_active(base))
@@ -2295,11 +2295,6 @@ int hrtimers_cpu_dying(unsigned int dying_cpu)
22952295
&new_base->clock_base[i]);
22962296
}
22972297

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);
23032298
/* Tell the other CPU to retrigger the next event */
23042299
smp_call_function_single(ncpu, retrigger_next_event, NULL, 0);
23052300

0 commit comments

Comments
 (0)