Changeset 93617 in vbox for trunk/src/VBox

Timestamp:

Feb 6, 2022 8:35:16 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PGMPool: Replaced MMR3HyperAllocOnceNoRel call with direct SUPR3PageAllocEx call, replacing a few associated MMHyperCCToR3/R0 calls with speedier pgmPoolConvertPageToR3/R0 ones. bugref:10093

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllBth.h (modified) (2 diffs)
• VMMAll/PGMAllShw.h (modified) (1 diff)
• VMMR3/PGMPool.cpp (modified) (3 diffs)
• include/PGMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -141 +141 @@
     AssertRCReturn(rc, rc);
 
-    pVCpu->pgm.s.pShwPageCR3R3 = (R3PTRTYPE(PPGMPOOLPAGE))MMHyperCCToR3(pVM, pNewShwPageCR3);
-    pVCpu->pgm.s.pShwPageCR3R0 = (R0PTRTYPE(PPGMPOOLPAGE))MMHyperCCToR0(pVM, pNewShwPageCR3);
+    pVCpu->pgm.s.pShwPageCR3R3 = pgmPoolConvertPageToR3(pPool, pNewShwPageCR3);
+    pVCpu->pgm.s.pShwPageCR3R0 = pgmPoolConvertPageToR0(pPool, pNewShwPageCR3);
 
     /* Mark the page as locked; disallow flushing. */
@@ -4243 +4243 @@
     AssertFatalRC(rc2);
 
-    pVCpu->pgm.s.CTX_SUFF(pShwPageCR3) = pNewShwPageCR3;
-#  ifdef IN_RING0
-    pVCpu->pgm.s.pShwPageCR3R3 = MMHyperCCToR3(pVM, pVCpu->pgm.s.CTX_SUFF(pShwPageCR3));
-#  else
-    pVCpu->pgm.s.pShwPageCR3R0 = MMHyperCCToR0(pVM, pVCpu->pgm.s.CTX_SUFF(pShwPageCR3));
-#  endif
+    pVCpu->pgm.s.pShwPageCR3R3 = pgmPoolConvertPageToR3(pPool, pNewShwPageCR3);
+    pVCpu->pgm.s.pShwPageCR3R0 = pgmPoolConvertPageToR0(pPool, pNewShwPageCR3);
 
     /* Set the current hypervisor CR3. */

trunk/src/VBox/VMM/VMMAll/PGMAllShw.h

@@ -245 +245 @@
     AssertLogRelRCReturnStmt(rc, PGM_UNLOCK(pVM), rc);
 
-    pVCpu->pgm.s.pShwPageCR3R3 = (R3PTRTYPE(PPGMPOOLPAGE))MMHyperCCToR3(pVM, pNewShwPageCR3);
-    pVCpu->pgm.s.pShwPageCR3R0 = (R0PTRTYPE(PPGMPOOLPAGE))MMHyperCCToR0(pVM, pNewShwPageCR3);
+    pVCpu->pgm.s.pShwPageCR3R3 = pgmPoolConvertPageToR3(pVM->pgm.s.CTX_SUFF(pPool), pNewShwPageCR3);
+    pVCpu->pgm.s.pShwPageCR3R0 = pgmPoolConvertPageToR0(pVM->pgm.s.CTX_SUFF(pPool), pNewShwPageCR3);
 
     PGM_UNLOCK(pVM);

trunk/src/VBox/VMM/VMMR3/PGMPool.cpp

@@ -233 +233 @@
     cb += cMaxPhysExts * sizeof(PGMPOOLPHYSEXT);
     PPGMPOOL pPool;
-    rc = MMR3HyperAllocOnceNoRel(pVM, cb, 0, MM_TAG_PGM_POOL, (void **)&pPool);
+    RTR0PTR  pPoolR0;
+    rc = SUPR3PageAllocEx(RT_ALIGN_32(cb, HOST_PAGE_SIZE) >> HOST_PAGE_SHIFT, 0 /*fFlags*/, (void **)&pPool, &pPoolR0, NULL);
     if (RT_FAILURE(rc))
         return rc;
