Changeset 37213 in vbox for trunk/src/VBox

Timestamp:

May 25, 2011 1:27:48 PM (14 years ago)

Author:

vboxsync

Message:

GMMR0: Harmless changes, I hope.

File:

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

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

@@ -165 +165 @@
 #include <iprt/mem.h>
 #include <iprt/memobj.h>
+#include <iprt/mp.h>
 #include <iprt/semaphore.h>
 #include <iprt/string.h>
@@ -609 +610 @@
 
 
+/**
+ * Page allocation strategy sketches.
+ */
+typedef struct GMMR0ALLOCPAGESTRATEGY
+{
+    uint32_t cTries;
+#if 0
+    typedef enum GMMR0ALLOCPAGESTRATEGY
+    {
+        kGMMR0AllocPageStrategy_Invalid = 0,
+        kGMMR0AllocPageStrategy_VM,
+        kGMMR0AllocPageStrategy_NumaNode,
+        kGMMR0AllocPageStrategy_AnythingGoes,
+        kGMMR0AllocPageStrategy_End
+    } GMMR0ALLOCPAGESTRATEGY;
+#endif
+} GMMR0ALLOCPAGESTRATEGY;
+/** Pointer to a page allocation strategy structure. */
+typedef GMMR0ALLOCPAGESTRATEGY *PGMMR0ALLOCPAGESTRATEGY;
+
+
 /*******************************************************************************
 *   Global Variables                                                           *
@@ -1122 +1144 @@
 
 /**
+ * For experimenting with NUMA affinity and such.
+ *
+ * @returns The current NUMA Node ID.
+ */
+static uint16_t gmmR0GetCurrentNumaNodeId(void)
+{
+#if 1
+    return GMM_CHUNK_NUMA_ID_UNKNOWN;
+#else
+    return RTMpCpuId() / 16;
+#endif
+}
+
+
+
+/**
  * Cleans up when a VM is terminating.
  *
@@ -1934 +1972 @@
         pChunk->hGVM        = hGVM;
         /*pChunk->iFreeHead = 0;*/
-        pChunk->idNumaNode  = GMM_CHUNK_NUMA_ID_UNKNOWN;
+        pChunk->idNumaNode  = gmmR0GetCurrentNumaNodeId();
         pChunk->iChunkMtx   = UINT8_MAX;
         pChunk->fFlags      = fChunkFlags;
@@ -2008 +2046 @@
     RTR0MEMOBJ hMemObj;
     int rc = RTR0MemObjAllocPhysNC(&hMemObj, GMM_CHUNK_SIZE, NIL_RTHCPHYS);
