KVM: X86: Update last_guest_tsc in vcpu_put (7c4c0f4f) · Commits · 戴 / test

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:

Jan Kiszka <jan.kiszka@web.de> Tested-by:

Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by:

Joerg Roedel <joerg.roedel@amd.com> Signed-off-by:

Avi Kivity <avi@redhat.com>

arch/x86/include/asm/kvm_host.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -393,7 +393,6 @@ struct kvm_vcpu_arch {
		unsigned int hw_tsc_khz;
		unsigned int time_offset;
		struct page *time_page;
		u64 last_host_tsc;
		u64 last_guest_tsc;
		u64 last_kernel_ns;
		u64 last_tsc_nsec;

arch/x86/kvm/x86.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2146,7 +2146,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
		{
		kvm_x86_ops->vcpu_put(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)

Admin message