Changeset 108708 in vbox for trunk/include

Timestamp:

Mar 24, 2025 9:16:43 AM (4 weeks ago)

Author:

vboxsync

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

168125

Message:

VMM: Introduce VMM_HOST_PAGE_SIZE_DYNAMIC, HOST_PAGE_SIZE_DYNAMIC, and HOST_PAGE_SHIFT_DYNAMIC, bugref:10391

HOST_PAGE_SIZE_DYNAMIC either resolves to HOST_PAGE_SIZE or calls RTSystemGetPageSize() on hosts where
the system page size is not known during build time (linux.arm64 for now).
HOST_PAGE_SHIFT_DYNAMIC is the same for the page shift.

This allows building VMM libraries which are agnostic to the host page size (at the cost of a slightly
larger overhead).

Currently enabled only on linux.arm64

Location:

trunk/include/VBox

Files:

• param.h (modified) (2 diffs)
• vmm/uvm.h (modified) (3 diffs)
• vmm/vm.h (modified) (7 diffs)

trunk/include/VBox/param.h

@@ -44 +44 @@
 #include <iprt/param.h>
 #include <iprt/cdefs.h>
+#ifdef VMM_HOST_PAGE_SIZE_DYNAMIC
+# include <iprt/system.h>
+#endif
 
 
@@ -67 +70 @@
 
 
+/** The host page size which can be dynamic on certain hosts, linux.arm64 for instance */
+#ifdef VMM_HOST_PAGE_SIZE_DYNAMIC
+# define HOST_PAGE_SIZE_DYNAMIC     RTSystemGetPageSize()
+#else
+# define HOST_PAGE_SIZE_DYNAMIC     HOST_PAGE_SIZE
+#endif
+/** The host page shift which can be dynamic on certain hosts, linux.arm64 for instance */
+#ifdef VMM_HOST_PAGE_SIZE_DYNAMIC
+# define HOST_PAGE_SHIFT_DYNAMIC     RTSystemGetPageShift()
+#else
+# define HOST_PAGE_SHIFT_DYNAMIC     HOST_PAGE_SHIFT
+#endif
+
+
+/** The maximum memory size that can be allocated and mapped
+ * by various MM, PGM and SUP APIs. */
+#define VBOX_MAX_ALLOC_SIZE          _512M
+
+
 /** The maximum number of pages that can be allocated and mapped
  * by various MM, PGM and SUP APIs. */
 #if ARCH_BITS == 64
-# define VBOX_MAX_ALLOC_PAGE_COUNT   (_512M / PAGE_SIZE)
-#else
-# define VBOX_MAX_ALLOC_PAGE_COUNT   (_256M / PAGE_SIZE)
+# define VBOX_MAX_ALLOC_PAGE_COUNT   (VBOX_MAX_ALLOC_SIZE / PAGE_SIZE)
+#else
+# define VBOX_MAX_ALLOC_PAGE_COUNT   (_256M / PAGE_SIZE) /** @todo r=aeichner Remove? */
 #endif
 

trunk/include/VBox/vmm/uvm.h

@@ -40 +40 @@
 #endif
 
+#include <VBox/param.h>
 #include <VBox/types.h>
 #include <iprt/assert.h>
@@ -177 +178 @@
  */
 #define UVM_ASSERT_VALID_EXT_RETURN(a_pUVM, a_rc) \
-        AssertMsgReturn(    RT_VALID_ALIGNED_PTR(a_pUVM, PAGE_SIZE) \
+        AssertMsgReturn(    RT_VALID_ALIGNED_PTR(a_pUVM, HOST_PAGE_SIZE_DYNAMIC) \
                         &&  (a_pUVM)->u32Magic == UVM_MAGIC, \
                         ("a_pUVM=%p u32Magic=%#x\n", (a_pUVM), \
-                         RT_VALID_ALIGNED_PTR(a_pUVM, PAGE_SIZE) ? (a_pUVM)->u32Magic : 0), \
+                         RT_VALID_ALIGNED_PTR(a_pUVM, HOST_PAGE_SIZE_DYNAMIC) ? (a_pUVM)->u32Magic : 0), \
                         (a_rc))
 /** @def UVM_ASSERT_VALID_EXT_RETURN
@@ -186 +187 @@
  */
 #define UVM_ASSERT_VALID_EXT_RETURN_VOID(a_pUVM) \
