Changeset 100307 in vbox

Timestamp:

Jun 28, 2023 10:17:34 AM (17 months ago)

Author:

vboxsync

Message:

Runtime,Additions,HostDrivers: Provide API to query the host page size and associated parameters for architectures where the used page size can vary (like on linux.arm64 depending on the kernel config), bugref:10476

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/system.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/linux/combined-agnostic.c (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest (modified) (2 diffs)
• src/VBox/HostDrivers/Support/linux/combined-agnostic2.c (modified) (1 diff)
• src/VBox/HostDrivers/Support/linux/files_vboxdrv (modified) (2 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (7 diffs)
• src/VBox/Runtime/generic/system-page-size-generic.cpp (added)
• src/VBox/Runtime/include/internal/system.h (added)
• src/VBox/Runtime/r3/init.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/posix/system-page-size-posix.cpp (added)

trunk/include/iprt/mangling.h

@@ -2434 +2434 @@
 # define RTSymlinkRead                                  RT_MANGLER(RTSymlinkRead)
 # define RTSymlinkReadA                                 RT_MANGLER(RTSymlinkReadA)
+# define RTSystemGetPageSize                            RT_MANGLER(RTSystemGetPageSize)
+# define RTSystemGetPageOffsetMask                      RT_MANGLER(RTSystemGetPageOffsetMask)
+# define RTSystemGetPageShift                           RT_MANGLER(RTSystemGetPageShift)
+# define RTSystemPageAlignSize                          RT_MANGLER(RTSystemPageAlignSize)
 # define RTSystemQueryFirmwareType                      RT_MANGLER(RTSystemQueryFirmwareType)
 # define RTSystemQueryFirmwareBoolean                   RT_MANGLER(RTSystemQueryFirmwareBoolean)

trunk/include/iprt/system.h

@@ -163 +163 @@
  */
 RTDECL(int) RTSystemQueryUnavailableRam(uint64_t *pcb);
+
+/**
+ * Returns the page size in bytes of the system.
+ *
+ * @returns Page size in bytes.
+ */
+RTDECL(uint32_t) RTSystemGetPageSize(void);
+
+/**
+ * Returns the page shift in bits of the system.
+ *
+ * @returns Page shift in bits.
+ */
+RTDECL(uint32_t) RTSystemGetPageShift(void);
+
+/**
+ * Returns the page offset mask of the system.
+ *
+ * @returns Page offset maske.
+ */
+RTDECL(uintptr_t) RTSystemGetPageOffsetMask(void);
+
+/**
+ * Aligns the given size to the systems page size.
+ *
+ * @returns Byte size aligned to the systems page size.
+ * @param   cb                  The size in bytes to align.
+ */
+RTDECL(size_t) RTSystemPageAlignSize(size_t cb);
 
 

trunk/src/VBox/Additions/common/VBoxGuest/linux/combined-agnostic.c

@@ -167 +167 @@
 #undef LOG_GROUP
 #include "generic/mppresent-generic.c"
+#undef LOG_GROUP
+#include "generic/system-page-size-generic.c"
 #undef LOG_GROUP
 #include "VBox/log-vbox.c"

trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest

@@ -74 +74 @@
     ${PATH_ROOT}/include/iprt/stdint.h=>include/iprt/stdint.h \
     ${PATH_ROOT}/include/iprt/string.h=>include/iprt/string.h \
+    ${PATH_ROOT}/include/iprt/system.h=>include/iprt/system.h \
     ${PATH_ROOT}/include/iprt/thread.h=>include/iprt/thread.h \
     ${PATH_ROOT}/include/iprt/time.h=>include/iprt/time.h \
@@ -198 +199 @@
     ${PATH_ROOT}/src/VBox/Runtime/generic/errvars-generic.cpp=>generic/errvars-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/generic/mppresent-generic.cpp=>generic/mppresent-generic.c \
+    ${PATH_ROOT}/src/VBox/Runtime/generic/system-page-size-generic.cpp=>generic/system-page-size-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \

trunk/src/VBox/HostDrivers/Support/linux/combined-agnostic2.c

@@ -104 +104 @@
 #include "generic/mppresent-generic.c"
 #undef LOG_GROUP
+#include "generic/system-page-size-generic.c"
+#undef LOG_GROUP
 #include "generic/uuid-generic.c"
 #undef LOG_GROUP

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -73 +73 @@
     ${PATH_ROOT}/include/iprt/stdint.h=>include/iprt/stdint.h \
     ${PATH_ROOT}/include/iprt/string.h=>include/iprt/string.h \
+    ${PATH_ROOT}/include/iprt/system.h=>include/iprt/system.h \
     ${PATH_ROOT}/include/iprt/thread.h=>include/iprt/thread.h \
     ${PATH_ROOT}/include/iprt/time.h=>include/iprt/time.h \
@@ -198 +199 @@
     ${PATH_ROOT}/src/VBox/Runtime/generic/errvars-generic.cpp=>generic/errvars-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/generic/mppresent-generic.cpp=>generic/mppresent-generic.c \
+    ${PATH_ROOT}/src/VBox/Runtime/generic/system-page-size-generic.cpp=>generic/system-page-size-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/generic/uuid-generic.cpp=>generic/uuid-generic.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \

trunk/src/VBox/Runtime/Makefile.kmk

@@ -834 +834 @@
 RuntimeBaseR3_SOURCES.x86 += \
         generic/RTMpGetDescription-generic.cpp \
+        generic/system-page-size-generic.cpp \
         common/misc/zero.asm \
         common/misc/RTSystemIsInsideVM-amd64-x86.cpp \
@@ -840 +841 @@
 RuntimeBaseR3_SOURCES.amd64 += \
         generic/RTMpGetDescription-generic.cpp \
+        generic/system-page-size-generic.cpp \
         common/misc/zero.asm \
         common/misc/RTSystemIsInsideVM-amd64-x86.cpp \
@@ -868 +870 @@
 RuntimeBaseR3_SOURCES.sparc32 += \
         generic/RTMpGetDescription-generic-stub.cpp \
+        generic/system-page-size-generic.cpp \
         generic/RTSystemIsInsideVM-generic.cpp \
         common/asm/ASMBitFirstClear-generic.cpp \
@@ -883 +886 @@
 RuntimeBaseR3_SOURCES.sparc64 += \
         generic/RTMpGetDescription-generic-stub.cpp \
+        generic/system-page-size-generic.cpp \
         generic/RTSystemIsInsideVM-generic.cpp \
         common/asm/ASMBitFirstClear-generic.cpp \
@@ -1195 +1199 @@
         r3/linux/semeventmulti-linux.cpp
  RuntimeBaseR3_SOURCES.linux.arm64 += \
+        r3/posix/system-page-size-posix.cpp \
         r3/linux/semevent-linux.cpp \
         r3/linux/semeventmulti-linux.cpp
  RuntimeBaseR3_SOURCES.linux.arm32 += \
+        r3/posix/system-page-size-posix.cpp \
         r3/linux/semevent-linux.cpp \
         r3/linux/semeventmulti-linux.cpp
@@ -1397 +1403 @@
         common/string/mempcpy.cpp \
         common/string/memrchr.cpp \
+        generic/system-page-size-generic.cpp \
         r3/darwin/RTMpGetDescription-generic.cpp
 RuntimeBaseR3_SOURCES.darwin.arm64 += \
         common/string/mempcpy.cpp \
         common/string/memrchr.cpp \
+        generic/system-page-size-generic.cpp \
         r3/darwin/RTMpGetDescription-generic.cpp
 
@@ -3578 +3586 @@
         generic/RTSemEventMultiWait-2-ex-generic.cpp \
         generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \
+        generic/system-page-size-generic.cpp \
         generic/critsect-generic.cpp \
         generic/critsectrw-generic.cpp \

trunk/src/VBox/Runtime/r3/init.cpp

@@ -88 +88 @@
 #include "internal/path.h"
 #include "internal/process.h"
+#include "internal/system.h"
 #include "internal/thread.h"
 #include "internal/time.h"
@@ -407 +408 @@
 #endif /* !IN_GUEST && !RT_NO_GIP */
 
+#if defined(RT_ARCH_ARM64) && defined(RT_OS_LINUX)
+    /*
+     * Initialize the page size.
+     */
+    rc = rtSystemInitPageSize();
+    AssertMsgRCReturn(rc, ("Failed to initialize the page size, rc=%Rrc!\n", rc), rc);
+#endif
+
     /*
      * Thread Thread database and adopt the caller thread as 'main'.