time: Fix a bug in timekeeping_suspend() with no persistent clock
PATCH 1/2 time: Fix a bug in timekeeping_suspend() with no persistent clock
From: Xunlei Pang <[email protected]>
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.
--- kernel/time/timekeeping.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-)
kernel/time/timekeeping.c +19 -17
@@ -1127,7 +1127,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;/**
@@ -1304,24 +1304,26 @@ int timekeeping_suspend(void)timekeeping_forward_now (tk); timekeeping_suspended =1 ; -/* -* To avoid drift caused by repeated suspend/resumes, -* which each can add ~1 second drift error, -* try to compensate so the difference in system time -* and persistent_clock time stays close to constant. -*/ - delta =timespec64_sub (tk_xtime (tk), timekeeping_suspend_time); - delta_delta =timespec64_sub (delta, old_delta); -if (abs (delta_delta.tv_sec) >=2 ) { +if (has_persistent_clock ()) {/* -* if delta_delta is too large, assume time correction -* has occured and set old_delta to the current delta. +* To avoid drift caused by repeated suspend/resumes, +* which each can add ~1 second drift error, +* try to compensate so the difference in system time +* and persistent_clock time stays close to constant. */ - old_delta = delta; - }else { -/* Otherwise try to adjust old_system to compensate */ - timekeeping_suspend_time = -timespec64_add (timekeeping_suspend_time, delta_delta); + delta =timespec64_sub (tk_xtime (tk), timekeeping_suspend_time); + delta_delta =timespec64_sub (delta, old_delta); +if (abs (delta_delta.tv_sec) >=2 ) { +/* +* if delta_delta is too large, assume time correction +* has occurred and set old_delta to the current delta. +*/ + old_delta = delta; + }else { +/* Otherwise try to adjust old_system to compensate */ + timekeeping_suspend_time = +timespec64_add (timekeeping_suspend_time, delta_delta); + } }timekeeping_update (tk,TK_MIRROR );
Signature · 1 line
1.9.1
PATCH 2/2 time: rtc: Don't bother into rtc_resume() for the nonstop clocksource
From: Xunlei Pang <[email protected]>
If a system does not provide a persistent_clock(), the time will be updated on resume by rtc_resume(). With the addition of the non-stop clocksources for suspend timing, those systems set the time on resume in timekeeping_resume(), but may not provide a valid persistent_clock().
This results in the rtc_resume() logic thinking no one has set the time and it then will over-write the suspend time again, which is not necessary and only increases clock error.
So, fix this for rtc_resume().
This patch also improves the name of persistent_clock_exist to make it more grammatical.
--- drivers/rtc/class.c | 4 +-- include/linux/timekeeping.h | 9 ++---- kernel/time/timekeeping.c | 68 +++++++++++++++++++++++++++++++++------------ 3 files changed, 55 insertions(+), 26 deletions(-)
drivers/rtc/class.c +2 -2
@@ -55,7 +55,7 @@ static int rtc_suspend(struct device *dev)struct timespec64 delta, delta_delta;int err; -if (has_persistent_clock ()) +if (timekeeping_rtc_skipsuspend ())return 0 ;if (strcmp (dev_name (&rtc->dev),CONFIG_RTC_HCTOSYS_DEVICE ) !=0 )
@@ -102,7 +102,7 @@ static int rtc_resume(struct device *dev)struct timespec64 sleep_time;int err; -if (has_persistent_clock ()) +if (timekeeping_rtc_skipresume ())return 0 ; rtc_hctosys_ret = -ENODEV ;
include/linux/timekeeping.h +3 -6
@@ -242,6 +242,9 @@ static inline void timekeeping_clocktai(struct timespec *ts)/* * RTC specific */ +extern bool timekeeping_rtc_skipsuspend (void ); +extern bool timekeeping_rtc_skipresume (void ); +extern void timekeeping_inject_sleeptime64 (struct timespec64 *delta);/*
@@ -253,14 +256,8 @@ extern void getnstime_raw_and_real(struct timespec *ts_raw,/* * Persistent clock related interfaces */ -extern bool persistent_clock_exist;extern int persistent_clock_is_local; -static inline bool has_persistent_clock (void ) -{ -return persistent_clock_exist; -} -extern void read_persistent_clock (struct timespec *ts);extern void read_boot_clock (struct timespec *ts);extern int update_persistent_clock (struct timespec now);
kernel/time/timekeeping.c +50 -18
131 lines not on this page · raw message
Signature · 1 line
1.9.1
Quoted 15 lines · Xunlei Pang
From: Xunlei Pang <[email protected]>
When there's no persistent clock, normally
timekeeping_suspend_timeshould always be zero, but this can break intimekeeping_suspend().At T1, there was a system suspend, so
old_deltawas 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 negativedelta_delta, resulting in a negativetimekeeping_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.
Quoted 5 lines
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.
Signed-off-by Xunlei Pang <[email protected]>
Thanks for resending this with the changes, Xunlei. I've queued these two patches for 4.1
thanks
-john