Changeset 100309 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jun 28, 2023 10:25:37 AM (19 months ago)

Author:

vboxsync

Message:

Runtime/common/alloc/memcache.cpp: Replace occurences of PAGE_SIZE/PAGE_OFFSET_MASK with RTSystemGetPageSize()/RTSystemGetPageOffsetMask(), bugref:10476

File:

• trunk/src/VBox/Runtime/common/alloc/memcache.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/common/alloc/memcache.cpp

@@ -47 +47 @@
 #include <iprt/err.h>
 #include <iprt/mem.h>
-#include <iprt/param.h>
+#include <iprt/system.h>
 
 #include "internal/magics.h"
@@ -175 +175 @@
     AssertReturn(!pfnDtor || pfnCtor, VERR_INVALID_PARAMETER);
     AssertReturn(cbObject > 0, VERR_INVALID_PARAMETER);
-    AssertReturn(cbObject <= PAGE_SIZE / 8, VERR_INVALID_PARAMETER);
+
+    size_t const cbPage = RTSystemGetPageSize();
+    AssertReturn(cbObject <= cbPage / 8, VERR_INVALID_PARAMETER);
     AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
 
@@ -215 +217 @@
     pThis->cbObject         = (uint32_t)RT_ALIGN_Z(cbObject, cbAlignment);
     pThis->cbAlignment      = (uint32_t)cbAlignment;
-    pThis->cPerPage         = (uint32_t)((PAGE_SIZE - RT_ALIGN_Z(sizeof(RTMEMCACHEPAGE), cbAlignment)) / pThis->cbObject);
+    pThis->cPerPage         = (uint32_t)((cbPage - RT_ALIGN_Z(sizeof(RTMEMCACHEPAGE), cbAlignment)) / pThis->cbObject);
     while (  RT_ALIGN_Z(sizeof(RTMEMCACHEPAGE), 8)
            + pThis->cPerPage * pThis->cbObject
            + RT_ALIGN(pThis->cPerPage, 64) / 8 * 2
-           > PAGE_SIZE)
+           > cbPage)
         pThis->cPerPage--;
     pThis->cBits            = RT_ALIGN(pThis->cPerPage, 64);
@@ -276 +278 @@
         }
 
-        RTMemPageFree(pPage, PAGE_SIZE);
+        RTMemPageFree(pPage, RTSystemGetPageSize());
     }
 
@@ -310 +312 @@
          * on the cache.
          */
-        PRTMEMCACHEPAGE pPage = (PRTMEMCACHEPAGE)RTMemPageAlloc(PAGE_SIZE);
+        size_t const cbPage = RTSystemGetPageSize();
+        PRTMEMCACHEPAGE pPage = (PRTMEMCACHEPAGE)RTMemPageAlloc(cbPage);
         if (pPage)
         {
@@ -323 +326 @@
             pb = RT_ALIGN_PT(pb, 8, uint8_t *);
             pPage->pbmCtor      = pb;
-            pb = (uint8_t *)pPage + PAGE_SIZE - pThis->cbObject * cObjects;
+            pb = (uint8_t *)pPage + cbPage - pThis->cbObject * cObjects;
             pPage->pbObjects    = pb;   Assert(RT_ALIGN_P(pb, pThis->cbAlignment) == pb);
             pb -= pThis->cBits / 8;
@@ -471 +474 @@
     }
     void *pvObj = &pPage->pbObjects[iObj * pThis->cbObject];
-    Assert((uintptr_t)pvObj - (uintptr_t)pPage < PAGE_SIZE);
+    Assert((uintptr_t)pvObj - (uintptr_t)pPage < RTSystemGetPageSize());
 
     /*
@@ -517 +520 @@
      * Find the cache page.  The page structure is at the start of the page.
      */
-    PRTMEMCACHEPAGE pPage = (PRTMEMCACHEPAGE)(((uintptr_t)pvObj) & ~(uintptr_t)PAGE_OFFSET_MASK);
+    PRTMEMCACHEPAGE pPage = (PRTMEMCACHEPAGE)(((uintptr_t)pvObj) & ~RTSystemGetPageOffsetMask());
     Assert(pPage->pCache == pThis);
     Assert(ASMAtomicUoReadS32(&pPage->cFree) < (int32_t)pThis->cPerPage);
@@ -573 +576 @@
 # ifdef RT_STRICT
         /* This is the same as the other branch, except it's not actually freed. */
-        PRTMEMCACHEPAGE pPage = (PRTMEMCACHEPAGE)(((uintptr_t)pvObj) & ~(uintptr_t)PAGE_OFFSET_MASK);
+        PRTMEMCACHEPAGE pPage = (PRTMEMCACHEPAGE)(((uintptr_t)pvObj) & ~RTSystemGetPageOffsetMask());
         Assert(pPage->pCache == pThis);
         Assert(ASMAtomicUoReadS32(&pPage->cFree) < (int32_t)pThis->cPerPage);