Changeset 82866 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jan 27, 2020 10:18:00 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135843

Message:

VMM/GMMR0: Allow large page in legacy allocation mode too. bugref:5324

File:

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

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

@@ -420 +420 @@
      *  mapping or freeing anything.  (Giant mtx.) */
     uint8_t volatile    iChunkMtx;
-    /** Flags field reserved for future use (like eliminating enmType).
-     *  (Giant mtx.) */
+    /** GMM_CHUNK_FLAGS_XXX. (Giant mtx.) */
     uint8_t             fFlags;
     /** The head of the list of free pages. UINT16_MAX is the NIL value.
@@ -3070 +3069 @@
         return rc;
 
-    /* Not supported in legacy mode where we allocate the memory in ring 3 and lock it in ring 0. */
-    if (pGMM->fLegacyAllocationMode)
-        return VERR_NOT_SUPPORTED;
+    // /* Not supported in legacy mode where we allocate the memory in ring 3 and lock it in ring 0. */
+    // if (pGMM->fLegacyAllocationMode)
+    //     return VERR_NOT_SUPPORTED;
 
     *pHCPhys = NIL_RTHCPHYS;
@@ -3171 +3170 @@
         return rc;
 
-    /* Not supported in legacy mode where we allocate the memory in ring 3 and lock it in ring 0. */
-    if (pGMM->fLegacyAllocationMode)
-        return VERR_NOT_SUPPORTED;
+    // /* Not supported in legacy mode where we allocate the memory in ring 3 and lock it in ring 0. */
+    // if (pGMM->fLegacyAllocationMode)
+    //     return VERR_NOT_SUPPORTED;
 
     gmmR0MutexAcquire(pGMM);
@@ -3260 +3259 @@
      */
     if (    pChunk->cMappingsX
-        &&  !pGMM->fLegacyAllocationMode
+        &&  (!pGMM->fLegacyAllocationMode || (pChunk->fFlags & GMM_CHUNK_FLAGS_LARGE_PAGE))
         &&  pGVM)
         gmmR0UnmapChunkLocked(pGMM, pGVM, pChunk);
@@ -3391 +3390 @@
                     && pChunk->pFreeNext
                     && pChunk->pFreePrev /** @todo this is probably misfiring, see reset... */
-                    && !pGMM->fLegacyAllocationMode))
+                    && (!pGMM->fLegacyAllocationMode || (pChunk->fFlags & GMM_CHUNK_FLAGS_LARGE_PAGE))))
         gmmR0FreeChunk(pGMM, NULL, pChunk, false);
 
@@ -3914 +3913 @@
 static int gmmR0UnmapChunkLocked(PGMM pGMM, PGVM pGVM, PGMMCHUNK pChunk)
 {
-    Assert(!pGMM->fLegacyAllocationMode); NOREF(pGMM);
+    Assert(!pGMM->fLegacyAllocationMode || (pChunk->fFlags & GMM_CHUNK_FLAGS_LARGE_PAGE)); NOREF(pGMM);
 
     /*
@@ -3960 +3959 @@
 static int gmmR0UnmapChunk(PGMM pGMM, PGVM pGVM, PGMMCHUNK pChunk, bool fRelaxedSem)
 {
-    if (!pGMM->fLegacyAllocationMode)
+    if (!pGMM->fLegacyAllocationMode || (pChunk->fFlags & GMM_CHUNK_FLAGS_LARGE_PAGE))
     {
         /*
@@ -4000 +3999 @@
      * If we're in legacy mode this is simple.
      */
-    if (pGMM->fLegacyAllocationMode)
+    if (pGMM->fLegacyAllocationMode && !(pChunk->fFlags & GMM_CHUNK_FLAGS_LARGE_PAGE))
     {
         if (pChunk->hGVM != pGVM->hSelf)