Commit b5179ec4 authored by Pavel Tatashin's avatar Pavel Tatashin Committed by Paolo Bonzini

x86/kvmclock: set offset for kvm unstable clock

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: 857baa87 ("sched/clock: Enable sched clock early")
Cc: stable@vger.kernel.org
Reported-by: default avatarDominique Martinet <asmadeus@codewreck.org>
Signed-off-by: default avatarPavel Tatashin <pasha.tatashin@soleen.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4f44c4ee
...@@ -104,12 +104,8 @@ static u64 kvm_sched_clock_read(void) ...@@ -104,12 +104,8 @@ static u64 kvm_sched_clock_read(void)
static inline void kvm_sched_clock_init(bool stable) static inline void kvm_sched_clock_init(bool stable)
{ {
if (!stable) { if (!stable)
pv_ops.time.sched_clock = kvm_clock_read;
clear_sched_clock_stable(); clear_sched_clock_stable();
return;
}
kvm_sched_clock_offset = kvm_clock_read(); kvm_sched_clock_offset = kvm_clock_read();
pv_ops.time.sched_clock = kvm_sched_clock_read; pv_ops.time.sched_clock = kvm_sched_clock_read;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment