4 files changed, 34 insertions, 3 deletions

diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 49edc1c4f3e6..099572ca4a8f 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -419,6 +419,19 @@ void tick_suspend_local(void)
         clockevents_shutdown(td->evtdev);
 }
 
+static void tick_forward_next_period(void)
+{
+        ktime_t delta, now = ktime_get();
+        u64 n;
+
+        delta = ktime_sub(now, tick_next_period);
+        n = ktime_divns(delta, tick_period);
+        tick_next_period += n * tick_period;
+        if (tick_next_period < now)
+                tick_next_period += tick_period;
+        tick_sched_forward_next_period();
+}
+
 /**
  * tick_resume_local - Resume the local tick device
  *
@@ -431,6 +444,8 @@ void tick_resume_local(void)
         struct tick_device *td = this_cpu_ptr(&tick_cpu_device);
         bool broadcast = tick_resume_check_broadcast();
 
+        tick_forward_next_period();
+
         clockevents_tick_resume(td->evtdev);
         if (!broadcast) {
                 if (td->mode == TICKDEV_MODE_PERIODIC)
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
index e277284c2831..21efab7485ca 100644
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
@@ -141,6 +141,12 @@ static inline void tick_check_oneshot_broadcast_this_cpu(void) { }
 static inline bool tick_broadcast_oneshot_available(void) { return tick_oneshot_possible(); }
 #endif /* !(BROADCAST && ONESHOT) */
 
+#if defined(CONFIG_NO_HZ_COMMON) || defined(CONFIG_HIGH_RES_TIMERS)
+extern void tick_sched_forward_next_period(void);
+#else
+static inline void tick_sched_forward_next_period(void) { }
+#endif
+
 /* NO_HZ_FULL internal */
 #ifdef CONFIG_NO_HZ_FULL
 extern void tick_nohz_init(void);
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 29a5733eff83..f53e37b5d248 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -52,6 +52,15 @@ struct tick_sched *tick_get_tick_sched(int cpu)
 static ktime_t last_jiffies_update;
 
 /*
+ * Called after resume. Make sure that jiffies are not fast forwarded due to
+ * clock monotonic being forwarded by the suspended time.
+ */
+void tick_sched_forward_next_period(void)
+{
+        last_jiffies_update = tick_next_period;
+}
+
+/*
  * Must be called with interrupts disabled !
  */
 static void tick_do_update_jiffies64(ktime_t now)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index a2b7f583e64e..b509fe7acd64 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -138,7 +138,9 @@ static void tk_set_wall_to_mono(struct timekeeper *tk, struct timespec64 wtm)
 
 static inline void tk_update_sleep_time(struct timekeeper *tk, ktime_t delta)
 {
-        tk->offs_boot = ktime_add(tk->offs_boot, delta);
+        /* Update both bases so mono and raw stay coupled. */
+        tk->tkr_mono.base += delta;
+        tk->tkr_raw.base += delta;
 
         /* Accumulate time spent in suspend */
         tk->time_suspended += delta;
@@ -1622,7 +1624,6 @@ static void __timekeeping_inject_sleeptime(struct timekeeper *tk,
                 return;
         }
         tk_xtime_add(tk, delta);
-        tk_set_wall_to_mono(tk, timespec64_sub(tk->wall_to_monotonic, *delta));
         tk_update_sleep_time(tk, timespec64_to_ktime(*delta));
         tk_debug_account_sleep_time(delta);
 }
@@ -2155,7 +2156,7 @@ out:
 void getboottime64(struct timespec64 *ts)
 {
         struct timekeeper *tk = &tk_core.timekeeper;
-        ktime_t t = ktime_sub(tk->offs_real, tk->offs_boot);
+        ktime_t t = ktime_sub(tk->offs_real, tk->time_suspended);
 
         *ts = ktime_to_timespec64(t);
 }