Changeset 78920 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 3, 2019 7:47:17 AM (6 years ago)

Author:

vboxsync

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

131040

Message:

VMM/IEM: Nested VMX: bugref:9180 Fix NMI-window VM-exit checks.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -14048 +14048 @@
         && CPUMIsGuestInVmxNonRootMode(IEM_GET_CTX(pVCpu)))
     {
+        bool fCheckRemainingIntercepts = true;
         /* TPR-below threshold/APIC write has the highest priority. */
         if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_APIC_WRITE))
         {
             rcStrict = iemVmxApicWriteEmulation(pVCpu);
+            fCheckRemainingIntercepts = false;
             Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS));
             Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_APIC_WRITE));
@@ -14059 +14061 @@
         {
             rcStrict = iemVmxVmexit(pVCpu, VMX_EXIT_MTF);
+            fCheckRemainingIntercepts = false;
             Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS));
             Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_MTF));
@@ -14070 +14073 @@
             else
             {
+                fCheckRemainingIntercepts = false;
                 Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS));
                 Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_PREEMPT_TIMER));
             }
         }
+
         /* NMI-window VM-exit. */
-        else if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW))
+        if (    fCheckRemainingIntercepts
+             && pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents     /* Event injection during VM-entry takes priority. */
+             && VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW)
+             && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS)
+             && !CPUMIsGuestNmiBlocking(pVCpu))
         {
             rcStrict = iemVmxVmexit(pVCpu, VMX_EXIT_NMI_WINDOW);
@@ -14393 +14402 @@
     bool fIntrEnabled = pVCpu->cpum.GstCtx.eflags.Bits.u1IF;
 #endif
+
+    /** @todo What if we are injecting an exception and not an interrupt? Is that
+     *        possible here? */
     if (   fIntrEnabled
         && TRPMHasTrap(pVCpu)