Changeset 100318 in vbox

Timestamp:

Jun 28, 2023 10:36:46 AM (23 months ago)

Author:

vboxsync

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

158033

Message:

include/iprt/{param.h,zero.h,asm.h}: Make the use of PAGE_SIZE/PAGE_SHIFT/PAGE_OFFSET_MASK in linux.arm64 userspace code result in a build error due to unknown page size, for the kerne side the page size is derived from the kernel config bits, bugref:10476

Location:

trunk/include/iprt

Files:

• asm.h (modified) (1 diff)
• param.h (modified) (3 diffs)
• zero.h (modified) (1 diff)

trunk/include/iprt/asm.h

@@ -5567 +5567 @@
 #else
 # define RT_ASM_PAGE_SIZE   0x1000
-# if defined(PAGE_SIZE) && !defined(NT_INCLUDED)
+# if defined(PAGE_SIZE) && !defined(NT_INCLUDED) && !defined(RT_OS_LINUX) && !defined(RT_ARCH_ARM64)
 #  if PAGE_SIZE != 0x1000
 #   error "PAGE_SIZE is not 0x1000!"

trunk/include/iprt/param.h

@@ -65 +65 @@
 # define PAGE_SIZE          8192
 #elif defined(RT_ARCH_ARM64)
-# define PAGE_SIZE          16384
+# if defined(RT_OS_DARWIN)
+#  define PAGE_SIZE         16384
+# elif defined(RT_OS_LINUX)
+#  ifdef IN_RING0
+#   define PAGE_SIZE        (1 << CONFIG_ARM64_PAGE_SHIFT)
+#  else
+#   define PAGE_SIZE        RT_DONT_USE_PAGE_SIZE_ON_LINUX_ARM64_IN_USERSPACE_DUE_TO_VARIABLE_PAGE_SIZE
+#  endif
+# else
+#  error "This needs porting"
+# endif
 #else
 # define PAGE_SIZE          4096
@@ -77 +87 @@
 # define PAGE_SHIFT         13
 #elif defined(RT_ARCH_ARM64)
-# define PAGE_SHIFT         14
+# if defined(RT_OS_DARWIN)
+#  define PAGE_SHIFT        14
+# elif defined(RT_OS_LINUX)
+#  ifdef IN_RING0
+#   define PAGE_SHIFT       CONFIG_ARM64_PAGE_SHIFT
+#  else
+#   define PAGE_SHIFT       RT_DONT_USE_PAGE_SHIFT_ON_LINUX_ARM64_IN_USERSPACE_DUE_TO_VARIABLE_PAGE_SIZE
+#  endif
+# else
+#  error "This needs porting"
+# endif
 #else
 # define PAGE_SHIFT         12
@@ -91 +111 @@
 # define PAGE_OFFSET_MASK    0x1fff
 #elif defined(RT_ARCH_ARM64)
-# define PAGE_OFFSET_MASK    0x3fff
+# if defined(RT_OS_DARWIN)
+#  define PAGE_OFFSET_MASK   0x3fff
+# elif defined(RT_OS_LINUX)
+#  ifdef IN_RING0
+#   define PAGE_OFFSET_MASK  (PAGE_SIZE - 1)
+#  else
+#   define PAGE_OFFSET_MASK  RT_DONT_USE_PAGE_OFFSET_MASK_ON_LINUX_ARM64_IN_USERSPACE_DUE_TO_VARIABLE_PAGE_SIZE
+#  endif
+# else
+#  error "This needs porting"
+# endif
 #else
 # define PAGE_OFFSET_MASK    0xfff

trunk/include/iprt/zero.h

@@ -53 +53 @@
  */
 
+/* Not available on linux.arm64 due to unknown page size in userspace. */
+#if !defined(RT_ARCH_ARM64) && !defined(RT_OS_LINUX)
 extern RTDATADECL(uint8_t const)   g_abRTZeroPage[PAGE_SIZE];
+#endif
 extern RTDATADECL(uint8_t const)   g_abRTZero4K[_4K];
 extern RTDATADECL(uint8_t const)   g_abRTZero8K[_8K];