Changeset 93214 in vbox

Timestamp:

Jan 13, 2022 6:39:47 AM (3 years ago)

Author:

vboxsync

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

149266

Message:

VMM/IEM: Nested VMX: bugref:10092 Push the NMI/INT window assertions into the successful VM-exit block.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -2500 +2500 @@
     Assert(pVmcs->u64RoIoRip.u == 0);
 
-    /* We should not cause an NMI-window/interrupt-window VM-exit when injecting events as part of VM-entry. */
-    if (!CPUMIsGuestVmxInterceptEvents(&pVCpu->cpum.GstCtx))
-    {
-        Assert(uExitReason != VMX_EXIT_NMI_WINDOW);
-        Assert(uExitReason != VMX_EXIT_INT_WINDOW);
-    }
-
-    /* For exception or NMI VM-exits the VM-exit interruption info. field must be valid. */
-    Assert(uExitReason != VMX_EXIT_XCPT_OR_NMI || VMX_EXIT_INT_INFO_IS_VALID(pVmcs->u32RoExitIntInfo));
-
     /*
      * Save the guest state back into the VMCS.
@@ -2517 +2507 @@
     if (!fVmentryFailed)
     {
+        /* We should not cause an NMI-window/interrupt-window VM-exit when injecting events as part of VM-entry. */
+        if (!CPUMIsGuestVmxInterceptEvents(&pVCpu->cpum.GstCtx))
+        {
+            Assert(uExitReason != VMX_EXIT_NMI_WINDOW);
+            Assert(uExitReason != VMX_EXIT_INT_WINDOW);
+        }
+
+        /* For exception or NMI VM-exits the VM-exit interruption info. field must be valid. */
+        Assert(uExitReason != VMX_EXIT_XCPT_OR_NMI || VMX_EXIT_INT_INFO_IS_VALID(pVmcs->u32RoExitIntInfo));
+
         /*
          * If we support storing EFER.LMA into IA32e-mode guest field on VM-exit, we need to do that now.