aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZelin Deng <zelin.deng@linux.alibaba.com>2021-04-28 10:22:01 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-15 09:47:40 +0200
commit1735cec1e83c5e1b93de47c07d74d706644394ad (patch)
tree83ca776591b2de0c249ddca0c9cf30548d31e69f
parent20fff3ef33b225cbb666600de014c43fad75f839 (diff)
downloadlinux-yocto-1735cec1e83c5e1b93de47c07d74d706644394ad.tar.gz
linux-yocto-1735cec1e83c5e1b93de47c07d74d706644394ad.tar.bz2
linux-yocto-1735cec1e83c5e1b93de47c07d74d706644394ad.zip
KVM: x86: Update vCPU's hv_clock before back to guest when tsc_offset is adjusted
commit d9130a2dfdd4b21736c91b818f87dbc0ccd1e757 upstream. When MSR_IA32_TSC_ADJUST is written by guest due to TSC ADJUST feature especially there's a big tsc warp (like a new vCPU is hot-added into VM which has been up for a long time), tsc_offset is added by a large value then go back to guest. This causes system time jump as tsc_timestamp is not adjusted in the meantime and pvclock monotonic character. To fix this, just notify kvm to update vCPU's guest time before back to guest. Cc: stable@vger.kernel.org Signed-off-by: Zelin Deng <zelin.deng@linux.alibaba.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <1619576521-81399-2-git-send-email-zelin.deng@linux.alibaba.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/kvm/x86.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 364e96e508d9..f1a0eebdcf64 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2764,6 +2764,10 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
if (!msr_info->host_initiated) {
s64 adj = data - vcpu->arch.ia32_tsc_adjust_msr;
adjust_tsc_offset_guest(vcpu, adj);
+ /* Before back to guest, tsc_timestamp must be adjusted
+ * as well, otherwise guest's percpu pvclock time could jump.
+ */
+ kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu);
}
vcpu->arch.ia32_tsc_adjust_msr = data;
}