Changeset 37242 in vbox for trunk

Timestamp:

May 27, 2011 4:17:12 PM (14 years ago)

Author:

vboxsync

Message:

GMMR0: Keep the free bound-mode memory in the GVM instead of in GMM.

Location:

trunk

Files:

• include/VBox/vmm/gvm.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/GMMR0.cpp (modified) (28 diffs)
• src/VBox/VMM/VMMR0/GMMR0Internal.h (modified) (2 diffs)

trunk/include/VBox/vmm/gvm.h

@@ -100 +100 @@
         struct GMMPERVM     s;
 #endif
-        uint8_t             padding[256];
+        uint8_t             padding[512];
     } gmm;
-    
+
     /** The RAWPCIVM per vm data. */
     union

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

@@ -176 +176 @@
 /** Pointer to set of free chunks.  */
 typedef struct GMMCHUNKFREESET *PGMMCHUNKFREESET;
-
-/** Pointer to a GMM allocation chunk. */
-typedef struct GMMCHUNK *PGMMCHUNK;
 
 /**
@@ -467 +464 @@
 
 
-/** The GMMCHUNK::cFree shift count employed by gmmR0SelectFreeSetList. */
-#define GMM_CHUNK_FREE_SET_SHIFT    4
-/** Index of the list containing completely unused chunks.
- * The code ASSUMES this is the last list. */
-#define GMM_CHUNK_FREE_SET_UNUSED_LIST  (GMM_CHUNK_NUM_PAGES >> GMM_CHUNK_FREE_SET_SHIFT)
-
-
-
-/**
- * A set of free chunks.
- */
-typedef struct GMMCHUNKFREESET
-{
-    /** The number of free pages in the set. */
-    uint64_t            cFreePages;
-    /** The generation ID for the set.  This is incremented whenever
-     *  something is linked or unlinked from this set. */
-    uint64_t            idGeneration;
-    /** Chunks ordered by increasing number of free pages.
-     *  In the final list the chunks are completely unused. */
-    PGMMCHUNK           apLists[GMM_CHUNK_FREE_SET_UNUSED_LIST + 1];
-} GMMCHUNKFREESET;
-
-
 /**
  * The GMM instance data.
@@ -512 +485 @@
     GMMCHUNKTLB         ChunkTLB;
     /** The private free set. */
-    GMMCHUNKFREESET     Private;
+    GMMCHUNKFREESET     PrivateX;
     /** The shared free set. */
     GMMCHUNKFREESET     Shared;
@@ -717 +690 @@
 static DECLCALLBACK(int)     gmmR0TermDestroyChunk(PAVLU32NODECORE pNode, void *pvGMM);
 static bool                  gmmR0CleanupVMScanChunk(PGMM pGMM, PGVM pGVM, PGMMCHUNK pChunk);
+DECLINLINE(void)             gmmR0UnlinkChunk(PGMMCHUNK pChunk);
 DECLINLINE(void)             gmmR0LinkChunk(PGMMCHUNK pChunk, PGMMCHUNKFREESET pSet);
-DECLINLINE(void)             gmmR0UnlinkChunk(PGMMCHUNK pChunk);
+DECLINLINE(void)             gmmR0SelectSetAndLinkChunk(PGMM pGMM, PGVM pGVM, PGMMCHUNK pChunk);
 static uint32_t              gmmR0SanityCheck(PGMM pGMM, const char *pszFunction, unsigned uLineNo);
 static bool                  gmmR0FreeChunk(PGMM pGMM, PGVM pGVM, PGMMCHUNK pChunk, bool fRelaxedSem);
-static void                  gmmR0FreeSharedPage(PGMM pGMM, uint32_t idPage, PGMMPAGE pPage);
+static void                  gmmR0FreeSharedPage(PGMM pGMM, PGVM pGVM, uint32_t idPage, PGMMPAGE pPage);
 static int                   gmmR0UnmapChunkLocked(PGMM pGMM, PGVM pGVM, PGMMCHUNK pChunk);
 static void                  gmmR0SharedModuleCleanup(PGMM pGMM, PGVM pGVM);
@@ -1247 +1221 @@
          * Free empty chunks.
          */
