Changeset 97614 in vbox for trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

Timestamp:

Nov 19, 2022 11:53:25 PM (2 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Must actually reload the initial VMX_VMCS32_CTRL_EXCEPTION_BITMAP in vmxHCRunDebugStateRevert or we'll assert later in vmxHCCheckCachedVmcsCtls.

File:

• trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h (modified) (4 diffs)

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

@@ -813 +813 @@
 {
     PVMXVMCSINFO pVmcsInfo   = pVmxTransient->pVmcsInfo;
-    uint32_t       uXcptBitmap = pVmcsInfo->u32XcptBitmap;
+    uint32_t     uXcptBitmap = pVmcsInfo->u32XcptBitmap;
     if ((uXcptBitmap & uXcptMask) != uXcptMask)
     {
@@ -852 +852 @@
 static int vmxHCRemoveXcptInterceptMask(PVMCPUCC pVCpu, PCVMXTRANSIENT pVmxTransient, uint32_t uXcptMask)
 {
-    PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
-    uint32_t   u32XcptBitmap = pVmcsInfo->u32XcptBitmap;
-    if (u32XcptBitmap & uXcptMask)
+    PVMXVMCSINFO pVmcsInfo   = pVmxTransient->pVmcsInfo;
+    uint32_t     uXcptBitmap = pVmcsInfo->u32XcptBitmap;
+    if (uXcptBitmap & uXcptMask)
     {
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
@@ -889 +889 @@
 
             /* Remove it from the exception bitmap. */
-            u32XcptBitmap &= ~uXcptMask;
+            uXcptBitmap &= ~uXcptMask;
 
             /* Commit and update the cache if necessary. */
-            if (pVmcsInfo->u32XcptBitmap != u32XcptBitmap)
+            if (pVmcsInfo->u32XcptBitmap != uXcptBitmap)
             {
-                int rc = VMX_VMCS_WRITE_32(pVCpu, VMX_VMCS32_CTRL_EXCEPTION_BITMAP, u32XcptBitmap);
+                int rc = VMX_VMCS_WRITE_32(pVCpu, VMX_VMCS32_CTRL_EXCEPTION_BITMAP, uXcptBitmap);
                 AssertRC(rc);
-                pVmcsInfo->u32XcptBitmap = u32XcptBitmap;
+                pVmcsInfo->u32XcptBitmap = uXcptBitmap;
             }
         }
@@ -11123 +11123 @@
        reloading and partial recalculation the next time around. */
     if (pDbgState->fModifiedXcptBitmap)
+    {
+        int rc2 = VMX_VMCS_WRITE_32(pVCpu, VMX_VMCS32_CTRL_EXCEPTION_BITMAP, pDbgState->bmXcptInitial);
+        AssertRC(rc2);
         pVmcsInfo->u32XcptBitmap = pDbgState->bmXcptInitial;
+    }
 
     return rcStrict;