Changeset 50008 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Dec 27, 2013 2:20:34 PM (11 years ago)

Author:

vboxsync

Message:

supdrv,iprt: Added VBOX_WITH_TEXT_MODMEM_HACK for getting VMMR0.r0 address in the linux kernel stack crawl.

Location:

trunk/src/VBox/Runtime/r0drv/linux

Files:

• alloc-r0drv-linux.c (modified) (6 diffs)
• initterm-r0drv-linux.c (modified) (2 diffs)

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

@@ -38 +38 @@
 
 
-#if defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)
+#if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP)
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23)
 /**
@@ -96 +96 @@
 /** Spinlock protecting the heap. */
 static RTSPINLOCK   g_HeapExecSpinlock = NIL_RTSPINLOCK;
+#endif
 
 
@@ -104 +105 @@
 DECLHIDDEN(void) rtR0MemExecCleanup(void)
 {
+#ifdef RTMEMALLOC_EXEC_HEAP
     RTSpinlockDestroy(g_HeapExecSpinlock);
     g_HeapExecSpinlock = NIL_RTSPINLOCK;
+#endif
 }
 
@@ -121 +124 @@
  *
  * @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.
@@ -126 +130 @@
 RTR0DECL(int) RTR0MemExecDonate(void *pvMemory, size_t cb)
 {
+#ifdef RTMEMALLOC_EXEC_HEAP
     int rc;
     AssertReturn(g_HeapExec == NIL_RTHEAPSIMPLE, VERR_WRONG_ORDER);
@@ -137 +142 @@
     }
     return rc;
+#else
+    return VERR_NOT_SUPPORTED;
+#endif
 }
 RT_EXPORT_SYMBOL(RTR0MemExecDonate);
 
-#endif /* RTMEMALLOC_EXEC_HEAP */
 
 

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

@@ -50 +50 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-#if defined(RT_ARCH_AMD64) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
 /* in alloc-r0drv0-linux.c */
 DECLHIDDEN(void) rtR0MemExecCleanup(void);
-#endif
 
 
@@ -115 +113 @@
 #endif
 
-#if defined(RT_ARCH_AMD64) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
     rtR0MemExecCleanup();
-#endif
 }