Changeset 15348 in vbox

Timestamp:

Dec 12, 2008 2:00:10 AM (16 years ago)

Author:

vboxsync

Message:

#3202: Optimized PGMPOOL_PAGE_2_PTR for darwin/R0 and */RC.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (8 diffs)
• VMMAll/PGMAllPool.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -1817 +1817 @@
 
 
+#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+DECLINLINE(void *) pgmPoolMapPageInlined(PVM pVM, PPGMPOOLPAGE pPage);
+#endif
+
 /** @def PGMPOOL_PAGE_2_PTR
  * Maps a pool page pool into the current context.
@@ -1824 +1828 @@
  * @param   pPage   The pool page.
  *
- * @remark  In HC this uses PGMGCDynMapHCPage(), so it will consume of the
+ * @remark  In RC this uses PGMGCDynMapHCPage(), so it will consume of the
  *          small page window employeed by that function. Be careful.
  * @remark  There is no need to assert on the result.
  */
 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-# define PGMPOOL_PAGE_2_PTR(pVM, pPage)    pgmPoolMapPage((pVM), (pPage))
+# define PGMPOOL_PAGE_2_PTR(pVM, pPage)  pgmPoolMapPageInlined(&(pVM)->pgm.s, (pPage))
+#elif defined(VBOX_STRICT)
+# define PGMPOOL_PAGE_2_PTR(pVM, pPage)  pgmPoolMapPageStrict(pPage)
+DECLINLINE(void *) pgmPoolMapPageStrict(PPGMPOOLPAGE pPage)
+{
+    Assert(pPage->pvPageR3);
+    return pPage->pvPageR3;
+}
 #else
- DECLINLINE(R3R0PTRTYPE(void *)) PGMPOOL_PAGE_2_PTR(PVM pVM, PPGMPOOLPAGE pPage)
- {
-     Assert(pPage->pvPageR3);
-     return pPage->pvPageR3;
- }
-#endif
+# define PGMPOOL_PAGE_2_PTR(pVM, pPage)  ((pPage)->pvPageR3)
+#endif
+
+/** @def PGMPOOL_PAGE_2_PTR_BY_PGM
+ * Maps a pool page pool into the current context.
+ *
+ * @returns VBox status code.
+ * @param   pPGM    Pointer to the PGM instance data.
+ * @param   pPage   The pool page.
+ *
+ * @remark  In RC this uses PGMGCDynMapHCPage(), so it will consume of the
+ *          small page window employeed by that function. Be careful.
+ * @remark  There is no need to assert on the result.
+ */
+#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+# define PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pPage)  pgmPoolMapPageInlined((pPGM), (pPage))
+#else
+# define PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pPage)  PGMPOOL_PAGE_2_PTR(PGM2VM(pPGM), pPage)
+#endif
+
 
 
@@ -2897 +2922 @@
 #endif
 #if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
-void           *pgmPoolMapPage(PVM pVM, PPGMPOOLPAGE pPage);
+void           *pgmPoolMapPageFallback(PPGM pPGM, PPGMPOOLPAGE pPage);
 #endif
 int             pgmPoolAlloc(PVM pVM, RTGCPHYS GCPhys, PGMPOOLKIND enmKind, uint16_t iUser, uint32_t iUserTable, PPPGMPOOLPAGE ppPage);
@@ -4076 +4101 @@
 {
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    return (PX86PD)PGMPOOL_PAGE_2_PTR(PGM2VM(pPGM), pPGM->CTX_SUFF(pShwPageCR3));
+    return (PX86PD)PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pPGM->CTX_SUFF(pShwPageCR3));
 #else
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
@@ -4139 +4164 @@
 {
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    return (PX86PDPT)PGMPOOL_PAGE_2_PTR(PGM2VM(pPGM), pPGM->CTX_SUFF(pShwPageCR3));
+    return (PX86PDPT)PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pPGM->CTX_SUFF(pShwPageCR3));
 #else
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
@@ -4171 +4196 @@
     AssertReturn(pShwPde, NULL);
 