+        PGMMCHUNKFREESET pPrivateSet = pGMM->fBoundMemoryMode ? &pGVM->gmm.s.Private : &pGMM->PrivateX;
         do
         {
             fRedoFromStart = false;
             iCountDown = 10240;
-            pChunk = pGMM->Private.apLists[GMM_CHUNK_FREE_SET_UNUSED_LIST];
+            pChunk = pPrivateSet->apLists[GMM_CHUNK_FREE_SET_UNUSED_LIST];
             while (pChunk)
             {
@@ -1259 +1234 @@
                     || pChunk->hGVM == pGVM->hSelf)
                 {
-                    uint64_t const idGenerationOld = pGMM->Private.idGeneration;
+                    uint64_t const idGenerationOld = pPrivateSet->idGeneration;
                     if (gmmR0FreeChunk(pGMM, pGVM, pChunk, true /*fRelaxedSem*/))
                     {
                         /* We've left the giant mutex, restart? (+1 for our unlink) */
-                        fRedoFromStart = pGMM->Private.idGeneration != idGenerationOld + 1;
+                        fRedoFromStart = pPrivateSet->idGeneration != idGenerationOld + 1;
                         if (fRedoFromStart)
                             break;
@@ -1275 +1250 @@
                 if (--iCountDown == 0)
                 {
-                    uint64_t const idGenerationOld = pGMM->Private.idGeneration;
+                    uint64_t const idGenerationOld = pPrivateSet->idGeneration;
                     fRedoFromStart = gmmR0MutexYield(pGMM, &uLockNanoTS)
-                                  && pGMM->Private.idGeneration != idGenerationOld;
+                                  && pPrivateSet->idGeneration != idGenerationOld;
                     if (fRedoFromStart)
                         break;
@@ -1387 +1362 @@
                 cShared++;
 
-        gmmR0LinkChunk(pChunk, pChunk->cShared ? &g_pGMM->Shared : &g_pGMM->Private);
+        gmmR0SelectSetAndLinkChunk(pGMM, pGVM, pChunk);
 
         /*
@@ -1420 +1395 @@
             gmmR0UnlinkChunk(pChunk);
             pChunk->cFree = GMM_CHUNK_NUM_PAGES;
-            gmmR0LinkChunk(pChunk, pChunk->cShared ? &g_pGMM->Shared : &g_pGMM->Private);
+            gmmR0SelectSetAndLinkChunk(pGMM, pGVM, pChunk);
         }
     }
@@ -1717 +1692 @@
     uint32_t cErrors = 0;
 
-    cErrors += gmmR0SanityCheckSet(pGMM, &pGMM->Private, "private", pszFunction, uLineNo);
-    cErrors += gmmR0SanityCheckSet(pGMM, &pGMM->Shared,  "shared",  pszFunction, uLineNo);
+    cErrors += gmmR0SanityCheckSet(pGMM, &pGMM->PrivateX, "private", pszFunction, uLineNo);
+    cErrors += gmmR0SanityCheckSet(pGMM, &pGMM->Shared,   "shared",  pszFunction, uLineNo);
     /** @todo add more sanity checks. */
 
@@ -1879 +1854 @@
     }
 }
+
+
+/**
+ * Links the chunk onto the appropriate free list in the specified free set.
+ *
+ * If no free entries, it's not linked into any list.
+ *
+ * @param   pChunk      The allocation chunk.
+ */
+DECLINLINE(void) gmmR0SelectSetAndLinkChunk(PGMM pGMM, PGVM pGVM, PGMMCHUNK pChunk)
+{
+    PGMMCHUNKFREESET pSet;
+    if (pGMM->fBoundMemoryMode)
+        pSet = &pGVM->gmm.s.Private;
+    else if (pChunk->cShared)
+        pSet = &pGMM->Shared;
+    else
+        pSet = &pGMM->PrivateX;
+    gmmR0LinkChunk(pChunk, pSet);
+}
+
 
 
@@ -2096 +2092 @@
          * Try steal free chunks from the other set first. (Only take 100% free chunks.)
          */
-        PGMMCHUNKFREESET pOtherSet = pSet == &pGMM->Private ? &pGMM->Shared : &pGMM->Private;
+        PGMMCHUNKFREESET pOtherSet = pSet == &pGMM->PrivateX ? &pGMM->Shared : &pGMM->PrivateX;
         while (     pSet->cFreePages < cPages
                &&   pOtherSet->cFreePages >= GMM_CHUNK_NUM_PAGES)
         {
-            PGMMCHUNK pChunk = pOtherSet->apLists[RT_ELEMENTS(pOtherSet->apLists) - 1];
-            while (   pChunk
-                   && pChunk->cFree != GMM_CHUNK_NUM_PAGES)
-                pChunk = pChunk->pFreeNext;
+            PGMMCHUNK pChunk = pOtherSet->apLists[GMM_CHUNK_FREE_SET_UNUSED_LIST];
             if (!pChunk)
                 break;
+            Assert(pChunk->cFree != GMM_CHUNK_NUM_PAGES);
 
             gmmR0UnlinkChunk(pChunk);
@@ -2274 +2268 @@
      * is a bit extra work but it's easier to do it upfront than bailing out later.
      */
-    PGMMCHUNKFREESET pSet = &pGMM->Private;
+    PGMMCHUNKFREESET pSet = pGMM->fBoundMemoryMode ? &pGVM->gmm.s.Private : &pGMM->PrivateX;
     if (pSet->cFreePages < cPages)
         return VERR_GMM_SEED_ME;
@@ -2561 +2555 @@
                             pGVM->gmm.s.Allocated.cBasePages--;
                             if (!--pPage->Shared.cRefs)
-                            {
-                                gmmR0FreeSharedPage(pGMM, paPages[iPage].idSharedPage, pPage);
-                            }
+                                gmmR0FreeSharedPage(pGMM, pGVM, paPages[iPage].idSharedPage, pPage);
                             else
                             {
@@ -2592 +2584 @@
              * Note! gmmR0AllocateMoreChunks may leave the protection of the mutex!
              */
+#if 0
+            rc = gmmR0AllocatePagesNew(pGMM, pGVM, cPagesToAlloc, paPages, GMMACCOUNT_BASE);
+#else
             GMMR0ALLOCPAGESTRATEGY Strategy;
             gmmR0AllocatePagesInitStrategy(pGMM, pGVM, &Strategy);
@@ -2600 +2595 @@
                     ||  pGMM->fLegacyAllocationMode)
                     break;
-                rc = gmmR0AllocateMoreChunks(pGMM, pGVM, &pGMM->Private, cPagesToAlloc, &Strategy);
+                rc = gmmR0AllocateMoreChunks(pGMM, pGVM, &pGMM->PrivateX, cPagesToAlloc, &Strategy);
             }
+#endif
         }
         else
@@ -2690 +2686 @@
                     ||  pGMM->fLegacyAllocationMode)
                     break;
