Changeset 97901 in vbox for trunk

Timestamp:

Dec 29, 2022 5:59:30 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/memobj-r0drv-solaris.c: Implemented support for the fExecutable parameter for regular PAGE allocations, rejecting attempt at executable LOW and CONT allocations. This should make it possible to enable SUPDRV_USE_MEMOBJ_FOR_LDR_IMAGE on all hosts and drop RTMemExecAlloc et al.

File:

• trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c (modified) (7 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c

@@ -76 +76 @@
     /** Access during locking. */
     int                 fAccess;
-    /** Set if large pages are involved in an RTR0MEMOBJTYPE_PHYS
-     *  allocation. */
+    /** Set if large pages are involved in an RTR0MEMOBJTYPE_PHYS allocation. */
     bool                fLargePage;
-    /** Whether we have individual pages or a kernel-mapped virtual memory block in
-     *  an RTR0MEMOBJTYPE_PHYS_NC allocation. */
+    /** Whether we have individual pages or a kernel-mapped virtual memory
+     * block in an RTR0MEMOBJTYPE_PHYS_NC allocation. */
     bool                fIndivPages;
+    /** Set if executable allocation - only RTR0MEMOBJTYPE_PHYS. */
+    bool                fExecutable;
 } RTR0MEMOBJSOL, *PRTR0MEMOBJSOL;
 
@@ -630 +631 @@
 
         case RTR0MEMOBJTYPE_PAGE:
-            ddi_umem_free(pMemSolaris->Cookie);
+            if (!pMemSolaris->fExecutable)
+                ddi_umem_free(pMemSolaris->Cookie);
+            else
+                segkmem_free(heaptext_arena, pMemSolaris->Core.pv, pMemSolaris->Core.cb);
             break;
 
@@ -642 +646 @@
 
         case RTR0MEMOBJTYPE_RES_VIRT:
-        {
             if (pMemSolaris->Core.u.ResVirt.R0Process == NIL_RTR0PROCESS)
                 vmem_xfree(heap_arena, pMemSolaris->Core.pv, pMemSolaris->Core.cb);
@@ -648 +651 @@
                 AssertFailed();
             break;
-        }
 
         case RTR0MEMOBJTYPE_CONT: /* we don't use this type here. */
@@ -666 +668 @@
     if (pMemSolaris)
     {
-        void *pvMem = ddi_umem_alloc(cb, DDI_UMEM_SLEEP, &pMemSolaris->Cookie);
+        void *pvMem;
+        if (!fExecutable)
+        {
+            pMemSolaris->Core.fFlags |= RTR0MEMOBJ_FLAGS_ZERO_AT_ALLOC;
+            pvMem = ddi_umem_alloc(cb, DDI_UMEM_SLEEP, &pMemSolaris->Cookie);
+        }
+        else
+        {
+            pMemSolaris->Core.fFlags |= RTR0MEMOBJ_FLAGS_UNINITIALIZED_AT_ALLOC; /** @todo does segkmem_alloc zero the memory? */
+            pvMem = segkmem_alloc(heaptext_arena, cb, KM_SLEEP);
+        }
         if (pvMem)
         {
-            pMemSolaris->Core.fFlags |= RTR0MEMOBJ_FLAGS_ZERO_AT_ALLOC;
             pMemSolaris->Core.pv  = pvMem;
             pMemSolaris->pvHandle = NULL;
+            pMemSolaris->fExecutable = fExecutable;
             *ppMem = &pMemSolaris->Core;
             return VINF_SUCCESS;
@@ -691 +703 @@
 DECLHIDDEN(int) rtR0MemObjNativeAllocLow(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable, const char *pszTag)
 {
-    NOREF(fExecutable);
+    AssertReturn(!fExecutable, VERR_NOT_SUPPORTED);
 
     /* Create the object */
@@ -717 +729 @@
 DECLHIDDEN(int) rtR0MemObjNativeAllocCont(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable, const char *pszTag)
 {
-    NOREF(fExecutable);
+    AssertReturn(!fExecutable, VERR_NOT_SUPPORTED);
     return rtR0MemObjNativeAllocPhys(ppMem, cb, _4G - 1, PAGE_SIZE /* alignment */, pszTag);
 }