Changeset 20900 in vbox for trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

Timestamp:

Jun 24, 2009 6:05:15 PM (15 years ago)

Author:

vboxsync

Message:

GMMR0.cpp: The proper fix for the wrong cFreePages accounting.

File:

• trunk/src/VBox/VMM/VMMR0/GMMR0.cpp (modified) (6 diffs)

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

@@ -923 +923 @@
         unsigned cFree = 0;
 
+        gmmR0UnlinkChunk(pChunk);       /* avoiding cFreePages updates. */
+
         uint16_t hGVM = pGVM->hSelf;
         unsigned iPage = (GMM_CHUNK_SIZE >> PAGE_SHIFT);
@@ -935 +937 @@
                      * The reason for not using gmmR0FreePrivatePage here is that we
                      * must *not* cause the chunk to be freed from under us - we're in
-                     * a AVL tree walk here.
+                     * an AVL tree walk here.
                      */
                     pChunk->aPages[iPage].u = 0;
@@ -942 +944 @@
                     pChunk->iFreeHead = iPage;
                     pChunk->cPrivate--;
-                    if ((pChunk->cFree & GMM_CHUNK_FREE_SET_MASK) == 0)
-                    {
-                        gmmR0UnlinkChunk(pChunk);
-                        pChunk->cFree++;
-                        gmmR0LinkChunk(pChunk, pChunk->cShared ? &g_pGMM->Shared : &g_pGMM->Private);
-                    }
-                    else
-                        pChunk->cFree++;
+                    pChunk->cFree++;
                     pGVM->gmm.s.cPrivatePages--;
                     cFree++;
@@ -960 +955 @@
             else
                 cShared++;
+
+        gmmR0LinkChunk(pChunk, pChunk->cShared ? &g_pGMM->Shared : &g_pGMM->Private);
 
         /*
@@ -1827 +1824 @@
      */
     PGMMCHUNKFREESET pSet = &pGMM->Private;
-#if 0 /** @todo this is broken, at least on windows... */
     if (pSet->cFreePages < cPages)
         return VERR_GMM_SEED_ME;
-#endif
     if (pGMM->fBoundMemoryMode)
     {
@@ -1846 +1841 @@
             return VERR_GMM_SEED_ME;
     }
-    else if (pSet->cFreePages < cPages) /* see #if 0 */
-        return VERR_GMM_SEED_ME;
 
     /*