Changeset 18212 in vbox

Timestamp:

Mar 24, 2009 6:15:39 PM (16 years ago)

Author:

vboxsync

Message:

GMM: Fixed bugs in gmmR0AllocateChunkId and gmmR0FreePageWorker, the later causing memory leaks on reset.

File:

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

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

@@ -1334 +1334 @@
 static void gmmR0FreeChunkId(PGMM pGMM, uint32_t idChunk)
 {
-    Assert(idChunk != NIL_GMM_CHUNKID);
-    Assert(ASMBitTest(&pGMM->bmChunkId[0], idChunk));
+    AssertReturnVoid(idChunk != NIL_GMM_CHUNKID);
+    AssertMsg(ASMBitTest(&pGMM->bmChunkId[0], idChunk), ("%#x\n", idChunk));
     ASMAtomicBitClear(&pGMM->bmChunkId[0], idChunk);
 }
@@ -1370 +1370 @@
         idChunk = ASMBitNextClear(&pGMM->bmChunkId[0], GMM_CHUNKID_LAST + 1, idChunk);
         if (idChunk > NIL_GMM_CHUNKID)
+        {
+            AssertMsgReturn(!ASMAtomicBitTestAndSet(&pGMM->bmChunkId[0], idChunk), ("%#x\n", idChunk), NIL_GVM_HANDLE);
             return pGMM->idChunkPrev = idChunk;
+        }
     }
 
@@ -1378 +1381 @@
      */
     idChunk = ASMBitFirstClear(&pGMM->bmChunkId[0], GMM_CHUNKID_LAST + 1);
-    AssertMsgReturn(idChunk > NIL_GMM_CHUNKID, ("%d\n", idChunk), NIL_GVM_HANDLE);
-    AssertMsgReturn(!ASMAtomicBitTestAndSet(&pGMM->bmChunkId[0], idChunk), ("%d\n", idChunk), NIL_GVM_HANDLE);
+    AssertMsgReturn(idChunk > NIL_GMM_CHUNKID, ("%#x\n", idChunk), NIL_GVM_HANDLE);
+    AssertMsgReturn(!ASMAtomicBitTestAndSet(&pGMM->bmChunkId[0], idChunk), ("%#x\n", idChunk), NIL_GVM_HANDLE);
 
     return pGMM->idChunkPrev = idChunk;
@@ -2101 +2104 @@
         if (RT_UNLIKELY(   pChunk->cFree == GMM_CHUNK_NUM_PAGES
                         && pChunk->pFreeNext
-                        && pChunk->pFreePrev))
+                        && pChunk->pFreePrev
+                        && !pGMM->fLegacyMode))
             gmmR0FreeChunk(pGMM, pChunk);
     }