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

Timestamp:

Jan 2, 2023 4:50:43 PM (2 years ago)

Author:

vboxsync

Message:

Add/VBoxGuestR0LibPhysHeap.cpp: Made it possible to use RTR0MemObjFree instead of RTMemContFree (disabled everywhere).

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibPhysHeap.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibPhysHeap.cpp

@@ -62 +62 @@
 #include <iprt/err.h>
 #include <iprt/mem.h>
+#include <iprt/memobj.h>
 #include <iprt/semaphore.h>
 
@@ -146 +147 @@
                                                     - VBGL_PH_ALLOC_ALIGN, \
                                                     VBGL_PH_ALLOC_ALIGN)
+
+/**
+ * Whether to use the RTR0MemObjAllocCont API or RTMemContAlloc for
+ * allocating chunks.
+ *
+ * This can be enabled on hosts where RTMemContAlloc is more complicated than
+ * RTR0MemObjAllocCont.  This can also be done if we wish to save code space, as
+ * the latter is typically always dragged into the link on guests where the
+ * linker cannot eliminiate functions within objects.  Only drawback is that
+ * RTR0MemObjAllocCont requires another heap allocation for the handle.
+ */
+#if defined(DOXYGEN_RUNNING) || (!defined(IN_TESTCASE) && 0)
+# define VBGL_PH_USE_MEMOBJ
+#endif
 
 
@@ -207 +222 @@
     uint32_t physAddr;
 
+#if !defined(VBGL_PH_USE_MEMOBJ) || ARCH_BITS != 32
     uint32_t uPadding1;
+#endif
 
     /** Number of block of any kind. */
@@ -218 +235 @@
     /** Pointer to the previous chunk. */
     VBGLPHYSHEAPCHUNK  *pPrev;
+
+#if defined(VBGL_PH_USE_MEMOBJ)
+    /** The allocation handle. */
+    RTR0MEMOBJ          hMemObj;
+#endif
+
 #if ARCH_BITS == 64
     /** Pad the size up to 64 bytes. */
+# ifdef VBGL_PH_USE_MEMOBJ
+    uintptr_t           auPadding2[2];
+# else
     uintptr_t           auPadding2[3];
+# endif
 #endif
 };
@@ -486 +513 @@
 static VBGLPHYSHEAPFREEBLOCK *vbglPhysHeapChunkAlloc(uint32_t cbMinBlock)
 {
-    RTCCPHYS           PhysAddr = NIL_RTHCPHYS;
-    VBGLPHYSHEAPCHUNK *pChunk;
-    uint32_t           cbChunk;
+    RTCCPHYS            PhysAddr = NIL_RTHCPHYS;
+    VBGLPHYSHEAPCHUNK  *pChunk;
+    uint32_t            cbChunk;
+#ifdef VBGL_PH_USE_MEMOBJ
+    RTR0MEMOBJ          hMemObj = NIL_RTR0MEMOBJ;
+    int                 rc;
+#endif
+
     VBGL_PH_DPRINTF(("Allocating new chunk for %#x byte allocation\n", cbMinBlock));
     AssertReturn(cbMinBlock <= VBGL_PH_LARGEST_ALLOC_SIZE, NULL); /* paranoia */
@@ -509 +541 @@
      * physical address to the host.
      */
+#ifdef VBGL_PH_USE_MEMOBJ
+    rc = RTR0MemObjAllocCont(&hMemObj, cbChunk, false /*fExecutable*/);
+    pChunk = (VBGLPHYSHEAPCHUNK *)(RT_SUCCESS(rc) ? RTR0MemObjAddress(hMemObj) : NULL);
+#else
     pChunk = (VBGLPHYSHEAPCHUNK *)RTMemContAlloc(&PhysAddr, cbChunk);
+#endif
     if (!pChunk)
     {
@@ -520 +557 @@
                 cbChunk >>= 2;
                 cbChunk = RT_ALIGN_32(cbChunk, PAGE_SIZE);
+#ifdef VBGL_PH_USE_MEMOBJ
+                rc = RTR0MemObjAllocCont(&hMemObj, cbChunk, false /*fExecutable*/);
+                pChunk = (VBGLPHYSHEAPCHUNK *)(RT_SUCCESS(rc) ? RTR0MemObjAddress(hMemObj) : NULL);
+#else
                 pChunk = (VBGLPHYSHEAPCHUNK *)RTMemContAlloc(&PhysAddr, cbChunk);
+#endif
             } while (!pChunk && cbChunk > cbMinChunk);
     }
@@ -539 +581 @@
         pChunk->pNext            = NULL;
         pChunk->pPrev            = NULL;
+#ifdef VBGL_PH_USE_MEMOBJ
+        pChunk->hMemObj          = hMemObj;
+#endif
+
+        /* Initialize the padding too: */
+#if !defined(VBGL_PH_USE_MEMOBJ) || ARCH_BITS != 32
         pChunk->uPadding1        = UINT32_C(0xADDCAAA1);
+#endif
 #if ARCH_BITS == 64
         pChunk->auPadding2[0]    = UINT64_C(0xADDCAAA3ADDCAAA2);
         pChunk->auPadding2[1]    = UINT64_C(0xADDCAAA5ADDCAAA4);
+# ifndef VBGL_PH_USE_MEMOBJ
         pChunk->auPadding2[2]    = UINT64_C(0xADDCAAA7ADDCAAA6);
+# endif
 #endif
 
@@ -627 +678 @@
      * Finally, free the chunk memory.
      */
+#ifdef VBGL_PH_USE_MEMOBJ
+    RTR0MemObjFree(pChunk->hMemObj, true /*fFreeMappings*/);
+#else
     RTMemContFree(pChunk, pChunk->cbChunk);
+#endif
 }