Changeset 97910 in vbox for trunk/src/VBox/Runtime/r0drv/solaris

Timestamp:

Dec 29, 2022 7:15:56 PM (2 years ago)

Author:

vboxsync

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

155000

Message:

IPRT/r0drv: Kicked out RTMEMHDR_FLAG_EXEC and associated code now that RTMemExecAlloc have been removed and RTMEMALLOCEX_FLAGS_EXEC is ring-3 only. This should simplify maintaining the linux code a bit, I hope. bugref:4567:65

File:

• trunk/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c (modified) (2 diffs)

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

@@ -80 +80 @@
     size_t      cbAllocated = cb;
     PRTMEMHDR   pHdr;
-
-#ifdef RT_ARCH_AMD64
-    if (fFlags & RTMEMHDR_FLAG_EXEC)
-    {
-        AssertReturn(!(fFlags & RTMEMHDR_FLAG_ANY_CTX), VERR_NOT_SUPPORTED);
-        cbAllocated = RT_ALIGN_Z(cb + sizeof(*pHdr), PAGE_SIZE) - sizeof(*pHdr);
-        pHdr = (PRTMEMHDR)segkmem_alloc(heaptext_arena, cbAllocated + sizeof(*pHdr), KM_SLEEP);
-    }
+    unsigned fKmFlags = fFlags & RTMEMHDR_FLAG_ANY_CTX_ALLOC ? KM_NOSLEEP : KM_SLEEP;
+    if (fFlags & RTMEMHDR_FLAG_ZEROED)
+        pHdr = (PRTMEMHDR)kmem_zalloc(cb + sizeof(*pHdr), fKmFlags);
     else
-#endif
-    {
-        unsigned fKmFlags = fFlags & RTMEMHDR_FLAG_ANY_CTX_ALLOC ? KM_NOSLEEP : KM_SLEEP;
-        if (fFlags & RTMEMHDR_FLAG_ZEROED)
-            pHdr = (PRTMEMHDR)kmem_zalloc(cb + sizeof(*pHdr), fKmFlags);
-        else
-            pHdr = (PRTMEMHDR)kmem_alloc(cb + sizeof(*pHdr), fKmFlags);
-    }
+        pHdr = (PRTMEMHDR)kmem_alloc(cb + sizeof(*pHdr), fKmFlags);
     if (RT_UNLIKELY(!pHdr))
     {
@@ -119 +107 @@
 {
     pHdr->u32Magic += 1;
-#ifdef RT_ARCH_AMD64
-    if (pHdr->fFlags & RTMEMHDR_FLAG_EXEC)
-        segkmem_free(heaptext_arena, pHdr, pHdr->cb + sizeof(*pHdr));
-    else
-#endif
-        kmem_free(pHdr, pHdr->cb + sizeof(*pHdr));
+    kmem_free(pHdr, pHdr->cb + sizeof(*pHdr));
 }