Changeset 9026 in vbox for trunk/src/VBox/VMM

Timestamp:

May 21, 2008 3:33:04 PM (17 years ago)

Author:

vboxsync

Message:

More updates for nested paging. (setting up the paging mode)

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• PGM.cpp (modified) (10 diffs)
• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAll.cpp (modified) (3 diffs)
• VMMR0/HWSVMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -215 +215 @@
     /* Disable the switcher */
     VMMR3DisableSwitcher(pVM);
+
+    if (pVM->hwaccm.s.fNestedPaging)
+    {
+        /* Reinit the paging mode to force the new shadow mode. */
+        PGMR3ChangeMode(pVM, PGMMODE_REAL);
+    }
 }
 

trunk/src/VBox/VMM/PGM.cpp

@@ -621 +621 @@
 static int               pgmR3ModeDataInit(PVM pVM, bool fResolveGCAndR0);
 static void              pgmR3ModeDataSwitch(PVM pVM, PGMMODE enmShw, PGMMODE enmGst);
-static PGMMODE           pgmR3CalcShadowMode(PGMMODE enmGuestMode, SUPPAGINGMODE enmHostMode, PGMMODE enmShadowMode, VMMSWITCHER *penmSwitcher);
+static PGMMODE           pgmR3CalcShadowMode(PVM pVM, PGMMODE enmGuestMode, SUPPAGINGMODE enmHostMode, PGMMODE enmShadowMode, VMMSWITCHER *penmSwitcher);
 
 #ifdef VBOX_WITH_STATISTICS
@@ -1340 +1340 @@
     rc = pgmR3ModeDataInit(pVM, false /* don't resolve GC and R0 syms yet */);
     if (VBOX_SUCCESS(rc))
-        rc = pgmR3ChangeMode(pVM, PGMMODE_REAL);
+        rc = PGMR3ChangeMode(pVM, PGMMODE_REAL);
     if (VBOX_SUCCESS(rc))
     {
@@ -1905 +1905 @@
              * Switch mode back to real mode.
              */
-            rc = pgmR3ChangeMode(pVM, PGMMODE_REAL);
+            rc = PGMR3ChangeMode(pVM, PGMMODE_REAL);
             STAM_REL_COUNTER_RESET(&pVM->pgm.s.cGuestModeChanges);
         }
@@ -2279 +2279 @@
      * Change the paging mode.
      */
-    return pgmR3ChangeMode(pVM, pPGM->enmGuestMode);
+    return PGMR3ChangeMode(pVM, pPGM->enmGuestMode);
 }
 
@@ -2725 +2725 @@
  *
  * @returns The shadow paging mode.
+ * @param   pVM             VM handle.
  * @param   enmGuestMode    The guest mode.
  * @param   enmHostMode     The host mode.
@@ -2731 +2732 @@
  *                          VMMSWITCHER_INVALID means no change.
  */
-static PGMMODE pgmR3CalcShadowMode(PGMMODE enmGuestMode, SUPPAGINGMODE enmHostMode, PGMMODE enmShadowMode, VMMSWITCHER *penmSwitcher)
+static PGMMODE pgmR3CalcShadowMode(PVM pVM, PGMMODE enmGuestMode, SUPPAGINGMODE enmHostMode, PGMMODE enmShadowMode, VMMSWITCHER *penmSwitcher)
 {
     VMMSWITCHER enmSwitcher = VMMSWITCHER_INVALID;
@@ -2884 +2885 @@
             return PGMMODE_INVALID;
     }
+    /* Override the shadow mode is nested paging is active. */
+    if (HWACCMIsNestedPagingActive(pVM))
+        enmShadowMode = PGMMODE_NESTED;
 
     *penmSwitcher = enmSwitcher;
@@ -2899 +2903 @@
  *                          the current mode.
  */
