Changeset 103194 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Feb 5, 2024 7:23:40 AM (12 months ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10318 Distinguish NMI vs. hardware exception 2 in TRPM (VMX and SVM have always made this subtle distinction).

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EM.cpp (modified) (1 diff)
• TRPM.cpp (modified) (4 diffs)

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

@@ -1850 +1850 @@
 # endif
                     {
-                        rc2 = TRPMAssertTrap(pVCpu, X86_XCPT_NMI, TRPM_TRAP);
+                        rc2 = TRPMAssertTrap(pVCpu, X86_XCPT_NMI, TRPM_NMI);
                         if (rc2 == VINF_SUCCESS)
                         {

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

@@ -114 +114 @@
 *********************************************************************************************************************************/
 /** TRPM saved state version. */
-#define TRPM_SAVED_STATE_VERSION                10
+#define TRPM_SAVED_STATE_VERSION                11
+#define TRPM_SAVED_STATE_VERSION_PRE_NMI        10  /* NMI TRPM event type bumped the version */
 #define TRPM_SAVED_STATE_VERSION_PRE_ICEBP      9   /* INT1/ICEBP support bumped the version */
 #define TRPM_SAVED_STATE_VERSION_UNI            8   /* SMP support bumped the version */
@@ -283 +284 @@
      */
     if (    uVersion != TRPM_SAVED_STATE_VERSION
+        &&  uVersion != TRPM_SAVED_STATE_VERSION_PRE_NMI
         &&  uVersion != TRPM_SAVED_STATE_VERSION_PRE_ICEBP
         &&  uVersion != TRPM_SAVED_STATE_VERSION_UNI)
@@ -290 +292 @@
     }
 
-    if (uVersion == TRPM_SAVED_STATE_VERSION)
+    if (uVersion >= TRPM_SAVED_STATE_VERSION_PRE_NMI)
     {
         for (VMCPUID i = 0; i < pVM->cCpus; i++)
@@ -350 +352 @@
          */
         SSMR3SkipToEndOfUnit(pSSM);
+    }
+
+    /*
+     * For saved-state verions prior to introducing NMI as a separate type, convert
+     * traps with vector 2 as NMI since the rest of VirtualBox code now expects this.
+     */
+    if (uVersion <= TRPM_SAVED_STATE_VERSION_PRE_NMI)
+    {
+        for (VMCPUID i = 0; i < pVM->cCpus; i++)
+        {
+            PTRPMCPU pTrpmCpu = &pVM->apCpusR3[i]->trpm.s;
+            AssertLogRelMsgReturn(pTrpmCpu->enmActiveType != TRPM_NMI,
+                                  ("TRPM event type (%#RX32) invalid for saved-state version %u!",
+                                   pTrpmCpu->enmActiveType, uVersion), VERR_SSM_ENUM_VALUE_OUT_OF_RANGE);
+            if (   pTrpmCpu->uActiveVector == X86_XCPT_NMI
+                && pTrpmCpu->enmActiveType == TRPM_TRAP)
+                pTrpmCpu->enmActiveType = TRPM_NMI;
+        }
     }