Changeset 74899 in vbox

Timestamp:

Oct 18, 2018 6:01:28 AM (6 years ago)

Author:

vboxsync

Message:

VMM/EM: Nested VMX: bugref:9180 Interrupt-window must work even if an interrupt isn't actually pending when interrupts are enabled.
The problem is we don't have hooks when EFLAGS change, so this is the best we can do atm.

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -1770 +1770 @@
 
     /** @todo NSTVMX: Virtual interrupt injection. */
-    if (   pVCpu->cpum.GstCtx.eflags.Bits.u1IF
-        && VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
-    {
+    if (pVCpu->cpum.GstCtx.eflags.Bits.u1IF)
+    {
+        Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS));
         if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_INT_WINDOW_EXIT))
         {
-            /* CPUM_IMPORT_EXTRN_RET(pVCpu, IEM_CPUMCTX_EXTRN_SVM_VMEXIT_MASK); */ /** @todo NSTVMX: Mask. */
+            CPUM_IMPORT_EXTRN_RET(pVCpu, IEM_CPUMCTX_EXTRN_VMX_VMEXIT_MASK);
             VBOXSTRICTRC rcStrict = IEMExecVmxVmexitIntWindow(pVCpu);
             if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
@@ -1792 +1792 @@
         }
 
-        int rc = emR3GstInjectIntr(pVCpu, pfWakeupPending, pfInjected);
-        if (rc == VINF_VMX_VMEXIT)
-            rc = VINF_SUCCESS;
-        return rc;
+        Assert(pVCpu->em.s.enmState != EMSTATE_WAIT_SIPI);
+        if (VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
+        {
+            int rc = emR3GstInjectIntr(pVCpu, pfWakeupPending, pfInjected);
+            if (rc == VINF_VMX_VMEXIT)
+                rc = VINF_SUCCESS;
+            return rc;
+        }
     }