-    return (PX86PDPAE)PGMPOOL_PAGE_2_PTR(PGM2VM(pPGM), pShwPde);
+    return (PX86PDPAE)PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pShwPde);
 #else
     const unsigned  iPdpt = (GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE;
@@ -4236 +4261 @@
 {
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    return (PX86PML4)PGMPOOL_PAGE_2_PTR(PGM2VM(pPGM), pPGM->CTX_SUFF(pShwPageCR3));
+    return (PX86PML4)PGMPOOL_PAGE_2_PTR_BY_PGM(pPGM, pPGM->CTX_SUFF(pShwPageCR3));
 #else
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
@@ -4587 +4612 @@
 #endif /* PGMPOOL_WITH_CACHE */
 
+
+#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+/**
+ * Maps the page into current context (RC and maybe R0).
+ *
+ * @returns pointer to the mapping.
+ * @param   pVM         Pointer to the PGM instance data.
+ * @param   pPage       The page.
+ */
+DECLINLINE(void *) pgmPoolMapPageInlined(PPGM pPGM, PPGMPOOLPAGE pPage)
+{
+    if (pPage->idx >= PGMPOOL_IDX_FIRST)
+    {
+        Assert(pPage->idx < pPGM->CTX_SUFF(pPool)->cCurPages);
+        void *pv;
+# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+        int rc = pgmR0DynMapHCPageInlined(pPGM, pPage->Core.Key, &pv);
+# else
+        int rc = PGMDynMapHCPage(PGM2VM(pPGM), pPage->Core.Key, &pv);
+# endif
+        if (RT_SUCCESS(rc))
+            return pv;
+    }
+    return pgmPoolMapPageFallback(pPGM, pPage);
+}
+#endif
+
+
 /**
  * Tells if mappings are to be put into the shadow page table or not

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

@@ -92 +92 @@
  *
  * @returns Pointer to the mapping.
- * @param   pVM     The VM handle.
+ * @param   pPGM    Pointer to the PGM instance data.
  * @param   pPage   The page to map.
  */
-void *pgmPoolMapPage(PVM pVM, PPGMPOOLPAGE pPage)
-{
-    /* general pages. */
-    if (pPage->idx >= PGMPOOL_IDX_FIRST)
-    {
-        Assert(pPage->idx < pVM->pgm.s.CTX_SUFF(pPool)->cCurPages);
-        void *pv;
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-        int rc = pgmR0DynMapHCPageInlined(&pVM->pgm.s, pPage->Core.Key, &pv);
-# else
-        int rc = PGMDynMapHCPage(pVM, pPage->Core.Key, &pv);
-# endif
-        AssertReleaseRC(rc);
-        return pv;
-    }
-
+void *pgmPoolMapPageFallback(PPGM pPGM, PPGMPOOLPAGE pPage)
+{
+    /* general pages are take care of by the inlined part, it
+       only ends up here in case of failure. */
+    AssertReleaseReturn(pPage->idx < PGMPOOL_IDX_FIRST, NULL);
+
+/** @todo make sure HCPhys is valid for *all* indexes. */
     /* special pages. */
 # ifdef IN_RC
@@ -116 +107 @@
     {
         case PGMPOOL_IDX_PD:
-            return pVM->pgm.s.pShw32BitPdRC;
+            return pPGM->pShw32BitPdRC;
         case PGMPOOL_IDX_PAE_PD:
         case PGMPOOL_IDX_PAE_PD_0:
-            return pVM->pgm.s.apShwPaePDsRC[0];
+            return pPGM->apShwPaePDsRC[0];
         case PGMPOOL_IDX_PAE_PD_1:
-            return pVM->pgm.s.apShwPaePDsRC[1];
+            return pPGM->apShwPaePDsRC[1];
         case PGMPOOL_IDX_PAE_PD_2:
-            return pVM->pgm.s.apShwPaePDsRC[2];
+            return pPGM->apShwPaePDsRC[2];
         case PGMPOOL_IDX_PAE_PD_3:
-            return pVM->pgm.s.apShwPaePDsRC[3];
+            return pPGM->apShwPaePDsRC[3];
         case PGMPOOL_IDX_PDPT:
-            return pVM->pgm.s.pShwPaePdptRC;
+            return pPGM->pShwPaePdptRC;
         default:
             AssertReleaseMsgFailed(("Invalid index %d\n", pPage->idx));
@@ -138 +129 @@
     {
         case PGMPOOL_IDX_PD:
-            HCPhys = pVM->pgm.s.HCPhysShw32BitPD;
+            HCPhys = pPGM->HCPhysShw32BitPD;
             break;
         case PGMPOOL_IDX_PAE_PD_0:
-            HCPhys = pVM->pgm.s.aHCPhysPaePDs[0];
+            HCPhys = pPGM->aHCPhysPaePDs[0];
             break;
         case PGMPOOL_IDX_PAE_PD_1:
-            HCPhys = pVM->pgm.s.aHCPhysPaePDs[1];
+            HCPhys = pPGM->aHCPhysPaePDs[1];
             break;
         case PGMPOOL_IDX_PAE_PD_2:
-            HCPhys = pVM->pgm.s.aHCPhysPaePDs[2];
+            HCPhys = pPGM->aHCPhysPaePDs[2];
             break;
         case PGMPOOL_IDX_PAE_PD_3:
-            HCPhys = pVM->pgm.s.aHCPhysPaePDs[3];
+            HCPhys = pPGM->aHCPhysPaePDs[3];
             break;
         case PGMPOOL_IDX_PDPT:
-            HCPhys = pVM->pgm.s.HCPhysShwPaePdpt;
+            HCPhys = pPGM->HCPhysShwPaePdpt;
             break;
         case PGMPOOL_IDX_PAE_PD:
@@ -163 +154 @@
     }
     void *pv;
-    int rc = pgmR0DynMapHCPageInlined(&pVM->pgm.s, HCPhys, &pv);
-    AssertReleaseRC(rc);
+    int rc = pgmR0DynMapHCPageInlined(pPGM, HCPhys, &pv);
+    AssertReleaseRCReturn(rc, NULL);
     return pv;
 # endif /* VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */