diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-13 08:49:02 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@rjwysocki.net> | 2015-02-15 13:39:40 -0500 |
commit | 060407aed56c00960c9b5f70f5d19b2823adffd7 (patch) | |
tree | 1a3e285bb6af775bfd75e4b5143548687d773861 /kernel | |
parent | affe3e85ae78507cc953f3f700e0644e50844cff (diff) |
timekeeping: Make it safe to use the fast timekeeper while suspended
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>
Acked-by: John Stultz <john.stultz@linaro.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/time/timekeeping.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index abf08f4366c1..aef5dc722abf 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -332,6 +332,35 @@ u64 notrace ktime_get_mono_fast_ns(void) | |||
332 | } | 332 | } |
333 | EXPORT_SYMBOL_GPL(ktime_get_mono_fast_ns); | 333 | EXPORT_SYMBOL_GPL(ktime_get_mono_fast_ns); |
334 | 334 | ||
335 | /* Suspend-time cycles value for halted fast timekeeper. */ | ||
336 | static cycle_t cycles_at_suspend; | ||
337 | |||
338 | static cycle_t dummy_clock_read(struct clocksource *cs) | ||
339 | { | ||
340 | return cycles_at_suspend; | ||
341 | } | ||
342 | |||
343 | /** | ||
344 | * halt_fast_timekeeper - Prevent fast timekeeper from accessing clocksource. | ||
345 | * @tk: Timekeeper to snapshot. | ||
346 | * | ||
347 | * It generally is unsafe to access the clocksource after timekeeping has been | ||
348 | * suspended, so take a snapshot of the readout base of @tk and use it as the | ||
349 | * fast timekeeper's readout base while suspended. It will return the same | ||
350 | * number of cycles every time until timekeeping is resumed at which time the | ||
351 | * proper readout base for the fast timekeeper will be restored automatically. | ||
352 | */ | ||
353 | static void halt_fast_timekeeper(struct timekeeper *tk) | ||
354 | { | ||
355 | static struct tk_read_base tkr_dummy; | ||
356 | struct tk_read_base *tkr = &tk->tkr; | ||
357 | |||
358 | memcpy(&tkr_dummy, tkr, sizeof(tkr_dummy)); | ||
359 | cycles_at_suspend = tkr->read(tkr->clock); | ||
360 | tkr_dummy.read = dummy_clock_read; | ||
361 | update_fast_timekeeper(&tkr_dummy); | ||
362 | } | ||
363 | |||
335 | #ifdef CONFIG_GENERIC_TIME_VSYSCALL_OLD | 364 | #ifdef CONFIG_GENERIC_TIME_VSYSCALL_OLD |
336 | 365 | ||
337 | static inline void update_vsyscall(struct timekeeper *tk) | 366 | static inline void update_vsyscall(struct timekeeper *tk) |
@@ -1294,6 +1323,7 @@ static int timekeeping_suspend(void) | |||
1294 | } | 1323 | } |
1295 | 1324 | ||
1296 | timekeeping_update(tk, TK_MIRROR); | 1325 | timekeeping_update(tk, TK_MIRROR); |
1326 | halt_fast_timekeeper(tk); | ||
1297 | write_seqcount_end(&tk_core.seq); | 1327 | write_seqcount_end(&tk_core.seq); |
1298 | raw_spin_unlock_irqrestore(&timekeeper_lock, flags); | 1328 | raw_spin_unlock_irqrestore(&timekeeper_lock, flags); |
1299 | 1329 | ||