Changeset 108673 in vbox

Timestamp:

Mar 20, 2025 6:18:43 PM (8 weeks ago)

Author:

vboxsync

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

168086

Message:

VMM/VMMR3/GVMMR3.cpp: Make it work for hosts where we don't know the host page size when building, bugref:10391

File:

• trunk/src/VBox/VMM/VMMR3/GVMMR3.cpp (modified) (5 diffs)

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

@@ -39 +39 @@
 
 #include <iprt/mem.h>
+#include <iprt/system.h>
 
 
@@ -58 +59 @@
     AssertReturn(cCpus >= VMM_MIN_CPU_COUNT && cCpus <= VMM_MAX_CPU_COUNT, VERR_INVALID_PARAMETER);
     AssertReturn(enmTarget == VMTARGET_X86 || enmTarget == VMTARGET_ARMV8, VERR_INVALID_PARAMETER);
-    AssertCompile((sizeof(VM)    & HOST_PAGE_OFFSET_MASK) == 0);
-    AssertCompile((sizeof(VMCPU) & HOST_PAGE_OFFSET_MASK) == 0);
+    AssertReturn((sizeof(VM)    & RTSystemGetPageOffsetMask()) == 0, VERR_UNSUPPORTED_ALIGNMENT);
+    AssertReturn((sizeof(VMCPU) & RTSystemGetPageOffsetMask()) == 0, VERR_UNSUPPORTED_ALIGNMENT);
 
     int rc;
@@ -90 +91 @@
          */
         /* Allocate the VM structure: */
+        size_t const cbPageSize = RTSystemGetPageSize();
         size_t const cbVM = sizeof(VM) + sizeof(VMCPU) * cCpus;
-        PVM          pVM  = (PVM)RTMemPageAlloc(cbVM + HOST_PAGE_SIZE * (1 + 2 * cCpus));
+        PVM          pVM  = (PVM)RTMemPageAlloc(cbVM + cbPageSize * (1 + 2 * cCpus));
         if (!pVM)
             return VERR_NO_PAGE_MEMORY;
 
         /* Set up guard pages: */
-        RTMemProtect(pVM, HOST_PAGE_SIZE, RTMEM_PROT_NONE);
-        pVM = (PVM)((uintptr_t)pVM + HOST_PAGE_SIZE);
-        RTMemProtect(pVM + 1, HOST_PAGE_SIZE, RTMEM_PROT_NONE);
+        RTMemProtect(pVM, cbPageSize, RTMEM_PROT_NONE);
+        pVM = (PVM)((uintptr_t)pVM + cbPageSize);
+        RTMemProtect(pVM + 1, cbPageSize, RTMEM_PROT_NONE);
 
         /* VM: */
@@ -113 +115 @@
 
         /* CPUs: */
-        PVMCPU pVCpu = (PVMCPU)((uintptr_t)pVM + sizeof(VM) + HOST_PAGE_SIZE);
+        PVMCPU pVCpu = (PVMCPU)((uintptr_t)pVM + sizeof(VM) + cbPageSize);
         for (VMCPUID idxCpu = 0; idxCpu < cCpus; idxCpu++)
         {
@@ -125 +127 @@
             pVCpu->idCpu           = idxCpu;
 
-            RTMemProtect(pVCpu + 1, HOST_PAGE_SIZE, RTMEM_PROT_NONE);
-            pVCpu = (PVMCPU)((uintptr_t)pVCpu + sizeof(VMCPU) + HOST_PAGE_SIZE);
+            RTMemProtect(pVCpu + 1, cbPageSize, RTMEM_PROT_NONE);
+            pVCpu = (PVMCPU)((uintptr_t)pVCpu + sizeof(VMCPU) + cbPageSize);
         }