Changeset 100316 in vbox for trunk/src/VBox/Additions/common

Timestamp:

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

Author:

vboxsync

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

158031

Message:

Additions/VBoxService/VBoxServiceBalloon.cpp: Replace PAGE_SIZE with RTSystemGetPageSize(), bugref:10476

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp

@@ -99 +99 @@
 {
 #ifdef RT_OS_LINUX
-    void *pv = (void*)mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    size_t const cbPage = RTSystemGetPageSize();
+    void *pv = (void*)mmap(NULL, cbPage, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
     if (pv != MAP_FAILED)
     {
-        g_fSysMadviseWorks = madvise(pv, PAGE_SIZE, MADV_DONTFORK) == 0;
-        munmap(pv, PAGE_SIZE);
+        g_fSysMadviseWorks = madvise(pv, cbPage, MADV_DONTFORK) == 0;
+        munmap(pv, cbPage);
     }
 #endif
@@ -119 +120 @@
 
 #ifdef RT_OS_LINUX
+    size_t const cbPage = RTSystemGetPageSize();
     if (!g_fSysMadviseWorks)
-        cb += 2 * PAGE_SIZE;
+        cb += 2 * cbPage;
 
     pu8 = (char*)mmap(NULL, cb, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
@@ -143 +145 @@
          * area struct of the very same size as the mmap area.
          */
-        RTMemProtect(pu8, PAGE_SIZE, RTMEM_PROT_NONE);
-        RTMemProtect(pu8 + cb - PAGE_SIZE, PAGE_SIZE, RTMEM_PROT_NONE);
-        pu8 += PAGE_SIZE;
+        RTMemProtect(pu8, cbPage, RTMEM_PROT_NONE);
+        RTMemProtect(pu8 + cb - cbPage, cbPage, RTMEM_PROT_NONE);
+        pu8 += cbPage;
     }
 
@@ -170 +172 @@
 
 #ifdef RT_OS_LINUX
-
     if (!g_fSysMadviseWorks)
     {
-        cb += 2 * PAGE_SIZE;
-        pu8 -= PAGE_SIZE;
+        size_t const cbPage = RTSystemGetPageSize();
+
+        cb += 2 * cbPage;
+        pu8 -= cbPage;
         /* This is not really necessary */
-        RTMemProtect(pu8, PAGE_SIZE, RTMEM_PROT_READ | RTMEM_PROT_WRITE);
-        RTMemProtect(pu8 + cb - PAGE_SIZE, PAGE_SIZE, RTMEM_PROT_READ | RTMEM_PROT_WRITE);
+        RTMemProtect(pu8, cbPage, RTMEM_PROT_READ | RTMEM_PROT_WRITE);
+        RTMemProtect(pu8 + cb - cbPage, cbPage, RTMEM_PROT_READ | RTMEM_PROT_WRITE);
     }
     munmap(pu8, cb);