-        AssertMsgReturnVoid(    RT_VALID_ALIGNED_PTR(a_pUVM, PAGE_SIZE) \
+        AssertMsgReturnVoid(    RT_VALID_ALIGNED_PTR(a_pUVM, HOST_PAGE_SIZE_DYNAMIC) \
                             &&  (a_pUVM)->u32Magic == UVM_MAGIC, \
                             ("a_pUVM=%p u32Magic=%#x\n", (a_pUVM), \
-                             RT_VALID_ALIGNED_PTR(a_pUVM, PAGE_SIZE) ? (a_pUVM)->u32Magic : 0))
+                             RT_VALID_ALIGNED_PTR(a_pUVM, HOST_PAGE_SIZE_DYNAMIC) ? (a_pUVM)->u32Magic : 0))
 
 /** @} */

trunk/include/VBox/vmm/vm.h

@@ -51 +51 @@
 # include <VBox/vmm/vmapi.h>
 # include <VBox/vmm/vmm.h>
+# include <VBox/param.h>
 # include <VBox/sup.h>
 #else
@@ -1169 +1170 @@
 #ifdef VMTARGET_DEFAULT
 # define VM_IS_VALID_EXT(pVM) \
-        (   RT_VALID_ALIGNED_PTR(pVM, PAGE_SIZE) \
+        (   RT_VALID_ALIGNED_PTR(pVM, HOST_PAGE_SIZE_DYNAMIC) \
          && (   (unsigned)(pVM)->enmVMState < (unsigned)VMSTATE_DESTROYING \
              || (   (unsigned)(pVM)->enmVMState == (unsigned)VMSTATE_DESTROYING \
@@ -1176 +1177 @@
 #else
 # define VM_IS_VALID_EXT(pVM) \
-        (   RT_VALID_ALIGNED_PTR(pVM, PAGE_SIZE) \
+        (   RT_VALID_ALIGNED_PTR(pVM, HOST_PAGE_SIZE_DYNAMIC) \
          && (   (unsigned)(pVM)->enmVMState < (unsigned)VMSTATE_DESTROYING \
              || (   (unsigned)(pVM)->enmVMState == (unsigned)VMSTATE_DESTROYING \
@@ -1188 +1189 @@
 #define VM_ASSERT_VALID_EXT_RETURN(pVM, rc) \
         AssertMsgReturn(VM_IS_VALID_EXT(pVM), \
-                        ("pVM=%p state %s enmTarget=%#x\n", (pVM), RT_VALID_ALIGNED_PTR(pVM, PAGE_SIZE) \
+                        ("pVM=%p state %s enmTarget=%#x\n", (pVM), RT_VALID_ALIGNED_PTR(pVM, HOST_PAGE_SIZE_DYNAMIC) \
                          ? VMGetStateName(pVM->enmVMState) : "", (pVM)->enmTarget), \
                         (rc))
@@ -1198 +1199 @@
 # define VMCPU_IS_VALID_EXT(a_pVCpu) \
         (   RT_VALID_ALIGNED_PTR(a_pVCpu, 64) \
-         && RT_VALID_ALIGNED_PTR((a_pVCpu)->CTX_SUFF(pVM), PAGE_SIZE) \
+         && RT_VALID_ALIGNED_PTR((a_pVCpu)->CTX_SUFF(pVM), HOST_PAGE_SIZE_DYNAMIC) \
          && (unsigned)(a_pVCpu)->CTX_SUFF(pVM)->enmVMState < (unsigned)VMSTATE_DESTROYING \
          && (pVM)->enmTarget == VMTARGET_DEFAULT)
@@ -1204 +1205 @@
 # define VMCPU_IS_VALID_EXT(a_pVCpu) \
         (   RT_VALID_ALIGNED_PTR(a_pVCpu, 64) \
-         && RT_VALID_ALIGNED_PTR((a_pVCpu)->CTX_SUFF(pVM), PAGE_SIZE) \
+         && RT_VALID_ALIGNED_PTR((a_pVCpu)->CTX_SUFF(pVM), HOST_PAGE_SIZE_DYNAMIC) \
          && (unsigned)(a_pVCpu)->CTX_SUFF(pVM)->enmVMState < (unsigned)VMSTATE_DESTROYING)
 #endif
@@ -1216 +1217 @@
                         ("pVCpu=%p pVM=%p state %s enmTarget=%#x\n", (pVCpu), \
                         RT_VALID_ALIGNED_PTR(pVCpu, 64) ? (pVCpu)->CTX_SUFF(pVM) : NULL, \
-                         RT_VALID_ALIGNED_PTR(pVCpu, 64) && RT_VALID_ALIGNED_PTR((pVCpu)->CTX_SUFF(pVM), PAGE_SIZE) \
+                         RT_VALID_ALIGNED_PTR(pVCpu, 64) && RT_VALID_ALIGNED_PTR((pVCpu)->CTX_SUFF(pVM), HOST_PAGE_SIZE_DYNAMIC) \
                          ? VMGetStateName((pVCpu)->pVMR3->enmVMState) : "", (pVCpu)->enmTarget), \
                         (rc))