提交 7c4c0f4f 编写于 作者: J Joerg Roedel 提交者: Avi Kivity

KVM: X86: Update last_guest_tsc in vcpu_put

The last_guest_tsc is used in vcpu_load to adjust the
tsc_offset since tsc-scaling is merged. So the
last_guest_tsc needs to be updated in vcpu_put instead of
the the last_host_tsc. This is fixed with this patch.
Reported-by: NJan Kiszka <jan.kiszka@web.de>
Tested-by: NJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: NJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: NAvi Kivity <avi@redhat.com>
上级 977b2d03
...@@ -393,7 +393,6 @@ struct kvm_vcpu_arch { ...@@ -393,7 +393,6 @@ struct kvm_vcpu_arch {
unsigned int hw_tsc_khz; unsigned int hw_tsc_khz;
unsigned int time_offset; unsigned int time_offset;
struct page *time_page; struct page *time_page;
u64 last_host_tsc;
u64 last_guest_tsc; u64 last_guest_tsc;
u64 last_kernel_ns; u64 last_kernel_ns;
u64 last_tsc_nsec; u64 last_tsc_nsec;
......
...@@ -2146,7 +2146,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) ...@@ -2146,7 +2146,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
{ {
kvm_x86_ops->vcpu_put(vcpu); kvm_x86_ops->vcpu_put(vcpu);
kvm_put_guest_fpu(vcpu); kvm_put_guest_fpu(vcpu);
vcpu->arch.last_host_tsc = native_read_tsc(); kvm_get_msr(vcpu, MSR_IA32_TSC, &vcpu->arch.last_guest_tsc);
} }
static int is_efer_nx(void) static int is_efer_nx(void)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册