hrtimer: annotate lockless access to timer->base
PATCH 1/1 hrtimer: annotate lockless access to timer->base
Followup to commit dd2261ed45aa ("hrtimer: Protect lockless access to timer->base")
lock_hrtimer_base() fetches timer->base without lock exclusion.
Compiler is allowed to read timer->base twice (even if considered dumb) and we could end up trying to lock migration_base and
return &migration_base.
base = timer->base;
if (likely(base != &migration_base)) { /* compiler reads timer->base again, and now (base == &migration_base)
raw_spin_lock_irqsave(&base->cpu_base->lock, *flags);
if (likely(base == timer->base))
return base; /* == &migration_base ! */Similarly the write sides should use WRITE_ONCE() to avoid store tearing.
--- kernel/time/hrtimer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/time/hrtimer.c +4 -4
@@ -164,7 +164,7 @@ struct hrtimer_clock_base *lock_hrtimer_base(const struct hrtimer *timer,struct hrtimer_clock_base *base;for (;;) { - base = timer->base; + base =READ_ONCE (timer->base);if (likely (base != &migration_base)) {raw_spin_lock_irqsave (&base->cpu_base->lock, *flags);if (likely (base == timer->base))
@@ -244,7 +244,7 @@ switch_hrtimer_base(struct hrtimer *timer, struct hrtimer_clock_base *base,return base;/* See the comment in lock_hrtimer_base() */ - timer->base = &migration_base; +WRITE_ONCE (timer->base, &migration_base);raw_spin_unlock (&base->cpu_base->lock);raw_spin_lock (&new_base->cpu_base->lock);
@@ -253,10 +253,10 @@ switch_hrtimer_base(struct hrtimer *timer, struct hrtimer_clock_base *base,raw_spin_unlock (&new_base->cpu_base->lock);raw_spin_lock (&base->cpu_base->lock); new_cpu_base = this_cpu_base; - timer->base = base; +WRITE_ONCE (timer->base, base); goto again; } - timer->base = new_base; +WRITE_ONCE (timer->base, new_base); }else {if (new_cpu_base != this_cpu_base &&hrtimer_check_target (timer, new_base)) {
Signature · 1 line
2.23.0.581.g78d2f28ef7-goog
Quoted 65 lines · Eric Dumazet
Followup to commit
dd2261ed45aa("hrtimer: Protect lockless access totimer->base")
lock_hrtimer_base()fetchestimer->basewithout lock exclusion.Compiler is allowed to read
timer->basetwice (even if considered dumb) and we could end up trying to lockmigration_baseand
return&migration_base.base = timer->base; if (likely(base != &migration_base)) {/* compiler reads timer->base again, and now (base == &migration_base) raw_spin_lock_irqsave(&base->cpu_base->lock, *flags); if (likely(base == timer->base)) return base; /* == &migration_base ! */Similarly the write sides should use
WRITE_ONCE()to avoid store tearing.Signed-off-by Eric Dumazet <[email protected]>Cc Julien Grall <[email protected]>Cc Thomas Gleixner <[email protected]>--- kernel/time/hrtimer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)kernel/time/hrtimer.c +4
-5@@ -164,7 +164,7 @@ struct hrtimer_clock_base *lock_hrtimer_base(const struct hrtimer *timer,struct hrtimer_clock_base *base;for (;;) { - base = timer->base; + base =READ_ONCE (timer->base);if (likely (base != &migration_base)) {raw_spin_lock_irqsave (&base->cpu_base->lock, *flags);if (likely (base == timer->base))@@ -244,7 +244,7 @@ switch_hrtimer_base(struct hrtimer *timer, struct hrtimer_clock_base *base,return base;/* See the comment in lock_hrtimer_base() */ - timer->base = &migration_base; +WRITE_ONCE (timer->base, &migration_base);raw_spin_unlock (&base->cpu_base->lock);raw_spin_lock (&new_base->cpu_base->lock);@@ -253,10 +253,10 @@ switch_hrtimer_base(struct hrtimer *timer, struct hrtimer_clock_base *base,raw_spin_unlock (&new_base->cpu_base->lock);raw_spin_lock (&base->cpu_base->lock); new_cpu_base = this_cpu_base; - timer->base = base; +WRITE_ONCE (timer->base, base); goto again; } - timer->base = new_base; +WRITE_ONCE (timer->base, new_base); }else {if (new_cpu_base != this_cpu_base &&hrtimer_check_target (timer, new_base)) { --
Quoted 2 lines
2.23.0.581.g78d2f28ef7-goog
Any news on this patch ?
If more information is needed, let me know.
Maybe I need to point to :
commit b831275a3553c32091222ac619cfddd73a5553fb timers: Plug locking race vs. timer migration
Thanks
[tip: timers/urgent] hrtimer: Annotate lockless access to timer->base
In reply to Eric DumazetThe following commit has been merged into the timers/urgent branch of tip:
The following commit has been merged into the timers/urgent branch of tip:
Commit-ID: ff229eee3d897f52bd001c841f2d3cce8853ecdc Gitweb: https://git.kernel.org/tip/ff229eee3d897f52bd001c841f2d3cce8853ecdc Author: Eric Dumazet <[email protected]> AuthorDate: Tue, 08 Oct 2019 10:32:04 -07:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 14 Oct 2019 15:51:49 +02:00
hrtimer: Annotate lockless access to timer->base
Followup to commit dd2261ed45aa ("hrtimer: Protect lockless access to timer->base")
lock_hrtimer_base() fetches timer->base without lock exclusion.
Compiler is allowed to read timer->base twice (even if considered dumb) which could end up trying to lock migration_base and return &migration_base.
base = timer->base;
if (likely(base != &migration_base)) { /* compiler reads timer->base again, and now (base == &migration_base)
raw_spin_lock_irqsave(&base->cpu_base->lock, *flags);
if (likely(base == timer->base))
return base; /* == &migration_base ! */Similarly the write sides must use WRITE_ONCE() to avoid store tearing.
--- kernel/time/hrtimer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/time/hrtimer.c +4 -4
@@ -164,7 +164,7 @@ struct hrtimer_clock_base *lock_hrtimer_base(const struct hrtimer *timer,struct hrtimer_clock_base *base;for (;;) { - base = timer->base; + base =READ_ONCE (timer->base);if (likely (base != &migration_base)) {raw_spin_lock_irqsave (&base->cpu_base->lock, *flags);if (likely (base == timer->base))
@@ -244,7 +244,7 @@ again:return base;/* See the comment in lock_hrtimer_base() */ - timer->base = &migration_base; +WRITE_ONCE (timer->base, &migration_base);raw_spin_unlock (&base->cpu_base->lock);raw_spin_lock (&new_base->cpu_base->lock);
@@ -253,10 +253,10 @@ again:raw_spin_unlock (&new_base->cpu_base->lock);raw_spin_lock (&base->cpu_base->lock); new_cpu_base = this_cpu_base; - timer->base = base; +WRITE_ONCE (timer->base, base); goto again; } - timer->base = new_base; +WRITE_ONCE (timer->base, new_base); }else {if (new_cpu_base != this_cpu_base &&hrtimer_check_target (timer, new_base)) {