Skip to content

Commit 847d68a

Browse files
committed
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: Vitaly Kuznetsov <vkuznets@redhat.com> Reviewed-by: Paul Durrant <paul@xen.org> Link: https://lore.kernel.org/r/20250201013827.680235-11-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 39d61b4 commit 847d68a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/x86/kvm/x86.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3280,6 +3280,8 @@ static int kvm_guest_time_update(struct kvm_vcpu *v)
32803280
hv_clock.flags &= ~PVCLOCK_GUEST_STOPPED;
32813281
}
32823282

3283+
kvm_hv_setup_tsc_page(v->kvm, &hv_clock);
3284+
32833285
#ifdef CONFIG_KVM_XEN
32843286
if (vcpu->xen.vcpu_info_cache.active)
32853287
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)
32893291
kvm_setup_guest_pvclock(&hv_clock, v, &vcpu->xen.vcpu_time_info_cache, 0,
32903292
xen_pvclock_tsc_unstable);
32913293
#endif
3292-
kvm_hv_setup_tsc_page(v->kvm, &hv_clock);
32933294
return 0;
32943295
}
32953296

0 commit comments

Comments
 (0)