From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>,
Alan Cox <alan@linux.intel.com>,
"Li, Aubrey" <aubrey.li@linux.intel.com>,
LKML <linux-kernel@vger.kernel.org>,
Linux PM list <linux-pm@vger.kernel.org>,
ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
Kristen Carlson Accardi <kristen@linux.intel.com>,
John Stultz <john.stultz@linaro.org>,
Len Brown <len.brown@intel.com>
Subject: [PATCH 3/6] timekeeping: Make it safe to use the fast timekeeper while suspended
Date: Wed, 11 Feb 2015 05:03:10 +0100 [thread overview]
Message-ID: <1521825.MkZ1sG1M8S@vostro.rjw.lan> (raw)
In-Reply-To: <8292243.ibkmfVtXac@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Theoretically, ktime_get_mono_fast_ns() may be executed after
timekeeping has been suspended (or before it is resumed) which
in turn may lead to undefined behavior, for example, when the
clocksource read from timekeeping_get_ns() called by it is
not accessible at that time.
Prevent that from happening by setting up a dummy readout base for
the fast timekeeper during timekeeping_suspend() such that it will
always return the same number of cycles.
After the last timekeeping_update() in timekeeping_suspend() the
clocksource is read and the result is stored as cycles_at_suspend.
The readout base from the current timekeeper is copied onto the
dummy and the ->read pointer of the dummy is set to a routine
unconditionally returning cycles_at_suspend. Next, the dummy is
passed to update_fast_timekeeper().
Then, ktime_get_mono_fast_ns() will work until the subsequent
timekeeping_resume() and the proper readout base for the fast
timekeeper will be restored by the timekeeping_update() called
right after clearing timekeeping_suspended.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
kernel/time/timekeeping.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
Index: linux-pm/kernel/time/timekeeping.c
===================================================================
--- linux-pm.orig/kernel/time/timekeeping.c
+++ linux-pm/kernel/time/timekeeping.c
@@ -1249,9 +1249,23 @@ static void timekeeping_resume(void)
hrtimers_resume();
}
+/*
+ * Dummy readout base and suspend-time cycles value for the fast timekeeper to
+ * work in a consistent way after timekeeping has been suspended if the core
+ * timekeeper clocksource is not suspend-nonstop.
+ */
+static struct tk_read_base tkr_dummy;
+static cycle_t cycles_at_suspend;
+
+static cycle_t dummy_clock_read(struct clocksource *cs)
+{
+ return cycles_at_suspend;
+}
+
static int timekeeping_suspend(void)
{
struct timekeeper *tk = &tk_core.timekeeper;
+ struct clocksource *clock = tk->tkr.clock;
unsigned long flags;
struct timespec64 delta, delta_delta;
static struct timespec64 old_delta;
@@ -1294,6 +1308,14 @@ static int timekeeping_suspend(void)
}
timekeeping_update(tk, TK_MIRROR);
+
+ if (!(clock->flags & CLOCK_SOURCE_SUSPEND_NONSTOP)) {
+ memcpy(&tkr_dummy, &tk->tkr, sizeof(tkr_dummy));
+ cycles_at_suspend = tk->tkr.read(clock);
+ tkr_dummy.read = dummy_clock_read;
+ update_fast_timekeeper(&tkr_dummy);
+ }
+
write_seqcount_end(&tk_core.seq);
raw_spin_unlock_irqrestore(&timekeeper_lock, flags);
next prev parent reply other threads:[~2015-02-11 4:03 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-11 4:00 [PATCH 0/6] PM / sleep: Support for quiescing timers during suspend-to-idle Rafael J. Wysocki
2015-02-11 4:01 ` [PATCH 1/6] PM / sleep: Re-implement suspend-to-idle handling Rafael J. Wysocki
2015-02-12 13:14 ` Peter Zijlstra
2015-02-12 16:18 ` Rafael J. Wysocki
2015-02-12 22:33 ` [Update][PATCH 1/6 v2] " Rafael J. Wysocki
2015-02-11 4:01 ` [PATCH 2/6] timekeeping: Pass readout base to update_fast_timekeeper() Rafael J. Wysocki
2015-02-13 0:29 ` John Stultz
2015-02-11 4:03 ` Rafael J. Wysocki [this message]
2015-02-13 0:53 ` [PATCH 3/6] timekeeping: Make it safe to use the fast timekeeper while suspended John Stultz
2015-02-13 2:03 ` Rafael J. Wysocki
2015-02-13 2:59 ` Travis
2015-02-13 9:03 ` John Stultz
2015-02-13 14:32 ` Rafael J. Wysocki
2015-02-14 17:30 ` John Stultz
2015-02-11 4:03 ` [PATCH 4/6] PM / sleep: Make it possible to quiesce timers during suspend-to-idle Rafael J. Wysocki
2015-02-12 13:24 ` Peter Zijlstra
2015-02-12 16:19 ` Rafael J. Wysocki
2015-02-12 22:36 ` [Update][PATCH 4/6 v2] " Rafael J. Wysocki
2015-02-11 4:04 ` [PATCH 5/6] intel_idle: Add ->enter_freeze callbacks Rafael J. Wysocki
2015-02-12 13:26 ` Peter Zijlstra
2015-02-12 16:24 ` Rafael J. Wysocki
2015-02-12 16:25 ` Peter Zijlstra
2015-03-04 23:50 ` Li, Aubrey
2015-03-05 0:18 ` Rafael J. Wysocki
2015-03-05 0:09 ` Li, Aubrey
2015-02-11 4:04 ` [PATCH 6/6] ACPI / idle: Implement ->enter_freeze callback routine Rafael J. Wysocki
2015-02-13 8:13 ` [PATCH 0/6] PM / sleep: Support for quiescing timers during suspend-to-idle Peter Zijlstra
2015-02-13 14:29 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1521825.MkZ1sG1M8S@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=alan@linux.intel.com \
--cc=aubrey.li@linux.intel.com \
--cc=john.stultz@linaro.org \
--cc=kristen@linux.intel.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox