kvmclock: update system_time_msr address forcibly
PATCH v3 1/1 kvmclock: update system_time_msr address forcibly
Do an update of system_time_msr address every time before reading the value of tsc_timestamp from guest's kvmclock page.
There is no other code paths which ensure that qemu has an up-to-date value of system_time_msr. So, force this update on guest's tsc_timestamp reading.
This bug causes effect on those nested setups which turn off TPR access interception for L2 guests and that access being intercepted by L0 doesn't show up in L1.
Linux bootstrap initiate kvmclock before APIC initializing causing TPR access. That's why on L1 guests, having TPR interception turned on for L2, the effect of the bug is not revealed.
This patch fixes this problem by making sure it knows the correct system_time_msr address every time it is needed.
--- hw/i386/kvm/clock.c | 3 +++ 1 file changed, 3 insertions(+)
hw/i386/kvm/clock.c +3 -0
@@ -19,6 +19,7 @@#include "qemu/host-utils.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" +#include "sysemu/hw_accel.h" #include "kvm_i386.h" #include "hw/sysbus.h" #include "hw/kvm/clock.h"
@@ -69,6 +70,8 @@ static uint64_t kvmclock_current_nsec(KVMClockState *s)uint64_t nsec_hi;uint64_t nsec; +cpu_synchronize_state (cpu); +if (!(env->system_time_msr &1ULL )) {/* KVM clock not active */ return 0 ;
Signature · 1 line
2.7.4
Quoted 14 lines · Denis Plotnikov
Do an update of
system_time_msraddress every time before reading the value oftsc_timestampfrom guest's kvmclock page.There is no other code paths which ensure that qemu has an up-to-date value of
system_time_msr. So, force this update on guest'stsc_timestampreading.This bug causes effect on those nested setups which turn off TPR access interception for L2 guests and that access being intercepted by L0 doesn't show up in L1.
Linux bootstrap initiate kvmclock before APIC initializing causing TPR access. That's why on L1 guests, having TPR interception turned on for L2, the effect of the bug is not revealed.
Quoted 8 lines
This patch fixes this problem by making sure it knows the correct
system_time_msraddress every time it is needed.Signed-off-by Denis Plotnikov <[email protected]>--- hw/i386/kvm/clock.c | 3 +++ 1 file changed, 3 insertions(+)
Please don't forget the changelog.