]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
x86/kvmclock: set offset for kvm unstable clock
authorPavel Tatashin <pasha.tatashin@soleen.com>
Sat, 26 Jan 2019 17:49:56 +0000 (12:49 -0500)
committerSeth Forshee <seth.forshee@canonical.com>
Mon, 25 Mar 2019 15:49:09 +0000 (10:49 -0500)
commitbe7e0b62cf244162b7ba10dafd1fd58028c9db14
treeeee7cd63f692fbd40e5e65dcb3fd858b53034ebd
parent433ad5f15ed4a41a6c92f694e7c2290117cb4922
x86/kvmclock: set offset for kvm unstable clock

BugLink: https://bugs.launchpad.net/bugs/1821607
commit b5179ec4187251a751832193693d6e474d3445ac upstream.

VMs may show incorrect uptime and dmesg printk offsets on hypervisors with
unstable clock. The problem is produced when VM is rebooted without exiting
from qemu.

The fix is to calculate clock offset not only for stable clock but for
unstable clock as well, and use kvm_sched_clock_read() which substracts
the offset for both clocks.

This is safe, because pvclock_clocksource_read() does the right thing and
makes sure that clock always goes forward, so once offset is calculated
with unstable clock, we won't get new reads that are smaller than offset,
and thus won't get negative results.

Thank you Jon DeVree for helping to reproduce this issue.

Fixes: 857baa87b642 ("sched/clock: Enable sched clock early")
Cc: stable@vger.kernel.org
Reported-by: Dominique Martinet <asmadeus@codewreck.org>
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
arch/x86/kernel/kvmclock.c