Changeset 108724 in vbox for trunk/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp

Timestamp:

Mar 24, 2025 6:53:21 PM (4 weeks ago)

Author:

vboxsync

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

168147

Message:

HostDrivers/Support: Make SUPR3 work on hosts where the page size is not known during compile time, bugref:10391

File:

• trunk/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp (modified) (7 diffs)

trunk/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp

@@ -64 +64 @@
 #include <VBox/types.h>
 #include <iprt/string.h>
-#include <iprt/system.h>
 #include <VBox/err.h>
 #include <VBox/param.h>
@@ -100 +99 @@
      * Check if madvise works.
      */
-    void *pv = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    uint32_t const cbPage = SUP_PAGE_SIZE;
+    void *pv = mmap(NULL, cbPage, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
     if (pv == MAP_FAILED)
         return VERR_NO_MEMORY;
-    pThis->fSysMadviseWorks = (0 == madvise(pv, PAGE_SIZE, MADV_DONTFORK));
-    munmap(pv, PAGE_SIZE);
+    pThis->fSysMadviseWorks = (0 == madvise(pv, cbPage, MADV_DONTFORK));
+    munmap(pv, cbPage);
 
     /*
@@ -256 +256 @@
 #endif
 
-    size_t cbMmap = cPages << PAGE_SHIFT;
+    uint32_t const cbPage = SUP_PAGE_SIZE;
+    uint32_t const cPageShift = SUP_PAGE_SHIFT;
+
+    size_t cbMmap = cPages << cPageShift;
     if (   !pThis->fSysMadviseWorks
         && (fFlags & (SUP_PAGE_ALLOC_F_FOR_LOCKING | SUP_PAGE_ALLOC_F_LARGE_PAGES)) == SUP_PAGE_ALLOC_F_FOR_LOCKING)
-        cbMmap += PAGE_SIZE * 2;
+        cbMmap += cbPage * 2;
 
     uint8_t *pbPages = (uint8_t *)mmap(NULL, cbMmap, PROT_READ | PROT_WRITE, fMmap, -1, 0);
@@ -268 +271 @@
         fMmap &= ~MAP_HUGETLB;
         if (!pThis->fSysMadviseWorks && (fFlags & SUP_PAGE_ALLOC_F_FOR_LOCKING))
-            cbMmap = (cPages + 2) << PAGE_SHIFT;
+            cbMmap = (cPages + 2) << cPageShift;
         pbPages = (uint8_t *)mmap(NULL, cbMmap, PROT_READ | PROT_WRITE, fMmap, -1, 0);
     }
@@ -313 +316 @@
              * area struct of the very same size as the mmap area.
              */
-            mprotect(pbPages,                      PAGE_SIZE, PROT_NONE);
-            mprotect(pbPages + cbMmap - PAGE_SIZE, PAGE_SIZE, PROT_NONE);
-            pbPages += PAGE_SHIFT;
+            mprotect(pbPages,                   cbPage, PROT_NONE);
+            mprotect(pbPages + cbMmap - cbPage, cbPage, PROT_NONE);
+            pbPages += cPageShift;
         }
 
@@ -322 +325 @@
          * so I qualified it with SUP_PAGE_ALLOC_F_FOR_LOCKING (unused) for now... */
         if (fFlags & SUP_PAGE_ALLOC_F_FOR_LOCKING)
-            memset(pbPages, 0, cPages << PAGE_SHIFT);
+            memset(pbPages, 0, cPages << cPageShift);
 
         *ppvPages = pbPages;
@@ -334 +337 @@
 {
     NOREF(pThis);
-    munmap(pvPages, cPages << PAGE_SHIFT);
+    munmap(pvPages, cPages << SUP_PAGE_SHIFT);
     return VINF_SUCCESS;
 }