summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAnna-Maria Behnsen <anna-maria@linutronix.de>2024-02-21 10:05:36 +0100
committerThomas Gleixner <tglx@linutronix.de>2024-02-22 17:52:31 +0100
commitaf68cb3fc736e13e66fc8202ea94c3aff7299f39 (patch)
treeeb9d4f3b152e3945bb69eb154b2e4190b7f5e9e7 /kernel
parenttimers: Make sure TIMER_PINNED flag is set in add_timer_on() (diff)
downloadlinux-af68cb3fc736e13e66fc8202ea94c3aff7299f39.tar.xz
linux-af68cb3fc736e13e66fc8202ea94c3aff7299f39.zip
timers: Simplify code in run_local_timers()
The logic for raising a softirq the way it is implemented right now, is readable for two timer bases. When increasing the number of timer bases, code gets harder to read. With the introduction of the timer migration hierarchy, there will be three timer bases. Therefore restructure the code to use a loop. No functional change. 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/20240221090548.36600-9-anna-maria@linutronix.de
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/timer.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 121f5b99ea21..9c8443d4fe33 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -2180,16 +2180,14 @@ static void run_local_timers(void)
struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
hrtimer_run_queues();
- /* Raise the softirq only if required. */
- if (time_before(jiffies, base->next_expiry)) {
- if (!IS_ENABLED(CONFIG_NO_HZ_COMMON))
- return;
- /* CPU is awake, so check the deferrable base. */
- base++;
- if (time_before(jiffies, base->next_expiry))
+
+ for (int i = 0; i < NR_BASES; i++, base++) {
+ /* Raise the softirq only if required. */
+ if (time_after_eq(jiffies, base->next_expiry)) {
+ raise_softirq(TIMER_SOFTIRQ);
return;
+ }
}
- raise_softirq(TIMER_SOFTIRQ);
}
/*