]> git.baikalelectronics.ru Git - kernel.git/commit
timekeeping: Ignore the bogus sleep time if pm_trace is enabled
authorChen Yu <yu.c.chen@intel.com>
Mon, 28 Nov 2016 22:35:19 +0000 (14:35 -0800)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 29 Nov 2016 17:02:58 +0000 (18:02 +0100)
commitc2871915aafde2325fc03f9c6f7bfe1e3d321f8a
tree1bb61c0113f26bbbd4308a5040904bdf8fa3eebc
parentb2d91e8a49fe35c2c6b8a69366ee8db145a6ac3c
timekeeping: Ignore the bogus sleep time if pm_trace is enabled

Power management suspend/resume tracing (ab)uses the RTC to store
suspend/resume information persistently. As a consequence the RTC value is
clobbered when timekeeping is resumed and tries to inject the sleep time.

Commit a425745e067b ("timekeeping: Cap array access in timekeeping_debug")
plugged a out of bounds array access in the timekeeping debug code which
was caused by the clobbered RTC value, but we still use the clobbered RTC
value for sleep time injection into kernel timekeeping, which will result
in random adjustments depending on the stored "hash" value.

To prevent this keep track of the RTC clobbering and ignore the invalid RTC
timestamp at resume. If the system resumed successfully clear the flag,
which marks the RTC as unusable, warn the user about the RTC clobber and
recommend to adjust the RTC with 'ntpdate' or 'rdate'.

[jstultz: Fixed up pr_warn formating, and implemented suggestions from Ingo]
[ tglx: Rewrote changelog ]

Originally-from: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Xunlei Pang <xlpang@redhat.com>
Cc: Len Brown <lenb@kernel.org>
Link: http://lkml.kernel.org/r/1480372524-15181-3-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/rtc.c
drivers/base/power/trace.c
drivers/rtc/rtc-cmos.c
include/linux/mc146818rtc.h
include/linux/pm-trace.h