timers: Clear must_forward_clk inside base lock
PATCH v2 1/1 timers: Clear must_forward_clk inside base lock
Timer wheel base->must_forward_clock is indicating that the base clock might be stale due to a long idle sleep. The forwarding of base clock takes place in softirq of timer or when a timer is enqueued to base which is idle. While migrate timer from remote CPU to the new base which is idle, then following race can happen:
CPU0 CPU1
run_timer_softirq timers_dead_cpu
base = lock_timer_base(timer); base->must_forward_clk = false if (base->must_forward_clk) forward(base); >>skip migrate_timer_list enqueue_timer(base, timer, idx); >> idx is calculated high due to >> stale base unlock_timer_base(timer);
base = lock_timer_base(timer);
forward(base);
The root cause is that base->must_forward_clk is cleared outside the base->lock held region, so the remote queuing CPU observes it as cleared, but the base clock is still stale. This can cause large granularity values for timers, i.e. the accuracy of the expiry time suffers.
Prevent this by clearing the flag with base->lock held, so that the forwarding takes place before the cleared flag is observable by a remote CPU.
---
Changes since v1:
- Updated comment suggested by Thomas.
kernel/time/timer.c +16 -13
@@ -1657,6 +1657,22 @@ static inline void __run_timers(struct timer_base *base)raw_spin_lock_irq (&base->lock); +/* +* Timer wheel base must_forward_clk must be cleared before running +* timers so that any timer functions that call mod_timer will not +* try to forward the base. idle tracking / clock forwarding logic +* is only used with BASE_STD timers. +* +* The must_forward_clk flag is cleared unconditionally also for +* the deferrable base. The deferrable base is not affected by idle +* tracking and never forwarded, so clearing the flag is a NOOP. +* +* The fact that the deferrable base is never forwarded can cause +* large variations in granularity for deferrable timers, but they +* can be deferred for long periods due to idle anyway. +*/ + base->must_forward_clk = false; +while (time_after_eq (jiffies, base->clk)) { levels =collect_expired_timers (base, heads);
@@ -1676,19 +1692,6 @@ static __latent_entropy void run_timer_softirq(struct softirq_action *h) {struct timer_base *base =this_cpu_ptr (&timer_bases[BASE_STD ]); -/* -* must_forward_clk must be cleared before running timers so that any -* timer functions that call mod_timer will not try to forward the -* base. idle trcking / clock forwarding logic is only used with -* BASE_STD timers. -* -* The deferrable base does not do idle tracking at all, so we do -* not forward it. This can result in very large variations in -* granularity for deferrable timers, but they can be deferred for -* long periods due to idle. -*/ - base->must_forward_clk = false; -__run_timers (base);if (IS_ENABLED (CONFIG_NO_HZ_COMMON ))__run_timers (this_cpu_ptr (&timer_bases[BASE_DEF ]));
Signature · 1 line
1.9.1
Quoted 3 lines · Gaurav Kohli
Timer wheel
base->must_forward_clockis indicating that the base clock might be stale due to a long idle sleep. The forwarding of base clock takes place in softirq of timer
of the base clock takes place in the timer softirq ...
Quoted 1 line
or when a timer is enqueued to base which is idle. While migrate
to a base ..
Quoted 1 line
timer from remote CPU to the new base which is idle, then
See below.
Quoted 11 lines
following race can happen:
CPU0 CPU1
run_timer_softirqtimers_dead_cpubase = lock_timer_base(timer); base->must_forward_clk = false if (base->must_forward_clk) forward(base); >>skip migrate_timer_list
I don't know why you insist on migrate_timer_list() being part of the picture here.
It's only _ONE_ particular way to observe that issue. But it's not the only way. ANY remote enqueue which hits the situation on the other CPU (CPU0 in the example) has this problem. Tying it to migrate_timer_list() just because you observed it that way is actively misleading. Surely you can add a sentence that you observed it in that case, but that's supplemental information.
Thanks,
tglx
Quoted 25 lines · Thomas Gleixner
Quoted 3 lines · Gaurav Kohli
Timer wheel
base->must_forward_clockis indicating that the base clock might be stale due to a long idle sleep. The forwarding of base clock takes place in softirq of timerof the base clock takes place in the timer softirq ...
Quoted 1 line
or when a timer is enqueued to base which is idle. While migrate
to a base ..
Quoted 1 line
timer from remote CPU to the new base which is idle, then
See below.
Quoted 10 lines
following race can happen:
CPU0 CPU1 run_timer_softirq timers_dead_cpu base = lock_timer_base(timer); base->must_forward_clk = false if (base->must_forward_clk) forward(base); >>skip
Quoted 4 lines
Quoted 1 line
migrate_timer_listI don't know why you insist on
migrate_timer_list()being part of the picture here.
Hi Thomas,
Thanks for comment.
I agree this can come with normal enqueue of timer as well, will make it more generic to avoid confuzion and upload new patch for same.
Regards
Gaurav
Quoted 12 lines
It's only _ONE_ particular way to observe that issue. But it's not the only way. ANY remote enqueue which hits the situation on the other CPU (CPU0 in the example) has this problem. Tying it to
migrate_timer_list()just because you observed it that way is actively misleading. Surely you can add a sentence that you observed it in that case, but that's supplemental information.Thanks,
tglx
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.