Changeset 9092 in vbox for trunk/src/VBox

Timestamp:

May 23, 2008 4:03:14 PM (17 years ago)

Author:

vboxsync

Message:

We need a real shadow paging backend for PGMHandlerPhysicalPageTempOff (e.g. VGA optimization).

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (5 diffs)
• VMMR0/HWSVMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGM.cpp

@@ -2578 +2578 @@
     rc = PGM_BTH_NAME_AMD64_AMD64(InitData)( pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
 
+    /* The nested paging mode. */
     pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_NESTED, PGM_TYPE_REAL)];
     pModeData->uShwType = PGM_TYPE_NESTED;
     pModeData->uGstType = PGM_TYPE_REAL;
-    rc = PGM_SHW_NAME_NESTED(InitData)(      pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
     rc = PGM_GST_NAME_REAL(InitData)(        pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
     rc = PGM_BTH_NAME_NESTED_REAL(InitData)( pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
@@ -2588 +2588 @@
     pModeData->uShwType = PGM_TYPE_NESTED;
     pModeData->uGstType = PGM_TYPE_PROT;
-    rc = PGM_SHW_NAME_NESTED(InitData)(      pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
     rc = PGM_GST_NAME_PROT(InitData)(        pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
     rc = PGM_BTH_NAME_NESTED_PROT(InitData)( pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
@@ -2595 +2594 @@
     pModeData->uShwType = PGM_TYPE_NESTED;
     pModeData->uGstType = PGM_TYPE_32BIT;
-    rc = PGM_SHW_NAME_NESTED(InitData)(      pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
     rc = PGM_GST_NAME_32BIT(InitData)(       pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
     rc = PGM_BTH_NAME_NESTED_32BIT(InitData)(pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
@@ -2602 +2600 @@
     pModeData->uShwType = PGM_TYPE_NESTED;
     pModeData->uGstType = PGM_TYPE_PAE;
-    rc = PGM_SHW_NAME_NESTED(InitData)(      pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
     rc = PGM_GST_NAME_PAE(InitData)(         pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
     rc = PGM_BTH_NAME_NESTED_PAE(InitData)(  pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
@@ -2609 +2606 @@
     pModeData->uShwType = PGM_TYPE_NESTED;
     pModeData->uGstType = PGM_TYPE_AMD64;
-    rc = PGM_SHW_NAME_NESTED(InitData)(       pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
     rc = PGM_GST_NAME_AMD64(InitData)(        pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
     rc = PGM_BTH_NAME_NESTED_AMD64(InitData)( pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
 
+    /* The shadow part of the nested callback mode depends on the host paging mode (AMD-V only). */
+    switch(pVM->pgm.s.enmHostMode)
+    {
+    case SUPPAGINGMODE_32_BIT:
+    case SUPPAGINGMODE_32_BIT_GLOBAL:
+        for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_AMD64;i++)
+        {
+            pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_NESTED, i)];
+            rc = PGM_SHW_NAME_32BIT(InitData)(      pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+        }
+        break;
+
+    case SUPPAGINGMODE_PAE:
+    case SUPPAGINGMODE_PAE_NX:
+    case SUPPAGINGMODE_PAE_GLOBAL:
+    case SUPPAGINGMODE_PAE_GLOBAL_NX:
+        for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_AMD64;i++)
+        {
+            pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_NESTED, i)];
+            rc = PGM_SHW_NAME_PAE(InitData)(      pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+        }
+        break;
+
+    case SUPPAGINGMODE_AMD64:
+    case SUPPAGINGMODE_AMD64_GLOBAL:
+    case SUPPAGINGMODE_AMD64_NX:
+    case SUPPAGINGMODE_AMD64_GLOBAL_NX:
+        for (unsigned i=PGM_TYPE_REAL;i<=PGM_TYPE_AMD64;i++)
+        {
+            pModeData = &pVM->pgm.s.paModeData[pgmModeDataIndex(PGM_TYPE_NESTED, i)];
+            rc = PGM_SHW_NAME_AMD64(InitData)(      pVM, pModeData, fResolveGCAndR0); AssertRCReturn(rc, rc);
+        }
+        break;
+    }
     return VINF_SUCCESS;
 }

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

@@ -1422 +1422 @@
         Assert(!pVM->hwaccm.s.fNestedPaging);
 
-        /* Truly a pita. Why can't SVM give the same information as VMX? */
+        /* Truly a pita. Why can't SVM give the same information as VT-x? */
         rc = SVMR0InterpretInvpg(pVM, CPUMCTX2CORE(pCtx), pVMCB->ctrl.TLBCtrl.n.u32ASID);
         if (rc == VINF_SUCCESS)