|
@@ -12435,7 +12435,7 @@ static inline int u64_shl_div_u64(u64 a, unsigned int shift,
|
|
|
static int vmx_set_hv_timer(struct kvm_vcpu *vcpu, u64 guest_deadline_tsc)
|
|
|
{
|
|
|
struct vcpu_vmx *vmx;
|
|
|
- u64 tscl, guest_tscl, delta_tsc;
|
|
|
+ u64 tscl, guest_tscl, delta_tsc, lapic_timer_advance_cycles;
|
|
|
|
|
|
if (kvm_mwait_in_guest(vcpu->kvm))
|
|
|
return -EOPNOTSUPP;
|
|
@@ -12444,6 +12444,12 @@ static int vmx_set_hv_timer(struct kvm_vcpu *vcpu, u64 guest_deadline_tsc)
|
|
|
tscl = rdtsc();
|
|
|
guest_tscl = kvm_read_l1_tsc(vcpu, tscl);
|
|
|
delta_tsc = max(guest_deadline_tsc, guest_tscl) - guest_tscl;
|
|
|
+ lapic_timer_advance_cycles = nsec_to_cycles(vcpu, lapic_timer_advance_ns);
|
|
|
+
|
|
|
+ if (delta_tsc > lapic_timer_advance_cycles)
|
|
|
+ delta_tsc -= lapic_timer_advance_cycles;
|
|
|
+ else
|
|
|
+ delta_tsc = 0;
|
|
|
|
|
|
/* Convert to host delta tsc if tsc scaling is enabled */
|
|
|
if (vcpu->arch.tsc_scaling_ratio != kvm_default_tsc_scaling_ratio &&
|