Changeset 36970 in vbox

Timestamp:

May 5, 2011 10:05:34 AM (14 years ago)

Author:

vboxsync

Message:

GMM: Adjusted the mapping array allocation 'strategy' to conserve memory. Cleanups.

File:

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

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

@@ -362 +362 @@
 {
     /** The mapping object. */
-    RTR0MEMOBJ      MapObj;
+    RTR0MEMOBJ          MapObj;
     /** The VM owning the mapping. */
-    PGVM            pGVM;
+    PGVM                pGVM;
 } GMMCHUNKMAP;
 /** Pointer to a GMM allocation chunk mapping. */
@@ -426 +426 @@
 {
     /** The chunk id. */
-    uint32_t        idChunk;
+    uint32_t            idChunk;
     /** Pointer to the chunk. */
-    PGMMCHUNK       pChunk;
+    PGMMCHUNK           pChunk;
 } GMMCHUNKTLBE;
 /** Pointer to an allocation chunk TLB entry. */
@@ -464 +464 @@
 {
     /** The number of free pages in the set. */
-    uint64_t        cFreePages;
+    uint64_t            cFreePages;
     /** Chunks ordered by increasing number of free pages. */
-    PGMMCHUNK       apLists[GMM_CHUNK_FREE_SET_LISTS];
+    PGMMCHUNK           apLists[GMM_CHUNK_FREE_SET_LISTS];
 } GMMCHUNKFREESET;
 
@@ -1069 +1069 @@
     {
         if (pChunk->paMappings[i].pGVM != pGVM)
-            SUPR0Printf("gmmR0CleanupVMDestroyChunk: %p/%#x: mapping #%x: pGVM=%p exepcted %p\n", pChunk,
+            SUPR0Printf("gmmR0CleanupVMDestroyChunk: %p/%#x: mapping #%x: pGVM=%p expected %p\n", pChunk,
                         pChunk->Core.Key, i, pChunk->paMappings[i].pGVM, pGVM);
         int rc = RTR0MemObjFree(pChunk->paMappings[i].MapObj, false /* fFreeMappings (NA) */);
@@ -2529 +2529 @@
     {
         /** @todo R0 -> VM request */
-        /* The chunk can be owned by more than one VM if fBoundMemoryMode is false! */
+        /* The chunk can be mapped by more than one VM if fBoundMemoryMode is false! */
         Log(("gmmR0FreeChunk: chunk still has %d mappings; don't free!\n", pChunk->cMappings));
     }
@@ -3278 +3278 @@
     if (RT_SUCCESS(rc))
     {
-        /* reallocate the array? */
-        if ((pChunk->cMappings & 1 /*7*/) == 0)
-        {
-            void *pvMappings = RTMemRealloc(pChunk->paMappings, (pChunk->cMappings + 2 /*8*/) * sizeof(pChunk->paMappings[0]));
+        /* reallocate the array? assumes few users per chunk (usually one). */
+        if (   pChunk->cMappings <= 3
+            || (pChunk->cMappings & 3) == 0)
+        {
+            unsigned cNewSize = pChunk->cMappings <= 3
+                              ? pChunk->cMappings + 1
+                              : pChunk->cMappings + 4;
+            Assert(cNewSize < 4 || RT_ALIGN_32(cNewSize, 4) == cNewSize);
+            void *pvMappings = RTMemRealloc(pChunk->paMappings, cNewSize * sizeof(pChunk->paMappings[0]));
             if (RT_UNLIKELY(!pvMappings))
             {
@@ -3293 +3298 @@
         /* insert new entry */
         pChunk->paMappings[pChunk->cMappings].MapObj = MapObj;
-        pChunk->paMappings[pChunk->cMappings].pGVM = pGVM;
+        pChunk->paMappings[pChunk->cMappings].pGVM   = pGVM;
         pChunk->cMappings++;
 
@@ -3301 +3306 @@
     return rc;
 }
+
 
 /**
@@ -3327 +3333 @@
     return false;
 }
+
 
 /**
@@ -3849 +3856 @@
 }
 
-
 #ifdef VBOX_WITH_PAGE_SHARING
+
 /**
  * Checks specified shared module range for changes
@@ -4057 +4064 @@
     return 0;
 }
-#endif
+
+#endif /* VBOX_WITH_PAGE_SHARING */
 
 /**
@@ -4103 +4111 @@
 
 #ifdef VBOX_WITH_PAGE_SHARING
+
 typedef struct
 {
@@ -4129 +4138 @@
     return 0;
 }
-#endif
-
+
+#endif /* VBOX_WITH_PAGE_SHARING */
 #ifdef DEBUG_sandervl
+
 /**
  * Setup for a GMMR0CheckSharedModules call (to allow log flush jumps back to ring 3)
@@ -4176 +4186 @@
     return VINF_SUCCESS;
 }
-#endif
+
+#endif /* DEBUG_sandervl */
 
 /**
@@ -4235 +4246 @@
 
 #if defined(VBOX_STRICT) && HC_ARCH_BITS == 64
+
 typedef struct
 {
@@ -4291 +4303 @@
 }
 
+
 /**
  * Find a duplicate of the specified page in other active VMs