Changeset 92556 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 23, 2021 1:12:29 AM (3 years ago)

Author:

vboxsync

Message:

SUP,VMM: Added a fFlags parameter to SUPR3PageAlloc so we can indicate a desire for large pages and other things. HM must enable large pages when configred for the NEM code paths too. bugref:9044 bugref:5324

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/HM.cpp (modified) (2 diffs)
• VMMR3/PGMPhys.cpp (modified) (4 diffs)
• testcase/tstCFGM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -612 +612 @@
                 if (   RT_SUCCESS(rc2)
                     && pVM->bMainExecutionEngine != VM_EXEC_ENGINE_NOT_SET)
+                {
                     rc = VINF_SUCCESS;
+
+                    /* For some reason, HM is in charge or large pages. Make sure to enable them: */
+                    PGMSetLargePageUsage(pVM, pVM->hm.s.fLargePages);
+                }
             }
             if (RT_FAILURE(rc))
@@ -629 +634 @@
             if (RT_FAILURE(rc))
                 return rc;
+
+            /* For some reason, HM is in charge or large pages. Make sure to enable them: */
+            PGMSetLargePageUsage(pVM, pVM->hm.s.fLargePages);
         }
         if (   pVM->bMainExecutionEngine == VM_EXEC_ENGINE_NOT_SET

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -1626 +1626 @@
     else
     {
-        int rc = SUPR3PageAlloc(cPages, &pNew->pvR3);
+        int rc = SUPR3PageAlloc(cPages, pVM->pgm.s.fUseLargePages ? SUP_PAGE_ALLOC_F_LARGE_PAGES : 0, &pNew->pvR3);
         if (RT_FAILURE(rc))
             return rc;
@@ -3075 +3075 @@
             else
             {
-                rc = SUPR3PageAlloc(cPages, &pvPages);
+                rc = SUPR3PageAlloc(cPages, pVM->pgm.s.fUseLargePages ? SUP_PAGE_ALLOC_F_LARGE_PAGES : 0, &pvPages);
                 if (RT_SUCCESS(rc))
                     for (uint32_t i = 0; i < cPages; i++)
@@ -4372 +4372 @@
         if (!fRamExists)
         {
-            int rc = SUPR3PageAlloc(cPages, &pvRam);
+            int rc = SUPR3PageAlloc(cPages, 0, &pvRam);
             if (RT_FAILURE(rc))
                 return rc;
@@ -4378 +4378 @@
         if (fFlags & PGMPHYS_ROM_FLAGS_SHADOWED)
         {
-            int rc = SUPR3PageAlloc(cPages, &pvAlt);
+            int rc = SUPR3PageAlloc(cPages, 0, &pvAlt);
             if (RT_FAILURE(rc))
             {

trunk/src/VBox/VMM/testcase/tstCFGM.cpp

@@ -103 +103 @@
 
     PVM pVM;
-    RTTESTI_CHECK_RC_RETV(SUPR3PageAlloc(RT_ALIGN_Z(sizeof(*pVM), PAGE_SIZE) >> PAGE_SHIFT, (void **)&pVM), VINF_SUCCESS);
+    RTTESTI_CHECK_RC_RETV(SUPR3PageAlloc(RT_ALIGN_Z(sizeof(*pVM), PAGE_SIZE) >> PAGE_SHIFT, 0, (void **)&pVM), VINF_SUCCESS);