From: Frederic Weisbecker <>
Date: Tue, 5 Apr 2022 03:07:52 +0200
Subject: [PATCH] tick: Fix timer storm since introduction of timersd

If timers are pending while the tick is reprogrammed on nohz_mode, the
next expiry is not armed to fire now, it is delayed one jiffy forward
instead so as not to raise an inextinguishable timer storm with such

1) IRQ triggers and queue a timer
2) ksoftirqd() is woken up
3) IRQ tail: timer is reprogrammed to fire now
4) IRQ exit
5) TIMER interrupt
6) goto 3)

...all that until we finally reach ksoftirqd.

Unfortunately we are checking the wrong softirq vector bitmask since
timersd kthread has split from ksoftirqd. Timers now have their own
vector state field that must be checked separately. As a result, the
old timer storm is back. This shows up early on boot with extremely long

	[  333.004807] initcall dquot_init+0x0/0x111 returned 0 after 323822879 usecs

and the cause is uncovered with the right trace events showing just
10 microseconds between ticks (~100 000 Hz):

|swapper/-1 1dn.h111 60818582us : hrtimer_expire_entry: hrtimer=00000000e0ef0f6b function=tick_sched_timer now=60415486608
|swapper/-1 1dn.h111 60818592us : hrtimer_expire_entry: hrtimer=00000000e0ef0f6b function=tick_sched_timer now=60415496082
|swapper/-1 1dn.h111 60818601us : hrtimer_expire_entry: hrtimer=00000000e0ef0f6b function=tick_sched_timer now=60415505550

Fix this by checking the right timer vector state from the nohz code.

Signed-off-by: Frederic Weisbecker <>
Cc: Mel Gorman <>
Cc: Sebastian Andrzej Siewior <>
Cc: Thomas Gleixner <>
Signed-off-by: Sebastian Andrzej Siewior <>
 include/linux/interrupt.h |   12 ++++++++++++
 kernel/softirq.c          |    7 +------
 kernel/time/tick-sched.c  |    2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

@ include/linux/interrupt.h:610 @ extern void raise_softirq(unsigned int n
 DECLARE_PER_CPU(struct task_struct *, timersd);
+DECLARE_PER_CPU(unsigned long, pending_timer_softirq);
 extern void raise_timer_softirq(void);
 extern void raise_hrtimer_softirq(void);
+static inline unsigned int local_pending_timers(void)
+        return __this_cpu_read(pending_timer_softirq);
 static inline void raise_timer_softirq(void)
@ include/linux/interrupt.h:630 @ static inline void raise_hrtimer_softirq
+static inline unsigned int local_pending_timers(void)
+        return local_softirq_pending();
 DECLARE_PER_CPU(struct task_struct *, ksoftirqd);
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@ include/linux/interrupt.h:642 @ static inline void tick_irq_exit(void)
 DEFINE_PER_CPU(struct task_struct *, timersd);
-static DEFINE_PER_CPU(unsigned long, pending_timer_softirq);
-static unsigned int local_pending_timers(void)
-        return __this_cpu_read(pending_timer_softirq);
+DEFINE_PER_CPU(unsigned long, pending_timer_softirq);
 static void wake_timersd(void)
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@ include/linux/interrupt.h:782 @ static void tick_nohz_restart(struct tic
 static inline bool local_timer_softirq_pending(void)
-	return local_softirq_pending() & BIT(TIMER_SOFTIRQ);
+	return local_pending_timers() & BIT(TIMER_SOFTIRQ);
 static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu)