Skip to content

Commit 3a55f72

Browse files
theli-uabonzini
authored andcommitted
kvm: x86: Disable KVM_HC_CLOCK_PAIRING if tsc is in always catchup mode
If vcpu has tsc_always_catchup set each request updates pvclock data. KVM_HC_CLOCK_PAIRING consumers such as ptp_kvm_x86 rely on tsc read on host's side and do hypercall inside pvclock_read_retry loop leading to infinite loop in such situation. v3: Removed warn Changed return code to KVM_EFAULT v2: Added warn Signed-off-by: Anton Romanov <romanton@google.com> Message-Id: <20220216182653.506850-1-romanton@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 4cb9a99 commit 3a55f72

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

arch/x86/kvm/x86.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8943,6 +8943,13 @@ static int kvm_pv_clock_pairing(struct kvm_vcpu *vcpu, gpa_t paddr,
89438943
if (clock_type != KVM_CLOCK_PAIRING_WALLCLOCK)
89448944
return -KVM_EOPNOTSUPP;
89458945

8946+
/*
8947+
* When tsc is in permanent catchup mode guests won't be able to use
8948+
* pvclock_read_retry loop to get consistent view of pvclock
8949+
*/
8950+
if (vcpu->arch.tsc_always_catchup)
8951+
return -KVM_EOPNOTSUPP;
8952+
89468953
if (!kvm_get_walltime_and_clockread(&ts, &cycle))
89478954
return -KVM_EOPNOTSUPP;
89488955

0 commit comments

Comments
 (0)