-    /** @todo Check that RTR0MemObjAllocPhysNC always returns VERR_NO_MEMORY on
-     *        allocation failure. */
     if (RT_SUCCESS(rc))
     {
@@ -2033 +2069 @@
  * @param   pSet        Pointer to the free set to grow.
  * @param   cPages      The number of pages needed.
+ * @param   pStrategy   Pointer to the allocation strategy data.  This is input
+ *                      and output.
  *
  * @remarks Called owning the mutex, but will leave it temporarily while
  *          allocating the memory!
  */
-static int gmmR0AllocateMoreChunks(PGMM pGMM, PGVM pGVM, PGMMCHUNKFREESET pSet, uint32_t cPages)
+static int gmmR0AllocateMoreChunks(PGMM pGMM, PGVM pGVM, PGMMCHUNKFREESET pSet, uint32_t cPages,
+                                   PGMMR0ALLOCPAGESTRATEGY pStrategy)
 {
     Assert(!pGMM->fLegacyAllocationMode);
@@ -2054 +2093 @@
         {
             PGMMCHUNK pChunk = pOtherSet->apLists[RT_ELEMENTS(pOtherSet->apLists) - 1];
-            while (pChunk && pChunk->cFree != GMM_CHUNK_NUM_PAGES)
+            while (   pChunk
+                   && pChunk->cFree != GMM_CHUNK_NUM_PAGES)
                 pChunk = pChunk->pFreeNext;
             if (!pChunk)
@@ -2179 +2219 @@
  *                              See GMMPAGEDESC for details on what is expected on input.
  * @param   enmAccount          The account to charge.
- */
-static int gmmR0AllocatePages(PGMM pGMM, PGVM pGVM, uint32_t cPages, PGMMPAGEDESC paPages, GMMACCOUNT enmAccount)
+ * @param   pStrategy           Pointer to the allocation strategy data.  This
+ *                              is input and output.
+ */
+static int gmmR0AllocatePages(PGMM pGMM, PGVM pGVM, uint32_t cPages, PGMMPAGEDESC paPages, GMMACCOUNT enmAccount,
+                              PGMMR0ALLOCPAGESTRATEGY pStrategy)
 {
     /*
@@ -2191 +2234 @@
     {
         case GMMACCOUNT_BASE:
-            if (RT_UNLIKELY(pGVM->gmm.s.Allocated.cBasePages + pGVM->gmm.s.cBalloonedPages + cPages > pGVM->gmm.s.Reserved.cBasePages))
+            if (RT_UNLIKELY(  pGVM->gmm.s.Allocated.cBasePages + pGVM->gmm.s.cBalloonedPages + cPages
+                            > pGVM->gmm.s.Reserved.cBasePages))
             {
                 Log(("gmmR0AllocatePages:Base: Reserved=%#llx Allocated+Ballooned+Requested=%#llx+%#llx+%#x!\n",
@@ -2219 +2263 @@
 
     /*
-     * Check if we need to allocate more memory or not. In bound memory mode this
+     * Check if we need to allocate more memory or not.  In bound memory mode this
      * is a bit extra work but it's easier to do it upfront than bailing out later.
      */
@@ -2225 +2269 @@
     if (pSet->cFreePages < cPages)
         return VERR_GMM_SEED_ME;
+
+/** @todo Rewrite this to use the page array for storing chunk IDs and other
+ *        state info needed to avoid the multipass sillyness. */
     if (pGMM->fBoundMemoryMode)
     {
@@ -2342 +2389 @@
 
     return VINF_SUCCESS;
+}
+
+
+/**
+ * Determins the initial page allocation strategy and initializes the data
+ * structure.
+ *
+ * @param   pGMM                Pointer to the GMM instance data.
+ * @param   pGVM                Pointer to the shared VM structure.
+ * @param   pStrategy           The data structure to initialize.
+ */
+static void gmmR0AllocatePagesInitStrategy(PGMM pGMM, PGVM pGVM, PGMMR0ALLOCPAGESTRATEGY pStrategy)
+{
+    pStrategy->cTries = 0;
 }
 
@@ -2523 +2584 @@
              * Note! gmmR0AllocateMoreChunks may leave the protection of the mutex!
              */
+            GMMR0ALLOCPAGESTRATEGY Strategy;
+            gmmR0AllocatePagesInitStrategy(pGMM, pGVM, &Strategy);
             while (RT_SUCCESS(rc))
             {
-                rc = gmmR0AllocatePages(pGMM, pGVM, cPagesToAlloc, paPages, GMMACCOUNT_BASE);
+                rc = gmmR0AllocatePages(pGMM, pGVM, cPagesToAlloc, paPages, GMMACCOUNT_BASE, &Strategy);
                 if (    rc != VERR_GMM_SEED_ME
                     ||  pGMM->fLegacyAllocationMode)
                     break;
-                rc = gmmR0AllocateMoreChunks(pGMM, pGVM, &pGMM->Private, cPagesToAlloc);
+                rc = gmmR0AllocateMoreChunks(pGMM, pGVM, &pGMM->Private, cPagesToAlloc, &Strategy);
             }
         }
@@ -2611 +2674 @@
              * Note! gmmR0AllocateMoreChunks may leave the protection of the mutex!
              */
+            GMMR0ALLOCPAGESTRATEGY Strategy;
+            gmmR0AllocatePagesInitStrategy(pGMM, pGVM, &Strategy);
             while (RT_SUCCESS(rc))
             {
-                rc = gmmR0AllocatePages(pGMM, pGVM, cPages, paPages, enmAccount);
+                rc = gmmR0AllocatePages(pGMM, pGVM, cPages, paPages, enmAccount, &Strategy);
                 if (    rc != VERR_GMM_SEED_ME
                     ||  pGMM->fLegacyAllocationMode)
                     break;
-                rc = gmmR0AllocateMoreChunks(pGMM, pGVM, &pGMM->Private, cPages);
+                rc = gmmR0AllocateMoreChunks(pGMM, pGVM, &pGMM->Private, cPages, &Strategy);
             }
         }