timekeeping: Ignore the bogus sleep time if pm_trace is enabled
Subsystems (6)
RFC PATCH v7 1/1 timekeeping: Ignore the bogus sleep time if pm_trace is enabled
Previously we encountered some memory overflow issues due to the bogus sleep time brought by inconsistent rtc, which is triggered when pm_trace is enabled, and we have fixed it in recent kernel. However it's improper in the first place to call __timekeeping_inject_sleeptime() in case that pm_trace is enabled simply because that "hash" time value will wreckage the timekeeping subsystem.
This patch is originally written by Thomas, which would bypass the bogus rtc interval when pm_trace is enabled.
Meanwhile, if system succeed to resume back with pm_trace set, the users are warned to adjust the bogus rtc either by ntp-date or rdate, by resetting pm_trace_rtc_abused to false, otherwise above tools might not work as expected.
Originally-from: Thomas Gleixner <[email protected]>
--- arch/x86/kernel/rtc.c | 9 +++++++++ drivers/base/power/trace.c | 27 +++++++++++++++++++++++++++ drivers/rtc/rtc-cmos.c | 7 +++++++ include/linux/mc146818rtc.h | 1 + include/linux/pm-trace.h | 9 ++++++++- 5 files changed, 52 insertions(+), 1 deletion(-)
arch/x86/kernel/rtc.c +9 -0
@@ -64,6 +64,15 @@ void mach_get_cmos_time(struct timespec *now)unsigned int status, year, mon, day, hour, min, sec, century =0 ;unsigned long flags; +/* +* If pm trace abused the RTC as storage set the timespec to 0 +* which tells the caller that this RTC value is bogus. +*/ +if (!pm_trace_rtc_valid ()) { + now->tv_sec = now->tv_nsec =0 ; +return ; + } +spin_lock_irqsave (&rtc_lock, flags);/*
drivers/base/power/trace.c +27 -0
@@ -10,6 +10,7 @@#include <linux/pm-trace.h> #include <linux/export.h> #include <linux/rtc.h> +#include <linux/suspend.h> #include <linux/mc146818rtc.h>
@@ -74,6 +75,9 @@#define DEVSEED (7919) +bool pm_trace_rtc_abused__read_mostly ; +EXPORT_SYMBOL (pm_trace_rtc_abused); +static unsigned int dev_hash_value;static int set_magic_time (unsigned int user,unsigned int file,unsigned int device)
@@ -104,6 +108,7 @@ static int set_magic_time(unsigned int user, unsigned int file, unsigned int dev time.tm_min = (n %20 ) *3 ; n /=20 ;mc146818_set_time (&time); + pm_trace_rtc_abused = true;return n ?-1 :0 ; }
@@ -238,10 +243,32 @@ int show_trace_dev_match(char *buf, size_t size)device_pm_unlock ();return ret; } +static int pm_trace_notify (struct notifier_block *nb, +unsigned long mode,void *_unused) +{ +switch (mode) { +case PM_POST_HIBERNATION : +case PM_POST_SUSPEND : +if (pm_trace_rtc_abused) { + pm_trace_rtc_abused = false; +pr_warn ("Possible incorrect RTC due to pm_trace," +"please use ntp-date or rdate to reset.\n" ); + } +break ; +default : +break ; + } +return 0 ; +} + +static struct notifier_block pm_trace_nb = { + .notifier_call = pm_trace_notify, +};static int early_resume_init (void ) { hash_value_early_read =read_magic_time (); +register_pm_notifier (&pm_trace_nb);return 0 ; }
drivers/rtc/rtc-cmos.c +7 -0
@@ -191,6 +191,13 @@ static inline void cmos_write_bank2(unsigned char val, unsigned char addr)static int cmos_read_time (struct device *dev,struct rtc_time *t) { +/* +* If pmtrace abused the RTC for storage tell the caller that it is +* unusable. +*/ +if (!pm_trace_rtc_valid ()) +return -EIO ; +/* REVISIT: if the clock has a "century" register, use * that instead of the heuristic in mc146818_get_time(). * That'll make Y3K compatility (year > 2070) easy!
include/linux/mc146818rtc.h +1 -0
@@ -16,6 +16,7 @@#include <asm/mc146818rtc.h> /* register access macros */ #include <linux/bcd.h> #include <linux/delay.h> +#include <linux/pm-trace.h> #ifdef __KERNEL__#include <linux/spinlock.h> /* spinlock_t */
include/linux/pm-trace.h +8 -1
@@ -1,11 +1,17 @@ #ifndef PM_TRACE_H #define PM_TRACE_H +#include <linux/types.h> #ifdef CONFIG_PM_TRACE #include <asm/pm-trace.h> -#include <linux/types.h> extern int pm_trace_enabled; +extern bool pm_trace_rtc_abused; + +static inline bool pm_trace_rtc_valid(void) +{ + return !pm_trace_rtc_abused; +} static inline int pm_trace_is_enabled(void) {
@@ -24,6 +30,7 @@ extern int show_trace_dev_match(char *buf, size_t size);#else +static inline bool pm_trace_rtc_valid (void ) {return true; }static inline int pm_trace_is_enabled (void ) {return 0 ; }#define TRACE_DEVICE (dev) do { } while (0)
Signature · 1 line
2.7.4
Quoted 15 lines · Chen Yu
Previously we encountered some memory overflow issues due to the bogus sleep time brought by inconsistent rtc, which is triggered when
pm_traceis enabled, and we have fixed it in recent kernel. However it's improper in the first place to call__timekeeping_inject_sleeptime()in case thatpm_traceis enabled simply because that "hash" time value will wreckage the timekeeping subsystem.This patch is originally written by Thomas, which would bypass the bogus rtc interval when
pm_traceis enabled.
Meanwhile, if system succeed to resume back withpm_traceset, the users are warned to adjust the bogus rtc either by ntp-date or rdate, by resettingpm_trace_rtc_abusedto false, otherwise above tools might not work as expected.
Quoted 7 lines
Originally-from: Thomas Gleixner <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: John Stultz <[email protected]>
Cc: Xunlei Pang <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Len Brown <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Signature · 12 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -- You received this message because you are subscribed to "rtc-linux". Membership options at http://groups.google.com/group/rtc-linux . Please read http://groups.google.com/group/rtc-linux/web/checklist before submitting a driver. --- You received this message because you are subscribed to the Google Groups "rtc-linux" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
Quoted 16 lines · Chen Yu
Previously we encountered some memory overflow issues due to the bogus sleep time brought by inconsistent rtc, which is triggered when
pm_traceis enabled, and we have fixed it in recent kernel. However it's improper in the first place to call__timekeeping_inject_sleeptime()in case thatpm_traceis enabled simply because that "hash" time value will wreckage the timekeeping subsystem.This patch is originally written by Thomas, which would bypass the bogus rtc interval when
pm_traceis enabled.
Meanwhile, if system succeed to resume back withpm_traceset, the users are warned to adjust the bogus rtc either by ntp-date or rdate, by resettingpm_trace_rtc_abusedto false, otherwise above tools might not work as expected.Originally-from: Thomas Gleixner <[email protected]>
Quoted 9 lines
Cc "Rafael J. Wysocki" <[email protected]>Cc John Stultz <[email protected]>Cc Xunlei Pang <[email protected]>Cc Ingo Molnar <[email protected]>Cc Len Brown <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Pavel Machek <[email protected]>Cc Thomas Gleixner <[email protected]>Signed-off-by Chen Yu <[email protected]>
Quoted 16 lines · Chen Yu
Previously we encountered some memory overflow issues due to the bogus sleep time brought by inconsistent rtc, which is triggered when
pm_traceis enabled, and we have fixed it in recent kernel. However it's improper in the first place to call__timekeeping_inject_sleeptime()in case thatpm_traceis enabled simply because that "hash" time value will wreckage the timekeeping subsystem.This patch is originally written by Thomas, which would bypass the bogus rtc interval when
pm_traceis enabled.
Meanwhile, if system succeed to resume back withpm_traceset, the users are warned to adjust the bogus rtc either by ntp-date or rdate, by resettingpm_trace_rtc_abusedto false, otherwise above tools might not work as expected.Originally-from: Thomas Gleixner <[email protected]>
Quoted 9 lines
Cc "Rafael J. Wysocki" <[email protected]>Cc John Stultz <[email protected]>Cc Xunlei Pang <[email protected]>Cc Ingo Molnar <[email protected]>Cc Len Brown <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Pavel Machek <[email protected]>Cc Thomas Gleixner <[email protected]>Signed-off-by Chen Yu <[email protected]>
Looks ok to me. I'm queueing it up for testing. If no one objects (and I don't see any issues) I'll merge it to my tree and push it to -tip through Thomas.
thanks
-john
Quoted 28 lines · John Stultz
Quoted 16 lines · Chen Yu
Previously we encountered some memory overflow issues due to the bogus sleep time brought by inconsistent rtc, which is triggered when
pm_traceis enabled, and we have fixed it in recent kernel. However it's improper in the first place to call__timekeeping_inject_sleeptime()in case thatpm_traceis enabled simply because that "hash" time value will wreckage the timekeeping subsystem.This patch is originally written by Thomas, which would bypass the bogus rtc interval when
pm_traceis enabled.
Meanwhile, if system succeed to resume back withpm_traceset, the users are warned to adjust the bogus rtc either by ntp-date or rdate, by resettingpm_trace_rtc_abusedto false, otherwise above tools might not work as expected.Originally-from: Thomas Gleixner <[email protected]>
Quoted 9 lines
Cc "Rafael J. Wysocki" <[email protected]>Cc John Stultz <[email protected]>Cc Xunlei Pang <[email protected]>Cc Ingo Molnar <[email protected]>Cc Len Brown <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Pavel Machek <[email protected]>Cc Thomas Gleixner <[email protected]>Signed-off-by Chen Yu <[email protected]>
Quoted 3 lines
Looks ok to me. I'm queueing it up for testing. If no one objects (and I don't see any issues) I'll merge it to my tree and push it to -tip through Thomas.
No objections here, thanks John!
Cheers,
Rafael
Signature · 8 lines
You received this message because you are subscribed to "rtc-linux". Membership options at http://groups.google.com/group/rtc-linux . Please read http://groups.google.com/group/rtc-linux/web/checklist before submitting a driver. --- You received this message because you are subscribed to the Google Groups "rtc-linux" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.