]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
timers/nohz: Switch to ONESHOT_STOPPED in the low-res handler when the tick is stopped
authorNicholas Piggin <npiggin@gmail.com>
Fri, 22 Apr 2022 14:14:46 +0000 (00:14 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Aug 2023 14:23:17 +0000 (16:23 +0200)
commit 62c1256d544747b38e77ca9b5bfe3a26f9592576 upstream.

When tick_nohz_stop_tick() stops the tick and high resolution timers are
disabled, then the clock event device is not put into ONESHOT_STOPPED
mode. This can lead to spurious timer interrupts with some clock event
device drivers that don't shut down entirely after firing.

Eliminate these by putting the device into ONESHOT_STOPPED mode at points
where it is not being reprogrammed. When there are no timers active, then
tick_program_event() with KTIME_MAX can be used to stop the device. When
there is a timer active, the device can be stopped at the next tick (any
new timer added by timers will reprogram the tick).

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20220422141446.915024-1-npiggin@gmail.com
Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/time/tick-sched.c

index bb51619c9b63a297ddc587828045353b3fb7cddc..fc79b04b594707d89f9ddfa0aea1882ad1c7315a 100644 (file)
@@ -884,6 +884,8 @@ static void tick_nohz_stop_tick(struct tick_sched *ts, int cpu)
        if (unlikely(expires == KTIME_MAX)) {
                if (ts->nohz_mode == NOHZ_MODE_HIGHRES)
                        hrtimer_cancel(&ts->sched_timer);
+               else
+                       tick_program_event(KTIME_MAX, 1);
                return;
        }
 
@@ -1274,9 +1276,15 @@ static void tick_nohz_handler(struct clock_event_device *dev)
        tick_sched_do_timer(ts, now);
        tick_sched_handle(ts, regs);
 
-       /* No need to reprogram if we are running tickless  */
-       if (unlikely(ts->tick_stopped))
+       if (unlikely(ts->tick_stopped)) {
+               /*
+                * The clockevent device is not reprogrammed, so change the
+                * clock event device to ONESHOT_STOPPED to avoid spurious
+                * interrupts on devices which might not be truly one shot.
+                */
+               tick_program_event(KTIME_MAX, 1);
                return;
+       }
 
        hrtimer_forward(&ts->sched_timer, now, TICK_NSEC);
        tick_program_event(hrtimer_get_expires(&ts->sched_timer), 1);