Changeset 101142 in vbox for trunk/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp

Timestamp:

Sep 18, 2023 11:12:16 AM (16 months ago)

Author:

vboxsync

Message:

IPRT/mem: Added a RTMEMPAGEALLOC_F_EXECUTABLE to RTMemPageAllocEx. Untested on windows. bugref:10370

File:

• trunk/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp

@@ -550 +550 @@
 
 /**
- * Allocates one or more pages off the heap.
+ * Frees an allocation.
  *
  * @returns IPRT status code.
+ * @retval  VERR_NOT_FOUND if pv isn't within any of the memory blocks in the
+ *          heap.
+ * @retval  VERR_INVALID_POINTER if the given memory range isn't exactly one
+ *          allocation block.
  * @param   pHeap           The page heap.
  * @param   pv              Pointer to what RTHeapPageAlloc returned.
@@ -652 +656 @@
         }
         else
-            rc = VERR_INVALID_POINTER;
+            rc = VERR_NOT_FOUND; /* Distinct return code for this so rtMemPagePosixFree and others can try alternative heaps. */
 
         RTCritSectLeave(&pHeap->CritSect);
@@ -737 +741 @@
  * Free memory allocated by rtMemPagePosixAlloc.
  *
- * @param   pv                  The address of the memory to free.
- * @param   cb                  The size.
- * @param   pHeap               The heap.
- */
-static void rtMemPagePosixFree(void *pv, size_t cb, PRTHEAPPAGE pHeap)
+ * @param   pv      The address of the memory to free.
+ * @param   cb      The size.
+ * @param   pHeap1  The most probable heap.
+ * @param   pHeap2  The less probable heap.
+ */
+static void rtMemPagePosixFree(void *pv, size_t cb, PRTHEAPPAGE pHeap1, PRTHEAPPAGE pHeap2)
 {
     /*
@@ -763 +768 @@
     else
     {
-        int rc = RTHeapPageFree(pHeap, pv, cb >> PAGE_SHIFT);
+        int rc = RTHeapPageFree(pHeap1, pv, cb >> PAGE_SHIFT);
+        if (rc == VERR_NOT_FOUND)
+            rc = RTHeapPageFree(pHeap2, pv, cb >> PAGE_SHIFT);
         AssertRC(rc);
     }
@@ -787 +794 @@
 {
     AssertReturn(!(fFlags & ~RTMEMPAGEALLOC_F_VALID_MASK), NULL);
-    return rtMemPagePosixAlloc(cb, pszTag, fFlags, &g_MemPagePosixHeap);
+    return rtMemPagePosixAlloc(cb, pszTag, fFlags,
+                               !(fFlags & RTMEMPAGEALLOC_F_EXECUTABLE) ? &g_MemPagePosixHeap : &g_MemExecPosixHeap);
 }
 
@@ -793 +801 @@
 RTDECL(void) RTMemPageFree(void *pv, size_t cb) RT_NO_THROW_DEF
 {
-    return rtMemPagePosixFree(pv, cb, &g_MemPagePosixHeap);
-}
-
+    rtMemPagePosixFree(pv, cb, &g_MemPagePosixHeap, &g_MemExecPosixHeap);
+}
+