-int pgmR3ChangeMode(PVM pVM, PGMMODE enmGuestMode)
-{
-    LogFlow(("pgmR3ChangeMode: Guest mode: %d -> %d\n", pVM->pgm.s.enmGuestMode, enmGuestMode));
+PGMR3DECL(int) PGMR3ChangeMode(PVM pVM, PGMMODE enmGuestMode)
+{
+    LogFlow(("PGMR3ChangeMode: Guest mode: %d -> %d\n", pVM->pgm.s.enmGuestMode, enmGuestMode));
     STAM_REL_COUNTER_INC(&pVM->pgm.s.cGuestModeChanges);
 
@@ -2908 +2912 @@
      */
     VMMSWITCHER enmSwitcher;
-    PGMMODE     enmShadowMode = pgmR3CalcShadowMode(enmGuestMode, pVM->pgm.s.enmHostMode, pVM->pgm.s.enmShadowMode, &enmSwitcher);
+    PGMMODE     enmShadowMode = pgmR3CalcShadowMode(pVM, enmGuestMode, pVM->pgm.s.enmHostMode, pVM->pgm.s.enmShadowMode, &enmSwitcher);
     if (enmSwitcher != VMMSWITCHER_INVALID)
     {
@@ -2928 +2932 @@
     if (enmShadowMode != pVM->pgm.s.enmShadowMode)
     {
-        LogFlow(("pgmR3ChangeMode: Shadow mode: %d -> %d\n",  pVM->pgm.s.enmShadowMode, enmShadowMode));
+        LogFlow(("PGMR3ChangeMode: Shadow mode: %d -> %d\n",  pVM->pgm.s.enmShadowMode, enmShadowMode));
         if (PGM_SHW_PFN(Exit, pVM))
         {

trunk/src/VBox/VMM/PGMInternal.h

@@ -2579 +2579 @@
 PGMGCDECL(int)  pgmGCGuestPDWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser);
 PGMDECL(int)    pgmPhysRomWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser);
-int             pgmR3ChangeMode(PVM pVM, PGMMODE enmGuestMode);
 
 int             pgmR3SyncPTResolveConflict(PVM pVM, PPGMMAPPING pMapping, PX86PD pPDSrc, RTGCPTR GCPtrOldMapping);

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

@@ -908 +908 @@
 PGMDECL(uint32_t) PGMGetHyperCR3(PVM pVM)
 {
-    switch (pVM->pgm.s.enmShadowMode)
+    PGMMODE enmShadowMode = pVM->pgm.s.enmShadowMode;
+    switch (enmShadowMode)
     {
         case PGMMODE_32_BIT:
@@ -922 +923 @@
 
         default:
-            AssertMsgFailed(("enmShadowMode=%d\n", pVM->pgm.s.enmShadowMode));
+            AssertMsgFailed(("enmShadowMode=%d\n", enmShadowMode));
+            return ~0;
+    }
+}
+
+/**
+ * Gets the current CR3 register value for the nested memory context.
+ * @returns CR3 value.
+ * @param   pVM         The VM handle.
+ */
+PGMDECL(uint32_t) PGMGetNestedCR3(PVM pVM, PGMMODE enmShadowMode)
+{
+    switch (enmShadowMode)
+    {
+        case PGMMODE_32_BIT:
+            return pVM->pgm.s.HCPhys32BitPD;
+
+        case PGMMODE_PAE:
+        case PGMMODE_PAE_NX:
+            return pVM->pgm.s.HCPhysPaePDPT;
+
+        case PGMMODE_AMD64:
+        case PGMMODE_AMD64_NX:
+            return pVM->pgm.s.HCPhysPaePML4;
+
+        default:
+            AssertMsgFailed(("enmShadowMode=%d\n", enmShadowMode));
             return ~0;
     }
@@ -1245 +1272 @@
         return VINF_SUCCESS;
 #ifdef IN_RING3
-    return pgmR3ChangeMode(pVM, enmGuestMode);
+    return PGMR3ChangeMode(pVM, enmGuestMode);
 #else
     Log(("PGMChangeMode: returns VINF_PGM_CHANGE_MODE.\n"));

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

@@ -610 +610 @@
         if (pVM->hwaccm.s.fNestedPaging)
         {
-            pVMCB->ctrl.u64NestedPagingCR3  = PGMGetHyperCR3(pVM);
+            pVMCB->ctrl.u64NestedPagingCR3  = PGMGetNestedCR3(pVM, PGMGetHostMode(pVM));
             pVMCB->guest.u64CR3             = pCtx->cr3;
         }
@@ -1292 +1292 @@
 
         /* Handle the pagefault trap for the nested shadow table. */
-        rc = PGMR0Trap0eHandlerNestedPaging(pVM, PGMGetShadowMode(pVM), errCode, CPUMCTX2CORE(pCtx), uFaultAddress);
+        rc = PGMR0Trap0eHandlerNestedPaging(pVM, PGMGetHostMode(pVM), errCode, CPUMCTX2CORE(pCtx), uFaultAddress);
         Log2(("PGMR0Trap0eHandlerNestedPaging %VGv returned %Vrc\n", pCtx->eip, rc));
         if (rc == VINF_SUCCESS)