VMX: x86: handle host TSC calibration failure
If the host TSC calibration fails, tsc_khz is zero (see tsc_init.c). Handle such case properly in KVM (instead of dividing by zero). https://bugzilla.redhat.com/show_bug.cgi?id=859282 Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Gleb Natapov <gleb@redhat.com>
This commit is contained in:
Родитель
0fa24ce3f5
Коммит
03ba32cae6
|
@ -1079,6 +1079,10 @@ static void kvm_set_tsc_khz(struct kvm_vcpu *vcpu, u32 this_tsc_khz)
|
||||||
u32 thresh_lo, thresh_hi;
|
u32 thresh_lo, thresh_hi;
|
||||||
int use_scaling = 0;
|
int use_scaling = 0;
|
||||||
|
|
||||||
|
/* tsc_khz can be zero if TSC calibration fails */
|
||||||
|
if (this_tsc_khz == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
/* Compute a scale to convert nanoseconds in TSC cycles */
|
/* Compute a scale to convert nanoseconds in TSC cycles */
|
||||||
kvm_get_time_scale(this_tsc_khz, NSEC_PER_SEC / 1000,
|
kvm_get_time_scale(this_tsc_khz, NSEC_PER_SEC / 1000,
|
||||||
&vcpu->arch.virtual_tsc_shift,
|
&vcpu->arch.virtual_tsc_shift,
|
||||||
|
@ -1156,20 +1160,23 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, struct msr_data *msr)
|
||||||
ns = get_kernel_ns();
|
ns = get_kernel_ns();
|
||||||
elapsed = ns - kvm->arch.last_tsc_nsec;
|
elapsed = ns - kvm->arch.last_tsc_nsec;
|
||||||
|
|
||||||
/* n.b - signed multiplication and division required */
|
if (vcpu->arch.virtual_tsc_khz) {
|
||||||
usdiff = data - kvm->arch.last_tsc_write;
|
/* n.b - signed multiplication and division required */
|
||||||
|
usdiff = data - kvm->arch.last_tsc_write;
|
||||||
#ifdef CONFIG_X86_64
|
#ifdef CONFIG_X86_64
|
||||||
usdiff = (usdiff * 1000) / vcpu->arch.virtual_tsc_khz;
|
usdiff = (usdiff * 1000) / vcpu->arch.virtual_tsc_khz;
|
||||||
#else
|
#else
|
||||||
/* do_div() only does unsigned */
|
/* do_div() only does unsigned */
|
||||||
asm("idivl %2; xor %%edx, %%edx"
|
asm("idivl %2; xor %%edx, %%edx"
|
||||||
: "=A"(usdiff)
|
: "=A"(usdiff)
|
||||||
: "A"(usdiff * 1000), "rm"(vcpu->arch.virtual_tsc_khz));
|
: "A"(usdiff * 1000), "rm"(vcpu->arch.virtual_tsc_khz));
|
||||||
#endif
|
#endif
|
||||||
do_div(elapsed, 1000);
|
do_div(elapsed, 1000);
|
||||||
usdiff -= elapsed;
|
usdiff -= elapsed;
|
||||||
if (usdiff < 0)
|
if (usdiff < 0)
|
||||||
usdiff = -usdiff;
|
usdiff = -usdiff;
|
||||||
|
} else
|
||||||
|
usdiff = USEC_PER_SEC; /* disable TSC match window below */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Special case: TSC write with a small delta (1 second) of virtual
|
* Special case: TSC write with a small delta (1 second) of virtual
|
||||||
|
|
Загрузка…
Ссылка в новой задаче