Changeset 79401 in vbox

Timestamp:

Jun 28, 2019 6:22:05 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Don't set interrupt-window exiting when executing a nested-guest.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -9713 +9713 @@
 {
     PCPUMCTX     pCtx = &pVCpu->cpum.GstCtx;
-    PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
+    PVMXVMCSINFO pVmcsInfo      = pVmxTransient->pVmcsInfo;
+    bool const   fIsNestedGuest = pVmxTransient->fIsNestedGuest;
 
     /* Get the current interruptibility-state of the guest and then figure out what can be injected. */
@@ -9743 +9744 @@
         {
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-            if (   pVmxTransient->fIsNestedGuest
+            if (   fIsNestedGuest
                 && CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_NMI_EXIT))
                 return IEMExecVmxVmexitXcptNmi(pVCpu);
@@ -9751 +9752 @@
             Log4Func(("Pending NMI\n"));
         }
-        else
+        else if (!fIsNestedGuest)
             hmR0VmxSetNmiWindowExitVmcs(pVCpu, pVmcsInfo);
     }
@@ -9771 +9772 @@
         {
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-            if (   pVmxTransient->fIsNestedGuest
+            if (   fIsNestedGuest
                 && CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_EXT_INT_EXIT))
             {
@@ -9784 +9785 @@
             {
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-                if (   pVmxTransient->fIsNestedGuest
+                if (   fIsNestedGuest
                     && CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_EXT_INT_EXIT)
                     && CPUMIsGuestVmxExitCtlsSet(pVCpu, pCtx, VMX_EXIT_CTLS_ACK_EXT_INT))
@@ -9798 +9799 @@
             else if (rc == VERR_APIC_INTR_MASKED_BY_TPR)
             {
-                if (   !pVmxTransient->fIsNestedGuest
+                if (   !fIsNestedGuest
                     && (pVmcsInfo->u32ProcCtls & VMX_PROC_CTLS_USE_TPR_SHADOW))
                     hmR0VmxApicSetTprThreshold(pVCpu, pVmcsInfo, u8Interrupt >> 4);
@@ -9812 +9813 @@
                 STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchGuestIrq);
         }
-        else
+        else if (!fIsNestedGuest)
             hmR0VmxSetIntWindowExitVmcs(pVCpu, pVmcsInfo);
     }