Changeset 80196 in vbox for trunk/src

Timestamp:

Aug 8, 2019 8:35:30 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Set VMX_VMCS_GUEST_PENDING_DEBUG_XCPTS while merging VMCS. nits.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (9 diffs)

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

@@ -5000 +5000 @@
             /** @todo r=ramshankar: Warning!! We ASSUME EFLAGS.TF will not cleared on
              *        premature trips to ring-3 esp since IEM does not yet handle it. */
-            rc = VMXWriteVmcs32(VMX_VMCS_GUEST_PENDING_DEBUG_XCPTS, VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BS);
+            rc = VMXWriteVmcsNw(VMX_VMCS_GUEST_PENDING_DEBUG_XCPTS, VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BS);
             AssertRC(rc);
         }
-        /** @todo NSTVMX: Handling copying of VMX_VMCS_GUEST_PENDING_DEBUG_XCPTS from
-         *        nested-guest VMCS. */
+        /* else: for nested-guest currently handling while merging controls. */
 
         ASMAtomicUoAndU64(&pVCpu->hm.s.fCtxChanged, ~HM_CHANGED_GUEST_RFLAGS);
@@ -5454 +5453 @@
         HMVMX_CPUMCTX_ASSERT(pVCpu, CPUMCTX_EXTRN_CR3);
 
-        RTGCPHYS GCPhysGuestCr3 = NIL_RTGCPHYS;
         if (pVM->hm.s.fNestedPaging)
         {
@@ -5480 +5478 @@
             AssertRC(rc);
 
-            PCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
+            uint64_t  u64GuestCr3;
+            PCCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
             if (   pVM->hm.s.vmx.fUnrestrictedGuest
                 || CPUMIsGuestPagingEnabledEx(pCtx))
@@ -5500 +5499 @@
                  * the guest when it's not using paging.
                  */
-                GCPhysGuestCr3 = pCtx->cr3;
+                u64GuestCr3 = pCtx->cr3;
             }
             else
@@ -5525 +5524 @@
                     AssertMsgFailedReturn(("%Rrc\n",  rc), rc);
 
-                GCPhysGuestCr3 = GCPhys;
+                u64GuestCr3 = GCPhys;
             }
 
-            Log4Func(("u32GuestCr3=%#RGp (GstN)\n", GCPhysGuestCr3));
-            rc = VMXWriteVmcsNw(VMX_VMCS_GUEST_CR3, GCPhysGuestCr3);
+            Log4Func(("guest_cr3=%#RX64 (GstN)\n", u64GuestCr3));
+            rc = VMXWriteVmcsNw(VMX_VMCS_GUEST_CR3, u64GuestCr3);
             AssertRC(rc);
         }
@@ -5537 +5536 @@
             RTHCPHYS const HCPhysGuestCr3 = PGMGetHyperCR3(pVCpu);
 
-            Log4Func(("u32GuestCr3=%#RHv (HstN)\n", HCPhysGuestCr3));
+            Log4Func(("guest_cr3=%#RX64 (HstN)\n", HCPhysGuestCr3));
             rc = VMXWriteVmcsNw(VMX_VMCS_GUEST_CR3, HCPhysGuestCr3);
             AssertRC(rc);
@@ -9623 +9622 @@
 
         /* Pending debug exceptions. */
-        rc = VMXReadVmcs64(VMX_VMCS_GUEST_PENDING_DEBUG_XCPTS, &u64Val);
+        rc = VMXReadVmcsNw(VMX_VMCS_GUEST_PENDING_DEBUG_XCPTS, &u64Val);
         AssertRC(rc);
         /* Bits 63:15, Bit 13, Bits 11:4 MBZ. */
@@ -9981 +9980 @@
 
     /*
+     * Pending debug exceptions.
+     * Currently just copy whatever the nested-guest provides us.
+     */
+    uint64_t const uPendingDbgXcpt = pVmcsNstGst->u64GuestPendingDbgXcpt.u;
+
+    /*
      * I/O Bitmap.
      *
@@ -10112 +10117 @@
     if (u32ProcCtls2 & VMX_PROC_CTLS2_VIRT_APIC_ACCESS)
         rc |= VMXWriteVmcs64(VMX_VMCS64_CTRL_APIC_ACCESSADDR_FULL, HCPhysApicAccess);
+    rc |= VMXWriteVmcsNw(VMX_VMCS_GUEST_PENDING_DEBUG_XCPTS, uPendingDbgXcpt);
     AssertRC(rc);