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

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/darwin/alloc-r0drv-darwin.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp

@@ -51 +51 @@
 
 
-/*********************************************************************************************************************************
-*   Structures and Typedefs                                                                                                      *
-*********************************************************************************************************************************/
-/**
- * Extended header used for headers marked with RTMEMHDR_FLAG_EXEC.
- *
- * This is used with allocating executable memory, for things like generated
- * code and loaded modules.
- */
-typedef struct RTMEMDARWINHDREX
-{
-    /** The associated memory object. */
-    RTR0MEMOBJ          hMemObj;
-    /** Alignment padding. */
-    uint8_t             abPadding[ARCH_BITS == 32 ? 12 : 8];
-    /** The header we present to the generic API. */
-    RTMEMHDR            Hdr;
-} RTMEMDARWINHDREX;
-AssertCompileSize(RTMEMDARWINHDREX, 32);
-/** Pointer to an extended memory header. */
-typedef RTMEMDARWINHDREX *PRTMEMDARWINHDREX;
-
 
 /**
@@ -80 +58 @@
 {
     IPRT_DARWIN_SAVE_EFL_AC();
+    if (RT_LIKELY(!(fFlags & RTMEMHDR_FLAG_ANY_CTX)))
+    {
+        PRTMEMHDR pHdr = (PRTMEMHDR)IOMalloc(cb + sizeof(*pHdr));
+        if (RT_LIKELY(pHdr))
+        {
+            pHdr->u32Magic  = RTMEMHDR_MAGIC;
+            pHdr->fFlags    = fFlags;
+            pHdr->cb        = cb;
+            pHdr->cbReq     = cb;
+            *ppHdr = pHdr;
 
-    if (RT_UNLIKELY(fFlags & RTMEMHDR_FLAG_ANY_CTX))
-        return VERR_NOT_SUPPORTED;
+            IPRT_DARWIN_RESTORE_EFL_AC();
+            return VINF_SUCCESS;
+        }
 
-    PRTMEMHDR pHdr;
-    if (fFlags & RTMEMHDR_FLAG_EXEC)
-    {
-        RTR0MEMOBJ hMemObj;
-        int rc = RTR0MemObjAllocPage(&hMemObj, cb + sizeof(RTMEMDARWINHDREX), true /*fExecutable*/);
-        if (RT_FAILURE(rc))
-        {
-            IPRT_DARWIN_RESTORE_EFL_AC();
-            return rc;
-        }
-        PRTMEMDARWINHDREX pExHdr = (PRTMEMDARWINHDREX)RTR0MemObjAddress(hMemObj);
-        pExHdr->hMemObj = hMemObj;
-        pHdr = &pExHdr->Hdr;
-#if 1 /*fExecutable isn't currently honored above. */
-        rc = RTR0MemObjProtect(hMemObj, 0, RTR0MemObjSize(hMemObj), RTMEM_PROT_READ | RTMEM_PROT_WRITE | RTMEM_PROT_EXEC);
-        AssertRC(rc);
-#endif
+        printf("rtR0MemAllocEx(%#zx, %#x) failed\n", cb + sizeof(*pHdr), fFlags);
+        IPRT_DARWIN_RESTORE_EFL_AC();
+        return VERR_NO_MEMORY;
     }
-    else
-    {
-        pHdr = (PRTMEMHDR)IOMalloc(cb + sizeof(*pHdr));
-        if (RT_UNLIKELY(!pHdr))
-        {
-            printf("rtR0MemAllocEx(%#zx, %#x) failed\n", cb + sizeof(*pHdr), fFlags);
-            IPRT_DARWIN_RESTORE_EFL_AC();
-            return VERR_NO_MEMORY;
-        }
-    }
-
-    pHdr->u32Magic  = RTMEMHDR_MAGIC;
-    pHdr->fFlags    = fFlags;
-    pHdr->cb        = cb;
-    pHdr->cbReq     = cb;
-    *ppHdr = pHdr;
-
     IPRT_DARWIN_RESTORE_EFL_AC();
-    return VINF_SUCCESS;
+    return VERR_NOT_SUPPORTED;
 }
 
@@ -132 +90 @@
 
     pHdr->u32Magic += 1;
-    if (pHdr->fFlags & RTMEMHDR_FLAG_EXEC)
-    {
-        PRTMEMDARWINHDREX pExHdr = RT_FROM_MEMBER(pHdr, RTMEMDARWINHDREX, Hdr);
-        int rc = RTR0MemObjFree(pExHdr->hMemObj, false /*fFreeMappings*/);
-        AssertRC(rc);
-    }
-    else
-        IOFree(pHdr, pHdr->cb + sizeof(*pHdr));
+    IOFree(pHdr, pHdr->cb + sizeof(*pHdr));
 
     IPRT_DARWIN_RESTORE_EFL_AC();