Changeset 87034 in vbox

Timestamp:

Dec 3, 2020 12:29:59 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141682

Message:

VMM/HMVMXR0: Fix delivery of external interrupts when executing nested-guests. Fixes nested-guest SMP hangs described in bugref:9562#c18

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)

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

@@ -8912 +8912 @@
             AssertRC(rc);
 
+            /*
+             * EFLAGS.IF does not control the blocking of external interrupts when
+             * "External interrupt exiting" set. Fixes nasty SMP hang while executing nested-guest
+             * VCPUs on spinlocks and aren't rescued by other VM-exits (like a preemption timer),
+             * see @bugref{9562#c18}.
+             *
+             * See Intel spec. 25.4.1 "Event Blocking"
+             */
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+            if (    fIsNestedGuest
+                &&  CPUMIsGuestVmxPinCtlsSet(pCtx, VMX_PIN_CTLS_EXT_INT_EXIT)
+                && !CPUMIsGuestVmxExitCtlsSet(pCtx, VMX_EXIT_CTLS_ACK_EXT_INT))
+            {
+                VBOXSTRICTRC rcStrict = IEMExecVmxVmexitExtInt(pVCpu, 0 /* uVector */, true /* fIntPending */);
+                Assert(rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE);
+                return rcStrict;
+            }
+#endif
             if (pCtx->eflags.u32 & X86_EFL_IF)
             {
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-                if (    fIsNestedGuest
-                    &&  CPUMIsGuestVmxPinCtlsSet(pCtx, VMX_PIN_CTLS_EXT_INT_EXIT)
-                    && !CPUMIsGuestVmxExitCtlsSet(pCtx, VMX_EXIT_CTLS_ACK_EXT_INT))
-                {
-                    VBOXSTRICTRC rcStrict = IEMExecVmxVmexitExtInt(pVCpu, 0 /* uVector */, true /* fIntPending */);
-                    Assert(rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE);
-                    return rcStrict;
-                }
-#endif
                 uint8_t u8Interrupt;
                 rc = PDMGetInterrupt(pVCpu, &u8Interrupt);