|
@@ -12218,10 +12218,16 @@ 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)
|
|
static int vmx_set_hv_timer(struct kvm_vcpu *vcpu, u64 guest_deadline_tsc)
|
|
{
|
|
{
|
|
- struct vcpu_vmx *vmx = to_vmx(vcpu);
|
|
|
|
- u64 tscl = rdtsc();
|
|
|
|
- u64 guest_tscl = kvm_read_l1_tsc(vcpu, tscl);
|
|
|
|
- u64 delta_tsc = max(guest_deadline_tsc, guest_tscl) - guest_tscl;
|
|
|
|
|
|
+ struct vcpu_vmx *vmx;
|
|
|
|
+ u64 tscl, guest_tscl, delta_tsc;
|
|
|
|
+
|
|
|
|
+ if (kvm_mwait_in_guest(vcpu->kvm))
|
|
|
|
+ return -EOPNOTSUPP;
|
|
|
|
+
|
|
|
|
+ vmx = to_vmx(vcpu);
|
|
|
|
+ tscl = rdtsc();
|
|
|
|
+ guest_tscl = kvm_read_l1_tsc(vcpu, tscl);
|
|
|
|
+ delta_tsc = max(guest_deadline_tsc, guest_tscl) - guest_tscl;
|
|
|
|
|
|
/* Convert to host delta tsc if tsc scaling is enabled */
|
|
/* Convert to host delta tsc if tsc scaling is enabled */
|
|
if (vcpu->arch.tsc_scaling_ratio != kvm_default_tsc_scaling_ratio &&
|
|
if (vcpu->arch.tsc_scaling_ratio != kvm_default_tsc_scaling_ratio &&
|