Commit 847d68ab authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: x86: Setup Hyper-V TSC page before Xen PV clocks (during clock update) 



When updating paravirtual clocks, setup the Hyper-V TSC page before
Xen PV clocks.  This will allow dropping xen_pvclock_tsc_unstable in favor
of simply clearing PVCLOCK_TSC_STABLE_BIT in the reference flags.

Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarPaul Durrant <paul@xen.org>
Link: https://lore.kernel.org/r/20250201013827.680235-11-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 39d61b46

arch/x86/kvm/x86.c

+2 −1
Original line number Diff line number Diff line
@@ -3280,6 +3280,8 @@ static int kvm_guest_time_update(struct kvm_vcpu *v) 
		hv_clock.flags &= ~PVCLOCK_GUEST_STOPPED;

	}



	kvm_hv_setup_tsc_page(v->kvm, &hv_clock);



#ifdef CONFIG_KVM_XEN

	if (vcpu->xen.vcpu_info_cache.active)

		kvm_setup_guest_pvclock(&hv_clock, v, &vcpu->xen.vcpu_info_cache,
@@ -3289,7 +3291,6 @@ static int kvm_guest_time_update(struct kvm_vcpu *v) 
		kvm_setup_guest_pvclock(&hv_clock, v, &vcpu->xen.vcpu_time_info_cache, 0,

					xen_pvclock_tsc_unstable);

#endif

	kvm_hv_setup_tsc_page(v->kvm, &hv_clock);

	return 0;

}