Changeset 16579 in vbox for trunk

Timestamp:

Feb 9, 2009 12:07:16 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: More updates

Location:

trunk/src/VBox/VMM

Files:

• PGMBth.h (modified) (1 diff)
• VMMAll/PGMAll.cpp (modified) (9 diffs)
• VMMAll/PGMAllPool.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMBth.h

@@ -142 +142 @@
     Assert(!HWACCMIsNestedPagingActive(pVM));
     /* We only need shadow paging in real and protected mode for VT-x and AMD-V (excluding nested paging/EPT modes) */
-    if (HWACCMR3IsActive(pVM))
+    if (HWACCMIsEnabled(pVM))
     {
         /* Free the previous root mapping if still active. */

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

@@ -872 +872 @@
 DECLINLINE(int) pgmShwSyncPaePDPtr(PVM pVM, RTGCPTR GCPtr, PX86PDPE pGstPdpe, PX86PDPAE *ppPD)
 {
-    const unsigned iPdPt = (GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE;
-    PX86PDPT       pPdpt = pgmShwGetPaePDPTPtr(&pVM->pgm.s);
-    PX86PDPE       pPdpe = &pPdpt->a[iPdPt];
-    PPGMPOOL       pPool         = pVM->pgm.s.CTX_SUFF(pPool);
-    bool           fNestedPaging = HWACCMIsNestedPagingActive(pVM);
-    bool           fPaging       = !!(CPUMGetGuestCR0(pVM) & X86_CR0_PG);
+    const unsigned iPdPt    = (GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE;
+    PX86PDPT       pPdpt    = pgmShwGetPaePDPTPtr(&pVM->pgm.s);
+    PX86PDPE       pPdpe    = &pPdpt->a[iPdPt];
+    PPGMPOOL       pPool    = pVM->pgm.s.CTX_SUFF(pPool);
     PPGMPOOLPAGE   pShwPage;
     int            rc;
@@ -885 +883 @@
         &&  !(pPdpe->u & X86_PDPE_PG_MASK))
     {
-        if (!fNestedPaging)
+        bool        fNestedPaging = HWACCMIsNestedPagingActive(pVM);
+        bool        fPaging       = !!(CPUMGetGuestCR0(pVM) & X86_CR0_PG);
+        RTGCPTR64   GCPdPt;
+        PGMPOOLKIND enmKind;
+
+        if (fNestedPaging || !fPaging)
+        {
+            /* AMD-V nested paging or real/protected mode without paging */
+            GCPdPt  = (RTGCPTR64)iPdPt << X86_PDPT_SHIFT;
+            enmKind = PGMPOOLKIND_PAE_PD_PHYS;
+        }
+        else
         {
             Assert(pGstPdpe);
-            Assert(!(pPdpe->u & X86_PDPE_PG_MASK));
-            /* Create a reference back to the PDPT by using the index in its shadow page. */
-            rc = pgmPoolAlloc(pVM, pGstPdpe->u & X86_PDPE_PG_MASK, PGMPOOLKIND_PAE_PD_FOR_PAE_PD, pVM->pgm.s.CTX_SUFF(pShwPageCR3)->idx, iPdPt, &pShwPage);
-        }
-        else
-        {
-            /* AMD-V nested paging or real/protected mode without paging */
-            RTGCPTR64 GCPdPt = (RTGCPTR64)iPdPt << EPT_PDPT_SHIFT;
-
-            rc = pgmPoolAlloc(pVM, GCPdPt + RT_BIT_64(62) /* hack: make the address unique */, PGMPOOLKIND_PAE_PD_PHYS, pVM->pgm.s.CTX_SUFF(pShwPageCR3)->idx, iPdPt, &pShwPage);
-        }
-
+
+            GCPdPt  = pGstPdpe->u & X86_PDPE_PG_MASK;
+            enmKind = PGMPOOLKIND_PAE_PD_FOR_PAE_PD;
+        }
+
+        /* Create a reference back to the PDPT by using the index in its shadow page. */
+        rc = pgmPoolAlloc(pVM, GCPdPt, enmKind, pVM->pgm.s.CTX_SUFF(pShwPageCR3)->idx, iPdPt, &pShwPage);
         if (rc == VERR_PGM_POOL_FLUSHED)
         {
@@ -971 +975 @@
     PX86PML4E      pPml4e        = pgmShwGetLongModePML4EPtr(pPGM, iPml4);
     bool           fNestedPaging = HWACCMIsNestedPagingActive(pVM);
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+    bool           fPaging      = !!(CPUMGetGuestCR0(pVM) & X86_CR0_PG);
+#endif
     PPGMPOOLPAGE   pShwPage;
     int            rc;
@@ -978 +985 @@
         &&  !(pPml4e->u & X86_PML4E_PG_MASK))
     {
-        Assert(!(pPml4e->u & X86_PML4E_PG_MASK));
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+        RTGCPTR64   GCPml4;
+        PGMPOOLKIND enmKind;
+
+        Assert(pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+
+        if (fNestedPaging || !fPaging)
+        {
+            /* AMD-V nested paging or real/protected mode without paging */
+            GCPml4  = (RTGCPTR64)iPml4 << X86_PML4_SHIFT;
+            enmKind = PGMPOOLKIND_64BIT_PDPT_FOR_PHYS;
+        }
+        else
+        {
+            Assert(pGstPml4e && pGstPdpe);
+
+            GCPml4  = pGstPml4e->u & X86_PML4E_PG_MASK;
+            enmKind = PGMPOOLKIND_64BIT_PDPT_FOR_64BIT_PDPT;
+        }
+
+        /* Create a reference back to the PDPT by using the index in its shadow page. */
+        rc = pgmPoolAlloc(pVM, GCPml4, enmKind, pVM->pgm.s.CTX_SUFF(pShwPageCR3)->idx, iPml4, &pShwPage);
+#else
         if (!fNestedPaging)
         {
@@ -994 +1023 @@
                               PGMPOOLKIND_64BIT_PDPT_FOR_PHYS, PGMPOOL_IDX_NESTED_ROOT, iPml4, &pShwPage);
         }
-
+#endif
         if (rc == VERR_PGM_POOL_FLUSHED)
         {
@@ -1021 +1050 @@
         &&  !(pPdpe->u & X86_PDPE_PG_MASK))
     {
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+        RTGCPTR64   GCPdPt;
+        PGMPOOLKIND enmKind;
+
+        if (fNestedPaging || !fPaging)
+        {
+            /* AMD-V nested paging or real/protected mode without paging */
+            GCPdPt  = (RTGCPTR64)iPdPt << X86_PDPT_SHIFT;
+            enmKind = PGMPOOLKIND_64BIT_PD_FOR_PHYS;
+        }
+        else
+        {
+            Assert(pGstPdpe);
+
+            GCPdPt  = pGstPdpe->u & X86_PDPE_PG_MASK;
+            enmKind = PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD;
+        }
+
+        /* Create a reference back to the PDPT by using the index in its shadow page. */
+        rc = pgmPoolAlloc(pVM, GCPdPt, enmKind, pVM->pgm.s.CTX_SUFF(pShwPageCR3)->idx, iPdPt, &pShwPage);
+#else
         if (!fNestedPaging)
         {
@@ -1035 +1085 @@
             rc = pgmPoolAlloc(pVM, GCPdPt + RT_BIT_64(62) /* hack: make the address unique */, PGMPOOLKIND_64BIT_PD_FOR_PHYS, pShwPage->idx, iPdPt, &pShwPage);
         }
-
+#endif
         if (rc == VERR_PGM_POOL_FLUSHED)
         {
@@ -1134 +1184 @@
         RTGCPTR64 GCPml4 = (RTGCPTR64)iPml4 << EPT_PML4_SHIFT;
 
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+        rc = pgmPoolAlloc(pVM, GCPml4, PGMPOOLKIND_EPT_PDPT_FOR_PHYS, PGMPOOL_IDX_NESTED_ROOT, iPml4, &pShwPage);
+#else
         rc = pgmPoolAlloc(pVM, GCPml4 + RT_BIT_64(63) /* hack: make the address unique */, PGMPOOLKIND_EPT_PDPT_FOR_PHYS, PGMPOOL_IDX_NESTED_ROOT, iPml4, &pShwPage);
+#endif
         if (rc == VERR_PGM_POOL_FLUSHED)
         {
@@ -1168 +1222 @@
         RTGCPTR64 GCPdPt = (RTGCPTR64)iPdPt << EPT_PDPT_SHIFT;
 
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+        rc = pgmPoolAlloc(pVM, GCPdPt, PGMPOOLKIND_64BIT_PD_FOR_PHYS, pShwPage->idx, iPdPt, &pShwPage);
+#else
         rc = pgmPoolAlloc(pVM, GCPdPt + RT_BIT_64(62) /* hack: make the address unique */, PGMPOOLKIND_64BIT_PD_FOR_PHYS, pShwPage->idx, iPdPt, &pShwPage);
+#endif
         if (rc == VERR_PGM_POOL_FLUSHED)
         {

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

@@ -1272 +1272 @@
          */
         case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
+        case PGMPOOLKIND_32BIT_PD_PHYS:
         case PGMPOOLKIND_PAE_PT_FOR_PHYS:
+        case PGMPOOLKIND_PAE_PD_PHYS:
+        case PGMPOOLKIND_PAE_PDPT_PHYS:
         case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
         case PGMPOOLKIND_64BIT_PD_FOR_PHYS:
+        case PGMPOOLKIND_EPT_PT_FOR_PHYS:
+        case PGMPOOLKIND_EPT_PD_FOR_PHYS:
         case PGMPOOLKIND_EPT_PDPT_FOR_PHYS:
-        case PGMPOOLKIND_EPT_PD_FOR_PHYS:
-        case PGMPOOLKIND_EPT_PT_FOR_PHYS:
-        case PGMPOOLKIND_PAE_PD_PHYS:
-        case PGMPOOLKIND_PAE_PDPT_PHYS:
-        case PGMPOOLKIND_32BIT_PD_PHYS:
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+            return false;
+#else
             return true;
+#endif
 
         /*