Changeset 97905 in vbox

Timestamp:

Dec 29, 2022 6:22:23 PM (2 years ago)

Author:

vboxsync

Message:

IPRT,SUPDrv: Dropping RTR0MemExecDonate and associated SUPDrv-linux code, it's not needed since linux started using RTR0MemObjAllocPage for r0 images. bugref:9801

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/mem.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (modified) (3 diffs)
• src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c (modified) (1 diff)

trunk/include/iprt/mangling.h

@@ -1866 +1866 @@
 # define RTR0Init                                       RT_MANGLER(RTR0Init)                   /* r0drv */
 # define RTR0MemAreKrnlAndUsrDifferent                  RT_MANGLER(RTR0MemAreKrnlAndUsrDifferent) /* r0drv */
-# define RTR0MemExecDonate                              RT_MANGLER(RTR0MemExecDonate)          /* r0drv */
 # define RTR0MemKernelIsValidAddr                       RT_MANGLER(RTR0MemKernelIsValidAddr)   /* r0drv */
 # define RTR0MemObjAddress                              RT_MANGLER(RTR0MemObjAddress)          /* r0drv */

trunk/include/iprt/mem.h

@@ -467 +467 @@
 RTDECL(void)    RTMemExecFree(void *pv, size_t cb) RT_NO_THROW_PROTO;
 
-#if defined(IN_RING0) && defined(RT_ARCH_AMD64) && defined(RT_OS_LINUX)
-/**
- * Donate read+write+execute memory to the exec heap.
- *
- * This API is specific to AMD64 and Linux/GNU. A kernel module that desires to
- * use RTMemExecAlloc on AMD64 Linux/GNU will have to donate some statically
- * allocated memory in the module if it wishes for GCC generated code to work.
- * GCC can only generate modules that work in the address range ~2GB to ~0
- * currently.
- *
- * The API only accept one single donation.
- *
- * @returns IPRT status code.
- * @param   pvMemory    Pointer to the memory block.
- * @param   cb          The size of the memory block.
- */
-RTR0DECL(int) RTR0MemExecDonate(void *pvMemory, size_t cb) RT_NO_THROW_PROTO;
-#endif /* R0+AMD64+LINUX */
-
 /**
  * Allocate page aligned memory with default tag.

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -175 +175 @@
 #define DEVICE_NAME_USR     "vboxdrvu"
 
-#if (defined(RT_ARCH_AMD64) && RTLNX_VER_MAX(2,6,23)) || defined(VBOX_WITH_TEXT_MODMEM_HACK)
-/**
- * Memory for the executable memory heap (in IPRT).
- */
-# ifdef DEBUG
-#  define EXEC_MEMORY_SIZE   10485760   /* 10 MB */
-# else
-#  define EXEC_MEMORY_SIZE   8388608    /* 8 MB */
-# endif
-extern uint8_t g_abExecMemory[EXEC_MEMORY_SIZE];
-# ifndef VBOX_WITH_TEXT_MODMEM_HACK
-__asm__(".section execmemory, \"awx\", @progbits\n\t"
-        ".align 32\n\t"
-        ".globl g_abExecMemory\n"
-        "g_abExecMemory:\n\t"
-        ".zero " RT_XSTR(EXEC_MEMORY_SIZE) "\n\t"
-        ".type g_abExecMemory, @object\n\t"
-        ".size g_abExecMemory, " RT_XSTR(EXEC_MEMORY_SIZE) "\n\t"
-        ".text\n\t");
-# else
-__asm__(".text\n\t"
-        ".align 4096\n\t"
-        ".globl g_abExecMemory\n"
-        "g_abExecMemory:\n\t"
-        ".zero " RT_XSTR(EXEC_MEMORY_SIZE) "\n\t"
-        ".type g_abExecMemory, @object\n\t"
-        ".size g_abExecMemory, " RT_XSTR(EXEC_MEMORY_SIZE) "\n\t"
-        ".text\n\t");
-# endif
-#endif
-
 /** The file_operations structure. */
 static struct file_operations gFileOpsVBoxDrvSys =
@@ -395 +364 @@
         if (RT_SUCCESS(rc))
         {
-#if (defined(RT_ARCH_AMD64) && RTLNX_VER_MAX(2,6,23)) || defined(VBOX_WITH_TEXT_MODMEM_HACK)
-# ifdef VBOX_WITH_TEXT_MODMEM_HACK
-            set_memory_x(&g_abExecMemory[0], sizeof(g_abExecMemory) / PAGE_SIZE);
-            set_memory_rw(&g_abExecMemory[0], sizeof(g_abExecMemory) / PAGE_SIZE);
-# endif
-            rc = RTR0MemExecDonate(&g_abExecMemory[0], sizeof(g_abExecMemory));
-            printk(KERN_DEBUG "VBoxDrv: dbg - g_abExecMemory=%p\n", (void *)&g_abExecMemory[0]);
-#endif
             Log(("VBoxDrv::ModuleInit\n"));
 
@@ -408 +369 @@
              * Initialize the device extension.
              */
-            if (RT_SUCCESS(rc))
-                rc = supdrvInitDevExt(&g_DevExt, sizeof(SUPDRVSESSION));
+            rc = supdrvInitDevExt(&g_DevExt, sizeof(SUPDRVSESSION));
             if (RT_SUCCESS(rc))
             {

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

@@ -122 +122 @@
 #endif
 }
-
-
-/**
- * Donate read+write+execute memory to the exec heap.
- *
- * This API is specific to AMD64 and Linux/GNU. A kernel module that desires to
- * use RTMemExecAlloc on AMD64 Linux/GNU will have to donate some statically
- * allocated memory in the module if it wishes for GCC generated code to work.
- * GCC can only generate modules that work in the address range ~2GB to ~0
- * currently.
- *
- * The API only accept one single donation.
- *
- * @returns IPRT status code.
- * @retval  VERR_NOT_SUPPORTED if the code isn't enabled.
- * @param   pvMemory    Pointer to the memory block.
- * @param   cb          The size of the memory block.
- */
-RTR0DECL(int) RTR0MemExecDonate(void *pvMemory, size_t cb)
-{
-#ifdef RTMEMALLOC_EXEC_HEAP
-    int rc;
-    AssertReturn(g_HeapExec == NIL_RTHEAPSIMPLE, VERR_WRONG_ORDER);
-
-    rc = RTSpinlockCreate(&g_HeapExecSpinlock, RTSPINLOCK_FLAGS_INTERRUPT_SAFE, "RTR0MemExecDonate");
-    if (RT_SUCCESS(rc))
-    {
-        rc = RTHeapSimpleInit(&g_HeapExec, pvMemory, cb);
-        if (RT_FAILURE(rc))
-            rtR0MemExecCleanup();
-    }
-    return rc;
-#else
-    RT_NOREF_PV(pvMemory); RT_NOREF_PV(cb);
-    return VERR_NOT_SUPPORTED;
-#endif
-}
-RT_EXPORT_SYMBOL(RTR0MemExecDonate);
-