]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
sched_clock: Avoid corrupting hrtimer tree during suspend
authorStephen Boyd <sboyd@codeaurora.org>
Thu, 24 Jul 2014 04:03:50 +0000 (21:03 -0700)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 24 Jul 2014 10:02:49 +0000 (12:02 +0200)
commitf723aa1817dd8f4fe005aab52ba70c8ab0ef9457
treede785d92689f9a585c3cfd2a019d6e838c770426
parent82e13c71bc655b6dc7110da4e164079dadb44892
sched_clock: Avoid corrupting hrtimer tree during suspend

During suspend we call sched_clock_poll() to update the epoch and
accumulated time and reprogram the sched_clock_timer to fire
before the next wrap-around time. Unfortunately,
sched_clock_poll() doesn't restart the timer, instead it relies
on the hrtimer layer to do that and during suspend we aren't
calling that function from the hrtimer layer. Instead, we're
reprogramming the expires time while the hrtimer is enqueued,
which can cause the hrtimer tree to be corrupted. Furthermore, we
restart the timer during suspend but we update the epoch during
resume which seems counter-intuitive.

Let's fix this by saving the accumulated state and canceling the
timer during suspend. On resume we can update the epoch and
restart the timer similar to what we would do if we were starting
the clock for the first time.

Fixes: a08ca5d1089d "sched_clock: Use an hrtimer instead of timer"
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Link: http://lkml.kernel.org/r/1406174630-23458-1-git-send-email-john.stultz@linaro.org
Cc: Ingo Molnar <mingo@kernel.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/time/sched_clock.c