Changeset 99650 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

May 8, 2023 6:49:25 AM (20 months ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:10318 Clear "NMI unblocked due to IRET" state on VM-exit. Minor optimization while injecting an event. Comments, assertions.

File:

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

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

@@ -2578 +2578 @@
         }
 
-        /* For exception or NMI VM-exits the VM-exit interruption info. field must be valid. */
+        /* 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));
+
+        /* For external interrupts that occur while "acknowledge interrupt on exit" VM-exit is set,
+           the VM-exit interruption info. field must be valid. */
+        Assert(   uExitReason != VMX_EXIT_EXT_INT
+               || !(pVmcs->u32ExitCtls & VMX_EXIT_CTLS_ACK_EXT_INT)
+               || VMX_EXIT_INT_INFO_IS_VALID(pVmcs->u32RoExitIntInfo));
 
         /*
@@ -2634 +2640 @@
     if (pVmcs->u32PinCtls & VMX_PIN_CTLS_PREEMPT_TIMER)
         CPUMStopGuestVmxPremptTimer(pVCpu);
+
+    /*
+     * Clear the state of "NMI unblocked due to IRET" as otherwise we risk
+     * reporting a stale state on a subsequent VM-exit. This state will be
+     * re-established while emulating IRET in VMX non-root mode.
+     */
+    pVCpu->cpum.GstCtx.hwvirt.vmx.fNmiUnblockingIret = false;
 
     /*
@@ -7610 +7623 @@
         Log(("%s: Injecting: fault_addr=%RGp\n", pszInstr, GCPtrFaultAddress));
     }
-    else if (   uType == VMX_ENTRY_INT_INFO_TYPE_SW_INT
-             || uType == VMX_ENTRY_INT_INFO_TYPE_SW_XCPT
-             || uType == VMX_ENTRY_INT_INFO_TYPE_PRIV_SW_XCPT)
-    {
-        TRPMSetInstrLength(pVCpu, cbInstr);
-        Log(("%s: Injecting: instr_len=%u\n", pszInstr, cbInstr));
-    }
-
-    if (VMX_ENTRY_INT_INFO_TYPE(uEntryIntInfo) == VMX_ENTRY_INT_INFO_TYPE_PRIV_SW_XCPT)
-    {
-        TRPMSetTrapDueToIcebp(pVCpu);
-        Log(("%s: Injecting: icebp\n", pszInstr));
+    else
+    {
+        switch (uType)
+        {
+            case VMX_ENTRY_INT_INFO_TYPE_PRIV_SW_XCPT:
+                TRPMSetTrapDueToIcebp(pVCpu);
+                Log(("%s: Injecting: icebp\n", pszInstr));
+                RT_FALL_THRU();
+            case VMX_ENTRY_INT_INFO_TYPE_SW_INT:
+            case VMX_ENTRY_INT_INFO_TYPE_SW_XCPT:
+                TRPMSetInstrLength(pVCpu, cbInstr);
+                Log(("%s: Injecting: instr_len=%u\n", pszInstr, cbInstr));
+                break;
+        }
     }