-    pVM->pgm.s.pPoolR3 = pPool;
-    pVM->pgm.s.pPoolR0 = MMHyperR3ToR0(pVM, pPool);
+    Assert(ASMMemIsZero(pPool, cb));
+    pVM->pgm.s.pPoolR3 = pPool->pPoolR3 = pPool;
+    pVM->pgm.s.pPoolR0 = pPool->pPoolR0 = pPoolR0;
 
     /*
@@ -250 +252 @@
     PPGMPOOLUSER paUsers = (PPGMPOOLUSER)&pPool->aPages[pPool->cMaxPages];
     pPool->paUsersR3 = paUsers;
-    pPool->paUsersR0 = MMHyperR3ToR0(pVM, paUsers);
+    pPool->paUsersR0 = pPoolR0 + (uintptr_t)paUsers - (uintptr_t)pPool;
     for (unsigned i = 0; i < cMaxUsers; i++)
     {
@@ -262 +264 @@
     PPGMPOOLPHYSEXT paPhysExts = (PPGMPOOLPHYSEXT)&paUsers[cMaxUsers];
     pPool->paPhysExtsR3 = paPhysExts;
-    pPool->paPhysExtsR0 = MMHyperR3ToR0(pVM, paPhysExts);
+    pPool->paPhysExtsR0 = pPoolR0 + (uintptr_t)paPhysExts - (uintptr_t)pPool;
     for (unsigned i = 0; i < cMaxPhysExts; i++)
     {

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -1984 +1984 @@
     /** The VM handle - R0 Ptr. */
     R0PTRTYPE(PVMCC)            pVMR0;
+    /** The ring-3 pointer to this structure. */
+    R3PTRTYPE(struct PGMPOOL *) pPoolR3;
+    /** The ring-0 pointer to this structure. */
+    R0PTRTYPE(struct PGMPOOL *) pPoolR0;
     /** The max pool size. This includes the special IDs. */
     uint16_t                    cMaxPages;
@@ -3666 +3670 @@
 void            pgmPoolResetDirtyPage(PVMCC pVM, RTGCPTR GCPtrPage);
 
+/** Gets the ring-0 pointer for the given pool page. */
+DECLINLINE(R0PTRTYPE(PPGMPOOLPAGE)) pgmPoolConvertPageToR0(PPGMPOOL pPool, PPGMPOOLPAGE pPage)
+{
+#ifdef IN_RING3
+    size_t offPage = (uintptr_t)pPage - (uintptr_t)pPool;
+# ifdef VBOX_STRICT
+    size_t iPage   = (offPage - RT_UOFFSETOF(PGMPOOL, aPages)) / sizeof(*pPage);
+    AssertReturn(iPage < pPool->cMaxPages, NIL_RTR0PTR);
+    AssertReturn(iPage * sizeof(*pPage) + RT_UOFFSETOF(PGMPOOL, aPages) == offPage, NIL_RTR0PTR);
+# endif
+    return pPool->pPoolR0 + offPage;
+#else
+    RT_NOREF(pPool);
+    return pPage;
+#endif
+}
+
+/** Gets the ring-3 pointer for the given pool page. */
+DECLINLINE(R3PTRTYPE(PPGMPOOLPAGE)) pgmPoolConvertPageToR3(PPGMPOOL pPool, PPGMPOOLPAGE pPage)
+{
+#ifdef IN_RING3
+    RT_NOREF(pPool);
+    return pPage;
+#else
+    size_t offPage = (uintptr_t)pPage - (uintptr_t)pPool;
+# ifdef VBOX_STRICT
+    size_t iPage   = (offPage - RT_UOFFSETOF(PGMPOOL, aPages)) / sizeof(*pPage);
+    AssertReturn(iPage < pPool->cMaxPages, NIL_RTR3PTR);
+    AssertReturn(iPage * sizeof(*pPage) + RT_UOFFSETOF(PGMPOOL, aPages) == offPage, NIL_RTR3PTR);
+# endif
+    return pPool->pPoolR3 + offPage;
+#endif
+}
+
 int             pgmR3ExitShadowModeBeforePoolFlush(PVMCPU pVCpu);
 int             pgmR3ReEnterShadowModeAfterPoolFlush(PVM pVM, PVMCPU pVCpu);