]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
timers: Fix warning condition in __run_timers()
authorAnna-Maria Behnsen <anna-maria@linutronix.de>
Tue, 5 Apr 2022 19:17:32 +0000 (21:17 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Apr 2022 07:23:30 +0000 (09:23 +0200)
commit9a5a4d23e24d39784b643e5db2e4c3a97da4a1ac
tree9c092a1f0c82f31b7ba7e65a9fa6804b4db6ea90
parent84837f43e56fc2594f07a49399667c467de527a3
timers: Fix warning condition in __run_timers()

commit c54bc0fc84214b203f7a0ebfd1bd308ce2abe920 upstream.

When the timer base is empty, base::next_expiry is set to base::clk +
NEXT_TIMER_MAX_DELTA and base::next_expiry_recalc is false. When no timer
is queued until jiffies reaches base::next_expiry value, the warning for
not finding any expired timer and base::next_expiry_recalc is false in
__run_timers() triggers.

To prevent triggering the warning in this valid scenario
base::timers_pending needs to be added to the warning condition.

Fixes: 31cd0e119d50 ("timers: Recalculate next timer interrupt only when necessary")
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20220405191732.7438-3-anna-maria@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/time/timer.c