diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2024-10-30 08:53:51 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2024-10-31 11:45:01 +0100 |
| commit | 1d4199cbbe95efaba51304cfd844bd0ccd224e61 (patch) | |
| tree | 872223b5a525f3297ab928baa203cf6e80f61596 /kernel/time | |
| parent | bf9a001fb8e46a23c43d4964523963e717d9e972 (diff) | |
timers: Add missing READ_ONCE() in __run_timer_base()
__run_timer_base() checks base::next_expiry without holding
base::lock. That can race with a remote CPU updating next_expiry under the
lock. This is an intentional and harmless data race, but lacks a
READ_ONCE(), so KCSAN complains about this.
Add the missing READ_ONCE(). All other places are covered already.
Fixes: 79f8b28e85f8 ("timers: Annotate possible non critical data race of next_expiry")
Reported-by: kernel test robot <oliver.sang@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/all/87a5emyqk0.ffs@tglx
Closes: https://lore.kernel.org/oe-lkp/202410301205.ef8e9743-lkp@intel.com
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 02355b275bab..a283e524835d 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -2421,7 +2421,8 @@ static inline void __run_timers(struct timer_base *base) static void __run_timer_base(struct timer_base *base) { - if (time_before(jiffies, base->next_expiry)) + /* Can race against a remote CPU updating next_expiry under the lock */ + if (time_before(jiffies, READ_ONCE(base->next_expiry))) return; timer_base_lock_expiry(base); |