diff options
| author |   Frederic Weisbecker <frederic@kernel.org> | 2020-07-17 16:05:47 +0200 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2020-07-17 21:55:23 +0200 |
| commit | 90d52f65f303091be17b5f4ffab7090b2064b4a1 (patch) | |
| tree | 8071a55734eda6a2f45983d9ccdb6af97865bd84 /kernel/time/timer.c | |
| parent | timers: Always keep track of next expiry (diff) | |
| download | linux-dev-90d52f65f303091be17b5f4ffab7090b2064b4a1.tar.xz linux-dev-90d52f65f303091be17b5f4ffab7090b2064b4a1.zip | |
timers: Reuse next expiry cache after nohz exit
Now that the next expiry it tracked unconditionally when a timer is added,
this information can be reused on a tick firing after exiting nohz.
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Juri Lelli <juri.lelli@redhat.com>
Link: https://lkml.kernel.org/r/20200717140551.29076-9-frederic@kernel.org
Diffstat (limited to 'kernel/time/timer.c')
| -rw-r--r-- | kernel/time/timer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 76fd9644638b..13f48ee708aa 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1706,13 +1706,11 @@ static int collect_expired_timers(struct timer_base *base, * the next expiring timer. */ if ((long)(now - base->clk) > 2) { - unsigned long next = __next_timer_interrupt(base); - /* * If the next timer is ahead of time forward to current * jiffies, otherwise forward to the next expiry time: */ - if (time_after(next, now)) { + if (time_after(base->next_expiry, now)) { /* * The call site will increment base->clk and then * terminate the expiry loop immediately. @@ -1720,7 +1718,7 @@ static int collect_expired_timers(struct timer_base *base, base->clk = now; return 0; } - base->clk = next; + base->clk = base->next_expiry; } return __collect_expired_timers(base, heads); } |