Commit 406bea59 authored Apr 01, 2015 by Xunlei Pang Committed by Gerrit - the friendly Code Review server Aug 02, 2017

time: Fix a bug in timekeeping_suspend() with no persistent clock



When there's no persistent clock, normally
timekeeping_suspend_time should always be zero, but this can
break in timekeeping_suspend().

At T1, there was a system suspend, so old_delta was assigned T1.
After some time, one time adjustment happened, and xtime got the
value of T1-dt(0s<dt<2s). Then, there comes another system
suspend soon after this adjustment, obviously we will get a
small negative delta_delta, resulting in a negative
timekeeping_suspend_time.

This is problematic, when doing timekeeping_resume() if there is
no nonstop clocksource for example, it will hit the else leg and
inject the improper sleeptime which is the wrong logic.

So, we can solve this problem by only doing delta related code
when the persistent clock is existent. Actually the code only
makes sense for persistent clock cases.

Change-Id: Iff552ae831615940e0ab8871e927af75e5f77dcf
Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1427945681-29972-18-git-send-email-john.stultz@linaro.org


Signed-off-by: Ingo Molnar <mingo@kernel.org>
Git-commit: 264bb3f79f2a465477cdcd2f0554e21aedc443a3
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>

parent e0b299f3

kernel/time/timekeeping.c

+19 −17

Original line number	Diff line number	Diff line
		@@ -1031,7 +1031,7 @@ void __init timekeeping_init(void)
		raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
		}

		/* time in seconds when suspend began */
		/* time in seconds when suspend began for persistent clock */
		static struct timespec64 timekeeping_suspend_time;

		/**
		@@ -1210,6 +1210,7 @@ static int timekeeping_suspend(void)
		timekeeping_forward_now(tk);
		timekeeping_suspended = 1;

		if (has_persistent_clock()) {
		/*
		* To avoid drift caused by repeated suspend/resumes,
		* which each can add ~1 second drift error,
		@@ -1221,7 +1222,7 @@ static int timekeeping_suspend(void)
		if (abs(delta_delta.tv_sec) >= 2) {
		/*
		* if delta_delta is too large, assume time correction
		* has occured and set old_delta to the current delta.
		* has occurred and set old_delta to the current delta.
		*/
		old_delta = delta;
		} else {
		@@ -1229,6 +1230,7 @@ static int timekeeping_suspend(void)
		timekeeping_suspend_time =
		timespec64_add(timekeeping_suspend_time, delta_delta);
		}
		}

		timekeeping_update(tk, TK_MIRROR);
		write_seqcount_end(&tk_core.seq);