Changeset 9064 in vbox for trunk/src/VBox

Timestamp:

May 23, 2008 9:20:55 AM (17 years ago)

Author:

vboxsync

Message:

Properly deal with CR3 changes in nested paging mode.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAll.cpp (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (4 diffs)

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

@@ -1157 +1157 @@
 }
 
+/**
+ * Performs and schedules necessary updates following a CR3 load or reload, 
+ * without actually the TLB as with PGMFlushTLB.
+ *
+ * This will normally involve mapping the guest PD or nPDPT
+ *
+ * @returns VBox status code.
+ * @retval  VINF_PGM_SYNC_CR3 if monitoring requires a CR3 sync. This can
+ *          safely be ignored and overridden since the FF will be set too then.
+ * @param   pVM         VM handle.
+ * @param   cr3         The new cr3.
+ */
+PGMDECL(int) PGMUpdateCR3(PVM pVM, uint64_t cr3)
+{
+    LogFlow(("PGMUpdateCR3: cr3=%VX64 OldCr3=%VX64\n", cr3, pVM->pgm.s.GCPhysCR3));
+
+    /* We assume we're only called in nested paging mode. */
+    Assert(pVM->pgm.s.fMappingsFixed);
+    Assert(!(pVM->pgm.s.fSyncFlags & PGM_SYNC_MONITOR_CR3));
+    Assert(pVM->pgm.s.enmShadowMode == PGMMODE_NESTED);
+
+    /*
+     * Remap the CR3 content and adjust the monitoring if CR3 was actually changed.
+     */
+    int rc = VINF_SUCCESS;
+    RTGCPHYS GCPhysCR3;
+    if (    pVM->pgm.s.enmGuestMode == PGMMODE_PAE
+        ||  pVM->pgm.s.enmGuestMode == PGMMODE_PAE_NX
+        ||  pVM->pgm.s.enmGuestMode == PGMMODE_AMD64
+        ||  pVM->pgm.s.enmGuestMode == PGMMODE_AMD64_NX)
+        GCPhysCR3 = (RTGCPHYS)(cr3 & X86_CR3_PAE_PAGE_MASK);
+    else
+        GCPhysCR3 = (RTGCPHYS)(cr3 & X86_CR3_PAGE_MASK);
+    if (pVM->pgm.s.GCPhysCR3 != GCPhysCR3)
+    {
+        pVM->pgm.s.GCPhysCR3 = GCPhysCR3;
+        rc = PGM_GST_PFN(MapCR3, pVM)(pVM, GCPhysCR3);
+    }
+    AssertRC(rc);
+    return rc;
+}
 
 /**

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

@@ -258 +258 @@
         pVMCB->ctrl.u16InterceptRdCRx = RT_BIT(0) | RT_BIT(3) | RT_BIT(4);
     else
-        pVMCB->ctrl.u16InterceptRdCRx = RT_BIT(0);
+        pVMCB->ctrl.u16InterceptRdCRx = RT_BIT(0) | RT_BIT(4);
 
     /*
@@ -266 +266 @@
         pVMCB->ctrl.u16InterceptWrCRx = RT_BIT(0) | RT_BIT(3) | RT_BIT(4) | RT_BIT(8);
     else
-        pVMCB->ctrl.u16InterceptWrCRx = RT_BIT(0) | RT_BIT(8);
+        pVMCB->ctrl.u16InterceptWrCRx = RT_BIT(0) | RT_BIT(4) | RT_BIT(8);
 
     /* Intercept all DRx reads and writes. */
@@ -1041 +1041 @@
     {
         CPUMSetGuestCR3(pVM, pVMCB->guest.u64CR3);
-        CPUMSetGuestCR4(pVM, pVMCB->guest.u64CR4);
+        PGMUpdateCR3(pVM, pVMCB->guest.u64CR3);
     }
 
@@ -1423 +1423 @@
             break;
         case 4:
-            Assert(!pVM->hwaccm.s.fNestedPaging);
             pVM->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_GUEST_CR4;
             break;