time: Add needed macros for timekeeping_inject_sleeptime64()
PATCH v5 1/4 time: Add needed macros for timekeeping_inject_sleeptime64()
From: Xunlei Pang <[email protected]>
timekeeping_inject_sleeptime64() is only used by RTC suspend/resume, so embrace it in RTC related macros.
---
v5 changes:
Remove CONFIG_RTC_CLASS.
kernel/time/timekeeping.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/time/timekeeping.c +2 -0
@@ -1125,6 +1125,7 @@ static void __timekeeping_inject_sleeptime(struct timekeeper *tk,tk_debug_account_sleep_time (delta); } +#if defined(CONFIG_PM_SLEEP ) && defined(CONFIG_RTC_HCTOSYS_DEVICE )/** * timekeeping_inject_sleeptime64 - Adds suspend interval to timeekeeping values * @delta: pointer to a timespec64 delta value
@@ -1162,6 +1163,7 @@ void timekeeping_inject_sleeptime64(struct timespec64 *delta)/* signal hrtimers about time change */ clock_was_set(); } +#endif /** * timekeeping_resume - Resumes the generic timekeeping subsystem.
Signature · 1 line
1.9.1
PATCH v5 2/4 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.
This patch also improves the name of timekeeping_suspend_time.
--- kernel/time/timekeeping.c | 50 ++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 22 deletions(-)
kernel/time/timekeeping.c +28 -22
@@ -1100,8 +1100,8 @@ void __init timekeeping_init(void)raw_spin_unlock_irqrestore (&timekeeper_lock, flags); } -/* time in seconds when suspend began */ -static struct timespec64 timekeeping_suspend_time; +/* time in seconds when suspend began for persistent clock */ +static struct timespec64 persistent_clock_suspendtime;/** * __timekeeping_inject_sleeptime - Internal function to add sleep interval
@@ -1229,8 +1229,9 @@ static void timekeeping_resume(void) ts_delta =ns_to_timespec64 (nsec); suspendtime_found = true; - }else if (timespec64_compare (&ts_new, &timekeeping_suspend_time) >0 ) { - ts_delta =timespec64_sub (ts_new, timekeeping_suspend_time); + }else if (timespec64_compare (&ts_new, + &persistent_clock_suspendtime) >0 ) { + ts_delta =timespec64_sub (ts_new, persistent_clock_suspendtime); suspendtime_found = true; }
@@ -1262,14 +1263,15 @@ static int timekeeping_suspend(void)struct timespec tmp;read_persistent_clock (&tmp); - timekeeping_suspend_time =timespec_to_timespec64 (tmp); + persistent_clock_suspendtime =timespec_to_timespec64 (tmp);/* * On some systems the persistent_clock can not be detected at * timekeeping_init by its return value, so if we see a valid * value returned, update the persistent_clock_exists flag. */ -if (timekeeping_suspend_time.tv_sec || timekeeping_suspend_time.tv_nsec) +if (persistent_clock_suspendtime.tv_sec || + persistent_clock_suspendtime.tv_nsec) persistent_clock_exist = true;raw_spin_lock_irqsave (&timekeeper_lock, flags);
@@ -1277,24 +1279,28 @@ static 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), + persistent_clock_suspendtime); + 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 */ + persistent_clock_suspendtime = +timespec64_add (persistent_clock_suspendtime, + delta_delta); + } }timekeeping_update (tk,TK_MIRROR );
Signature · 1 line
1.9.1
Re: [PATCH v5 2/4] time: Fix a bug in timekeeping_suspend() with no persistent clock
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.
This patch also improves the name of
timekeeping_suspend_time.
So re-reviewing this here. I really think the renaming here isn't an improvement. It does clarify that its related only to the persistent clock, but the resulting code is much uglier due to the 80col reformatting you've done.
Can we drop the rename, which should make the fix in this code more clear?
thanks
-john
PATCH v5 3/4 time: rtc: Don't bother into rtc_resume() for the nonstop clocksource
In reply to Xunlei PangFrom: 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.
---
v5 changes:
Rename persistent_clock_exist to persistent_clock_exists. Rename sleeptime_inject to sleeptime_injected. Place these two variables together.
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
132 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v5 4/4 rtc: Remove redundant rtc_valid_tm() from rtc_resume()
In reply to Xunlei PangFrom: Xunlei Pang <[email protected]>
rtc_read_time() has already judged valid tm by rtc_valid_tm(), so just remove it.
--- drivers/rtc/class.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/rtc/class.c +0 -4
@@ -117,10 +117,6 @@ static int rtc_resume(struct device *dev)return 0 ; } -if (rtc_valid_tm (&tm) !=0 ) { -pr_debug ("%s: bogus resume time\n" ,dev_name (&rtc->dev)); -return 0 ; - } new_rtc.tv_sec =rtc_tm_to_time64 (&tm); new_rtc.tv_nsec =0 ;
Signature · 1 line
1.9.1
Re: [PATCH v5 4/4] rtc: Remove redundant rtc_valid_tm() from rtc_resume()
Quoted 6 lines · Xunlei Pang
From: Xunlei Pang <[email protected]>
rtc_read_time()has already judged valid tm byrtc_valid_tm(), so just remove it.Signed-off-by Xunlei Pang <[email protected]>
I've queued this patch, but the two prior patches in this series I left out.
thanks
-john
Quoted 6 lines · Xunlei Pang
From: Xunlei Pang <[email protected]>
timekeeping_inject_sleeptime64()is only used by RTC suspend/resume, so embrace it in RTC related macros.Signed-off-by Xunlei Pang <[email protected]>
Queued this patch with an improved commit message.
thanks
-john