-                rc = gmmR0AllocateMoreChunks(pGMM, pGVM, &pGMM->Private, cPages, &Strategy);
+                rc = gmmR0AllocateMoreChunks(pGMM, pGVM, &pGMM->PrivateX, cPages, &Strategy);
             }
         }
@@ -2799 +2795 @@
         if (RT_SUCCESS(rc))
         {
+            PGMMCHUNKFREESET pSet = pGMM->fBoundMemoryMode ? &pGVM->gmm.s.Private : &pGMM->PrivateX;
             PGMMCHUNK pChunk;
-            rc = gmmR0RegisterChunk(pGMM, &pGMM->Private, hMemObj, pGVM->hSelf, GMM_CHUNK_FLAGS_LARGE_PAGE, &pChunk);
+            rc = gmmR0RegisterChunk(pGMM, pSet, hMemObj, pGVM->hSelf, GMM_CHUNK_FLAGS_LARGE_PAGE, &pChunk);
             if (RT_SUCCESS(rc))
             {
@@ -2826 +2823 @@
                 pGMM->cAllocatedPages            += cPages;
 
-                gmmR0LinkChunk(pChunk, &pGMM->Private);
+                gmmR0LinkChunk(pChunk, pSet);
                 gmmR0MutexRelease(pGMM);
             }
@@ -3033 +3030 @@
  *
  * @param   pGMM        Pointer to the GMM instance data.
+ * @param   pGVM        Pointer to the GVM instance.
  * @param   pChunk      Pointer to the chunk this page belongs to.
  * @param   idPage      The Page ID.
  * @param   pPage       Pointer to the page.
  */
-static void gmmR0FreePageWorker(PGMM pGMM, PGMMCHUNK pChunk, uint32_t idPage, PGMMPAGE pPage)
+static void gmmR0FreePageWorker(PGMM pGMM, PGVM pGVM, PGMMCHUNK pChunk, uint32_t idPage, PGMMPAGE pPage)
 {
     Log3(("F pPage=%p iPage=%#x/%#x u2State=%d iFreeHead=%#x\n",
@@ -3061 +3059 @@
         gmmR0UnlinkChunk(pChunk);
         pChunk->cFree++;
-        gmmR0LinkChunk(pChunk, pChunk->cShared ? &pGMM->Shared : &pGMM->Private);
+        gmmR0SelectSetAndLinkChunk(pGMM, pGVM, pChunk);
     }
     else
@@ -3092 +3090 @@
  *
  * @param   pGMM        Pointer to the GMM instance.
+ * @param   pGVM        Pointer to the GVM instance.
  * @param   idPage      The Page ID
  * @param   pPage       The page structure.
  */
-DECLINLINE(void) gmmR0FreeSharedPage(PGMM pGMM, uint32_t idPage, PGMMPAGE pPage)
+DECLINLINE(void) gmmR0FreeSharedPage(PGMM pGMM, PGVM pGVM, uint32_t idPage, PGMMPAGE pPage)
 {
     PGMMCHUNK pChunk = gmmR0GetChunk(pGMM, idPage >> GMM_CHUNKID_SHIFT);
@@ -3108 +3107 @@
     pGMM->cAllocatedPages--;
     pGMM->cSharedPages--;
-    gmmR0FreePageWorker(pGMM, pChunk, idPage, pPage);
-}
-
-#ifdef VBOX_WITH_PAGE_SHARING
+    gmmR0FreePageWorker(pGMM, pGVM, pChunk, idPage, pPage);
+}
+
+#ifdef VBOX_WITH_PAGE_SHARING  /** @todo move this away from here, this has nothing to do with the free() code. */
 
 /**
@@ -3169 +3168 @@
  *
  * @param   pGMM        Pointer to the GMM instance.
+ * @param   pGVM        Pointer to the GVM instance.
  * @param   idPage      The Page ID
  * @param   pPage       The page structure.
  */
-DECLINLINE(void) gmmR0FreePrivatePage(PGMM pGMM, uint32_t idPage, PGMMPAGE pPage)
+DECLINLINE(void) gmmR0FreePrivatePage(PGMM pGMM, PGVM pGVM, uint32_t idPage, PGMMPAGE pPage)
 {
     PGMMCHUNK pChunk = gmmR0GetChunk(pGMM, idPage >> GMM_CHUNKID_SHIFT);
@@ -3182 +3182 @@
     pChunk->cPrivate--;
     pGMM->cAllocatedPages--;
-    gmmR0FreePageWorker(pGMM, pChunk, idPage, pPage);
+    gmmR0FreePageWorker(pGMM, pGVM, pChunk, idPage, pPage);
 }
 
@@ -3250 +3250 @@
                     Assert(pGVM->gmm.s.cPrivatePages);
                     pGVM->gmm.s.cPrivatePages--;
-                    gmmR0FreePrivatePage(pGMM, idPage, pPage);
+                    gmmR0FreePrivatePage(pGMM, pGVM, idPage, pPage);
                 }
                 else
@@ -3266 +3266 @@
                 Assert(pPage->Shared.cRefs);
                 if (!--pPage->Shared.cRefs)
-                    gmmR0FreeSharedPage(pGMM, idPage, pPage);
+                    gmmR0FreeSharedPage(pGMM, pGVM, idPage, pPage);
                 else
                 {
@@ -4025 +4025 @@
     if (RT_SUCCESS(rc))
     {
-        rc = gmmR0RegisterChunk(pGMM, &pGMM->Private, MemObj, pGVM->hSelf, 0 /*fChunkFlags*/, NULL);
+        rc = gmmR0RegisterChunk(pGMM, &pGVM->gmm.s.Private, MemObj, pGVM->hSelf, 0 /*fChunkFlags*/, NULL);
         if (RT_SUCCESS(rc))
             gmmR0MutexRelease(pGMM);

trunk/src/VBox/VMM/VMMR0/GMMR0Internal.h

@@ -64 +64 @@
 typedef GMMSHAREDMODULEPERVM *PGMMSHAREDMODULEPERVM;
 
+
+/** Pointer to a GMM allocation chunk. */
+typedef struct GMMCHUNK *PGMMCHUNK;
+
+
+/** The GMMCHUNK::cFree shift count employed by gmmR0SelectFreeSetList. */
+#define GMM_CHUNK_FREE_SET_SHIFT    4
+/** Index of the list containing completely unused chunks.
+ * The code ASSUMES this is the last list. */
+#define GMM_CHUNK_FREE_SET_UNUSED_LIST  (GMM_CHUNK_NUM_PAGES >> GMM_CHUNK_FREE_SET_SHIFT)
+
+/**
+ * A set of free chunks.
+ */
+typedef struct GMMCHUNKFREESET
+{
+    /** The number of free pages in the set. */
+    uint64_t            cFreePages;
+    /** The generation ID for the set.  This is incremented whenever
+     *  something is linked or unlinked from this set. */
+    uint64_t            idGeneration;
+    /** Chunks ordered by increasing number of free pages.
+     *  In the final list the chunks are completely unused. */
+    PGMMCHUNK           apLists[GMM_CHUNK_FREE_SET_UNUSED_LIST + 1];
+} GMMCHUNKFREESET;
+
+
+
 /**
  * The per-VM GMM data.
@@ -69 +97 @@
 typedef struct GMMPERVM
 {
+    /** Free set for use in bound mode. */
+    GMMCHUNKFREESET     Private;
+
     /** The reservations. */
     GMMVMSIZES          Reserved;