]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
sched/clock: Fix broken stable to unstable transfer
authorPavel Tatashin <pasha.tatashin@oracle.com>
Wed, 22 Mar 2017 20:24:17 +0000 (16:24 -0400)
committerIngo Molnar <mingo@kernel.org>
Mon, 27 Mar 2017 08:23:48 +0000 (10:23 +0200)
commit7b09cc5a9debc86c903c2eff8f8a1fdef773c649
tree6e35ca2c34f1ab45e176da65cad9b1e14079ff4d
parent698eff6355f735d46d1b7113df8b422874cd7988
sched/clock: Fix broken stable to unstable transfer

When it is determined that the clock is actually unstable, and
we switch from stable to unstable, the __clear_sched_clock_stable()
function is eventually called.

In this function we set gtod_offset so the following holds true:

  sched_clock() + raw_offset == ktime_get_ns() + gtod_offset

But instead of getting the latest timestamps, we use the last values
from scd, so instead of sched_clock() we use scd->tick_raw, and
instead of ktime_get_ns() we use scd->tick_gtod.

However, later, when we use gtod_offset sched_clock_local() we do not
add it to scd->tick_gtod to calculate the correct clock value when we
determine the boundaries for min/max clocks.

This can result in tick granularity sched_clock() values, so fix it.

Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: hpa@zytor.com
Fixes: 5680d8094ffa ("sched/clock: Provide better clock continuity")
Link: http://lkml.kernel.org/r/1490214265-899964-2-git-send-email-pasha.tatashin@oracle.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/sched/clock.c