Changeset 103194 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

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

161459

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

Files:

• VMMAll/HMSVMAll.cpp (modified) (1 diff)
• VMMAll/HMVMXAll.cpp (modified) (3 diffs)
• VMMAll/IEMAll.cpp (modified) (1 diff)
• VMMAll/TRPMAll.cpp (modified) (1 diff)
• VMMR0/HMSVMR0.cpp (modified) (2 diffs)
• VMMR3/EM.cpp (modified) (1 diff)
• VMMR3/TRPM.cpp (modified) (4 diffs)

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

@@ -317 +317 @@
         case SVM_EVENT_EXTERNAL_IRQ:    return TRPM_HARDWARE_INT;
         case SVM_EVENT_SOFTWARE_INT:    return TRPM_SOFTWARE_INT;
-        case SVM_EVENT_NMI:             return TRPM_TRAP;
+        case SVM_EVENT_NMI:             return TRPM_NMI;
         case SVM_EVENT_EXCEPTION:
         {

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

@@ -1193 +1193 @@
 
         case VMX_IDT_VECTORING_INFO_TYPE_NMI:
+            Assert(uVector == X86_XCPT_NMI); NOREF(uVector);
+            enmTrapType = TRPM_NMI;
+            break;
+
         case VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT:
             enmTrapType = TRPM_TRAP;
@@ -1238 +1242 @@
         switch (uVector)
         {
-            case X86_XCPT_NMI:
-                uIntInfoType |= (VMX_IDT_VECTORING_INFO_TYPE_NMI << VMX_IDT_VECTORING_INFO_TYPE_SHIFT);
-                break;
-
             case X86_XCPT_BP:
             case X86_XCPT_OF:
@@ -1289 +1289 @@
         }
     }
+    else if (enmTrpmEvent == TRPM_NMI)
+        uIntInfoType |= (VMX_IDT_VECTORING_INFO_TYPE_NMI << VMX_IDT_VECTORING_INFO_TYPE_SHIFT);
     else
         AssertMsgFailed(("Invalid TRPM event type %d\n", enmTrpmEvent));

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

@@ -9829 +9829 @@
 
         case TRPM_TRAP:
+        case TRPM_NMI: /** @todo Distinguish NMI from exception 2. */
             Log(("IEMInjectTrap: %#4x trap err=%#x cr2=%#RGv\n", u8TrapNo, uErrCode, uCr2));
             fFlags = IEM_XCPT_FLAGS_T_CPU_XCPT;

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

@@ -227 +227 @@
     }
 
+    /* NMI TRPM type must specify the vector as 2 (NMI). */
+    Assert(enmType != TRPM_NMI || u8TrapNo == X86_XCPT_NMI);
+
     pVCpu->trpm.s.uActiveVector               = u8TrapNo;
     pVCpu->trpm.s.enmActiveType               = enmType;

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -3416 +3416 @@
         switch (uVector)
         {
-            case X86_XCPT_NMI:
-            {
-                Event.n.u3Type = SVM_EVENT_NMI;
-                break;
-            }
-
             case X86_XCPT_BP:
             case X86_XCPT_OF:
@@ -3445 +3439 @@
     else if (enmTrpmEvent == TRPM_SOFTWARE_INT)
         Event.n.u3Type = SVM_EVENT_SOFTWARE_INT;
+    else if (enmTrpmEvent == TRPM_NMI)
+        Event.n.u3Type = SVM_EVENT_NMI;
     else
         AssertMsgFailed(("Invalid TRPM event type %d\n", enmTrpmEvent));

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;
+        }
     }