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

Timestamp:

Jun 3, 2019 6:50:51 AM (6 years ago)

Author:

vboxsync

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

131038

Message:

VMM/EM: Nested VMX: bugref:9180 For NMI-window VM-exits; check virtual-NMI blocking rather than outer guest physical NMIs, check interrupt shadow and also ensure we don't do this if an event is already committed to TRPM (e.g when injecting an event as part of VM-entry).

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (1 diff)

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

@@ -2176 +2176 @@
          * VMX NMI-window VM-exit.
          * Takes priority over non-maskable interrupts (NMIs).
-         */
-        if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW))
+         * Interrupt shadows block NMI-window VM-exits.
+         * Any event that is already in TRPM (e.g. injected during VM-entry) takes priority.
+         *
+         * See Intel spec. 25.2 "Other Causes Of VM Exits".
+         * See Intel spec. 26.7.6 "NMI-Window Exiting".
+         */
+        if (    VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW)
+            && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS)
+            && !CPUMIsGuestNmiBlocking(pVCpu)
+            && !TRPMHasTrap(pVCpu))
         {
             rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexit(pVCpu, VMX_EXIT_NMI_WINDOW, 0 /* uExitQual */));