Changeset 331 in vbox for trunk/src/VBox/HostDrivers/Support/linux

Timestamp:

Jan 25, 2007 8:47:51 PM (18 years ago)

Author:

vboxsync

Message:

Bool and AMD64 hacking.

Location:

trunk/src/VBox/HostDrivers/Support/linux

Files:

• Makefile (modified) (3 diffs)
• SUPDrv-linux.c (modified) (13 diffs)

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

@@ -21 +21 @@
 #
 
+#
+# First, figure out which architecture we're targeting.
+# (We have to support basic cross building (ARCH=i386|x86_64).)
+#
+ifeq ($(filter amd64 x86,$(BUILD_TARGET_ARCH)),)
+ $(warning Ignoring unknown BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)'.)
+ BUILD_TARGET_ARCH :=
+endif
+ifeq ($(BUILD_TARGET_ARCH),)
+ ifeq ($(ARCH),x86_64)
+  BUILD_TARGET_ARCH := amd64
+ else ifeq ($(ARCH),i386)
+  BUILD_TARGET_ARCH := x86
+ else ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
+  BUILD_TARGET_ARCH := amd64
+ else
+  BUILD_TARGET_ARCH := x86
+ endif
+endif
+
+
 MODULE = vboxdrv
 OBJS   = \
@@ -26 +47 @@
         SUPDRVShared.o \
         r0drv/alloc-r0drv.o \
+        r0drv/initterm-r0drv.o \
         r0drv/linux/alloc-r0drv-linux.o \
+        r0drv/linux/initterm-r0drv-linux.o \
         r0drv/linux/semaphore-r0drv-linux.o \
         r0drv/linux/spinlock-r0drv-linux.o \
-        r0drv/linux/thread-r0drv-linux.o \
+        r0drv/linux/thread-r0drv-linux.o
+ifeq ($(BUILD_TARGET_ARCH),amd64)
+OBJS  += alloc/heapsimple.o
+endif
+
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -94 +121 @@
  KFLAGS  += -DCONFIG_VBOXDRV_AS_MISC
 endif
-ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
+ifeq ($(BUILD_TARGET_ARCH),amd64)
  KFLAGS  += -D__AMD64__
 else

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

@@ -1 +1 @@
 /** @file
- *
- * VBox host drivers - Ring-0 support drivers - Linux host:
- * Linux host driver code
+ * The VirtualBox Support Driver - Linux hosts.
  */
 
@@ -28 +26 @@
 #include <iprt/spinlock.h>
 #include <iprt/semaphore.h>
+#include <iprt/initterm.h>
+#include <iprt/err.h>
+#include <iprt/mem.h>
 
 #include <linux/module.h>
@@ -213 +214 @@
 #define DEVICE_MAJOR   234
 /** Saved major device number */
-static int              g_iModuleMajor;
+static int              g_iModuleMajor;
 #endif /* !CONFIG_VBOXDRV_AS_MISC */
 
@@ -219 +220 @@
 #define DEVICE_NAME    "vboxdrv"
 
-
+#ifdef __AMD64__
+/** 
+ * Memory for the executable memory heap (in IPRT).
+ */
+extern uint8_t g_abExecMemory[1572864]; /* 1.5 MB */
+__asm__(".section execmemory, \"awx\", @progbits\n\t"
+        ".align 32\n\t"
+        ".globl g_abExecMemory\n"
+        "g_abExecMemory:\n\t"
+        ".zero 1572864\n\t"
+        ".type g_abExecMemory, @object\n\t"
+        ".size g_abExecMemory, 1572864\n\t"
+        ".text\n\t");
+#endif 
 
 
@@ -242 +256 @@
 static struct file_operations gFileOpsVBoxDrv =
 {
-        owner:          THIS_MODULE,
-        open:           VBoxSupDrvCreate,
-        release:        VBoxSupDrvClose,
-        ioctl:          VBoxSupDrvDeviceControl,
+    owner:      THIS_MODULE,
+    open:       VBoxSupDrvCreate,
+    release:    VBoxSupDrvClose,
+    ioctl:      VBoxSupDrvDeviceControl,
 };
 
@@ -378 +392 @@
     if (rc < 0)
     {
-        dprintf(("VBOX_REGISTER_DEVICE failed with rc=%#x!\n", rc));
+        dprintf(("VBOX_REGISTER_DEVICE failed with rc=%#x!\n", rc));
         return rc;
     }
@@ -398 +412 @@
     if (g_hDevFsVBoxDrv == NULL)
     {
-        dprintf(("devfs_register failed!\n"));
+        dprintf(("devfs_register failed!\n"));
         rc = -EINVAL;
     }
@@ -406 +420 @@
     {
         /*
-         * Initialize the device extension.
+         * Initialize the runtime.
+         * On AMD64 we'll have to donate the high rwx memory block to the exec allocator.
          */
-        rc = supdrvInitDevExt(&g_DevExt);
-        if (!rc)
+        rc = RTR0Init(0);
+        if (RT_SUCCESS(rc))
         {
+#ifdef __AMD64__
+            rc = RTR0MemExecDonate(&g_abExecMemory[0], sizeof(g_abExecMemory));
+#endif
             /*
-             * Create the GIP page.
+             * Initialize the device extension.
              */
-            rc = VBoxSupDrvInitGip(&g_DevExt);
+            if (RT_SUCCESS(rc))
+                rc = supdrvInitDevExt(&g_DevExt);
             if (!rc)
             {
-                dprintf(("VBoxDrv::ModuleInit returning %#x\n", rc));
-                return rc;
+                /*
+                 * Create the GIP page.
+                 */
+                rc = VBoxSupDrvInitGip(&g_DevExt);
+                if (!rc)
+                {
+                    dprintf(("VBoxDrv::ModuleInit returning %#x\n", rc));
+                    return rc;
+                }
+
+                supdrvDeleteDevExt(&g_DevExt);
             }
-            supdrvDeleteDevExt(&g_DevExt);
+            else
+                rc = -EINVAL;
+            RTR0Term();
         }
         else
@@ -476 +506 @@
 
     /*
-     * Destroy GIP and delete the device extension.
+     * Destroy GIP, delete the device extension and terminate IPRT.
      */
     VBoxSupDrvTermGip(&g_DevExt);
     supdrvDeleteDevExt(&g_DevExt);
+    RTR0Term();
 }
 
@@ -540 +571 @@
 {
     int                 rc;
-    SUPDRVIOCTLDATA     Args;
+    SUPDRVIOCTLDATA     Args;
     void               *pvBuf = NULL;
     int                 cbBuf = 0;
@@ -686 +717 @@
 int  VBOXCALL   supdrvOSLockMemOne(PSUPDRVMEMREF pMem, PSUPPAGE paPages)
 {
-    int         rc;
+    int         rc;
     struct page **papPages;
     unsigned    iPage;
@@ -1481 +1512 @@
 {
 #if 1
-    va_list      args;
-    char         szMsg[512];
+    va_list args;
+    char    szMsg[512];
 
     va_start(args, pszFormat);
@@ -1513 +1544 @@
 RTDECL(void) AssertMsg2(const char *pszFormat, ...)
 {   /* forwarder. */
-    va_list      ap;
-    char         msg[256];
+    va_list ap;
+    char    msg[256];
 
     va_start(ap, pszFormat);