Changeset 50008 in vbox for trunk/src/VBox/HostDrivers

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/HostDrivers/Support

Files:

• SUPDrv.c (modified) (1 diff)
• linux/Makefile (modified) (1 diff)
• linux/SUPDrv-linux.c (modified) (2 diffs)

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

@@ -4461 +4461 @@
             supdrvLdrUnsetVMMR0EPs(pDevExt);
     }
+    SUPR0Printf("vboxdrv: %p %s\n", pImage->pvImage, pImage->szName);
 
     if (RT_FAILURE(rc))

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -276 +276 @@
  #KFLAGS  += -DIPRT_DEBUG_SEMS
 endif
+ifdef VBOX_WITH_TEXT_MODMEM_HACK
+ KFLAGS += -DRTMEMALLOC_EXEC_HEAP -DVBOX_WITH_TEXT_MODMEM_HACK
+endif
 
 # 2.6 and later

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

@@ -153 +153 @@
 #define DEVICE_NAME_USR     "vboxdrvu"
 
-#if defined(RT_ARCH_AMD64) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
+#if (defined(RT_ARCH_AMD64) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)) || defined(VBOX_WITH_TEXT_MODMEM_HACK)
 /**
  * Memory for the executable memory heap (in IPRT).
  */
-extern uint8_t g_abExecMemory[1572864]; /* 1.5 MB */
+# ifdef DEBUG
+#  define EXEC_MEMORY_SIZE   6291456    /* 6 MB */
+# else
+#  define EXEC_MEMORY_SIZE   1572864    /* 1.5 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 1572864\n\t"
+        ".zero " RT_XSTR(EXEC_MEMORY_SIZE) "\n\t"
         ".type g_abExecMemory, @object\n\t"
-        ".size g_abExecMemory, 1572864\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
 
@@ -377 +393 @@
         if (RT_SUCCESS(rc))
         {
-#if defined(RT_ARCH_AMD64) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
+#if (defined(RT_ARCH_AMD64) && LINUX_VERSION_CODE < KERNEL_VERSION(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]);