Changeset 39521 in vbox for trunk/src

Timestamp:

Dec 3, 2011 10:59:46 PM (13 years ago)

Author:

vboxsync

Message:

FreeBSD: Certain fixes to run on CURRENT and clean up the support driver character device handling, thanks to Bernhard Froehlich, Jung-uk Kim and Ed Schouten

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/freebsd/SUPDrv-freebsd.c (modified) (10 diffs)
• HostDrivers/Support/freebsd/SUPLib-freebsd.cpp (modified) (2 diffs)
• HostDrivers/freebsd/Makefile.kmk (modified) (1 diff)
• Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c (modified) (4 diffs)

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

@@ -70 +70 @@
 static int VBoxDrvFreeBSDLoad(void);
 static int VBoxDrvFreeBSDUnload(void);
-static void VBoxDrvFreeBSDClone(void *pvArg, struct ucred *pCred, char *pachName, int cchName, struct cdev **ppDev);
-
-static d_fdopen_t   VBoxDrvFreeBSDOpen;
-static d_close_t    VBoxDrvFreeBSDClose;
+
+static d_open_t     VBoxDrvFreeBSDOpen;
+static void         VBoxDrvFreeBSDDtr(void *pData);
 static d_ioctl_t    VBoxDrvFreeBSDIOCtl;
 static int          VBoxDrvFreeBSDIOCtlSlow(PSUPDRVSESSION pSession, u_long ulCmd, caddr_t pvData, struct thread *pTd);
@@ -101 +100 @@
 {
     .d_version =        D_VERSION,
-#if __FreeBSD_version > 800061
-    .d_flags =          D_PSEUDO | D_TRACKCLOSE | D_NEEDMINOR,
-#else
-    .d_flags =          D_PSEUDO | D_TRACKCLOSE,
-#endif
-    .d_fdopen =         VBoxDrvFreeBSDOpen,
-    .d_close =          VBoxDrvFreeBSDClose,
+    .d_open =           VBoxDrvFreeBSDOpen,
     .d_ioctl =          VBoxDrvFreeBSDIOCtl,
     .d_name =           "vboxdrv"
 };
 
-/** List of cloned device. Managed by the kernel. */
-static struct clonedevs    *g_pVBoxDrvFreeBSDClones;
-/** The dev_clone event handler tag. */
-static eventhandler_tag     g_VBoxDrvFreeBSDEHTag;
+/** The /dev/vboxdrv character device. */
+static struct cdev         *g_pVBoxDrvFreeBSDChrDev;
 /** Reference counter. */
 static volatile uint32_t    g_cUsers;
@@ -177 +168 @@
         {
             /*
-             * Configure device cloning.
+             * Configure character device. Add symbolic link for compatibility.
              */
-            clone_setup(&g_pVBoxDrvFreeBSDClones);
-            g_VBoxDrvFreeBSDEHTag = EVENTHANDLER_REGISTER(dev_clone, VBoxDrvFreeBSDClone, 0, 1000);
-            if (g_VBoxDrvFreeBSDEHTag)
-            {
-                Log(("VBoxDrvFreeBSDLoad: returns successfully\n"));
-                return VINF_SUCCESS;
-            }
-
-            printf("vboxdrv: EVENTHANDLER_REGISTER(dev_clone,,,) failed\n");
-            clone_cleanup(&g_pVBoxDrvFreeBSDClones);
-            rc = VERR_ALREADY_LOADED;
-            supdrvDeleteDevExt(&g_VBoxDrvFreeBSDDevExt);
+            g_pVBoxDrvFreeBSDChrDev = make_dev(&g_VBoxDrvFreeBSDChrDevSW, 0, UID_ROOT, GID_WHEEL, VBOXDRV_PERM, "vboxdrv");
+            return VINF_SUCCESS;
         }
         else
@@ -211 +192 @@
      * Reserve what we did in VBoxDrvFreeBSDInit.
      */
-    EVENTHANDLER_DEREGISTER(dev_clone, g_VBoxDrvFreeBSDEHTag);
-    clone_cleanup(&g_pVBoxDrvFreeBSDClones);
+    destroy_dev(g_pVBoxDrvFreeBSDChrDev);
 
     supdrvDeleteDevExt(&g_VBoxDrvFreeBSDDevExt);
@@ -223 +203 @@
     return VINF_SUCCESS;
 }
-
-
-/**
- * DEVFS event handler.
- */
-static void VBoxDrvFreeBSDClone(void *pvArg, struct ucred *pCred, char *pszName, int cchName, struct cdev **ppDev)
-{
-    int iUnit;
-    int rc;
-
-    Log(("VBoxDrvFreeBSDClone: pszName=%s ppDev=%p\n", pszName, ppDev));
-
-    /*
-     * One device node per user, si_drv1 points to the session.
-     * /dev/vboxdrv<N> where N = {0...255}.
-     */
-    if (!ppDev)
-        return;
-    if (dev_stdclone(pszName, NULL, "vboxdrv", &iUnit) != 1)
-        return;
-    if (iUnit >= 256 || iUnit < 0)
-    {
-        Log(("VBoxDrvFreeBSDClone: iUnit=%d >= 256 - rejected\n", iUnit));
-        return;
-    }
-
-    Log(("VBoxDrvFreeBSDClone: pszName=%s iUnit=%d\n", pszName, iUnit));
-
-    rc = clone_create(&g_pVBoxDrvFreeBSDClones, &g_VBoxDrvFreeBSDChrDevSW, &iUnit, ppDev, 0);
-    Log(("VBoxDrvFreeBSDClone: clone_create -> %d; iUnit=%d\n", rc, iUnit));
-    if (rc)
-    {
-#if __FreeBSD_version > 800061
-        *ppDev = make_dev(&g_VBoxDrvFreeBSDChrDevSW, iUnit, UID_ROOT, GID_WHEEL, VBOXDRV_PERM, "vboxdrv%d", iUnit);
-#else
-        *ppDev = make_dev(&g_VBoxDrvFreeBSDChrDevSW, unit2minor(iUnit), UID_ROOT, GID_WHEEL, VBOXDRV_PERM, "vboxdrv%d", iUnit);
-#endif
-        if (*ppDev)
-        {
-            dev_ref(*ppDev);
-            (*ppDev)->si_flags |= SI_CHEAPCLONE;
-            Log(("VBoxDrvFreeBSDClone: Created *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n",
-                 *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2));
-            (*ppDev)->si_drv1 = (*ppDev)->si_drv2 = NULL;
-        }
-        else
-            OSDBGPRINT(("VBoxDrvFreeBSDClone: make_dev iUnit=%d failed\n", iUnit));
-    }
-    else
-        Log(("VBoxDrvFreeBSDClone: Existing *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n",
-             *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2));
-}
-
 
 
@@ -288 +215 @@
  * @param   iFd     The file descriptor index(?). Pre FreeBSD 7.0.
  */
-#if __FreeBSD__ >= 7
-static int VBoxDrvFreeBSDOpen(struct cdev *pDev, int fOpen, struct thread *pTd, struct file *pFd)
-#else
-static int VBoxDrvFreeBSDOpen(struct cdev *pDev, int fOpen, struct thread *pTd, int iFd)
-#endif
+static int VBoxDrvFreeBSDOpen(struct cdev *pDev, int fOpen, int iDevtype, struct thread *pTd)
 {
     PSUPDRVSESSION pSession;
     int rc;
 
-#if __FreeBSD_version < 800062
-    Log(("VBoxDrvFreeBSDOpen: fOpen=%#x iUnit=%d\n", fOpen, minor2unit(minor(pDev))));
-#else
-    Log(("VBoxDrvFreeBSDOpen: fOpen=%#x iUnit=%d\n", fOpen, minor(dev2udev(pDev))));
-#endif
-
     /*
      * Let's be a bit picky about the flags...
@@ -311 +228 @@
         return EINVAL;
     }
-
-    /*
-     * Try grab it (we don't grab the giant, remember).
-     */
-    if (!ASMAtomicCmpXchgPtr(&pDev->si_drv1, (void *)0x42, NULL))
-        return EBUSY;
 
     /*
@@ -327 +238 @@
         pSession->Uid = stuff;
         pSession->Gid = stuff; */
-        if (ASMAtomicCmpXchgPtr(&pDev->si_drv1, pSession, (void *)0x42))
-        {
-            ASMAtomicIncU32(&g_cUsers);
-            return 0;
-        }
-
-        OSDBGPRINT(("VBoxDrvFreeBSDOpen: si_drv1=%p, expected 0x42!\n", pDev->si_drv1));
-        supdrvCloseSession(&g_VBoxDrvFreeBSDDevExt, pSession);
+        devfs_set_cdevpriv(pSession, VBoxDrvFreeBSDDtr);
+        Log(("VBoxDrvFreeBSDOpen: pSession=%p\n", pSession));
+        ASMAtomicIncU32(&g_cUsers);
+        return 0;
     }
 
@@ -350 +257 @@
  * @param   pTd         The calling thread.
  */
-static int VBoxDrvFreeBSDClose(struct cdev *pDev, int fFile, int DevType, struct thread *pTd)
-{
-    PSUPDRVSESSION pSession = (PSUPDRVSESSION)pDev->si_drv1;
-#if __FreeBSD_version < 800062
-    Log(("VBoxDrvFreeBSDClose: fFile=%#x iUnit=%d pSession=%p\n", fFile, minor2unit(minor(pDev)), pSession));
-#else
-    Log(("VBoxDrvFreeBSDClose: fFile=%#x iUnit=%d pSession=%p\n", fFile, minor(dev2udev(pDev)), pSession));
-#endif
-
-    /*
-     * Close the session if it's still hanging on to the device...
-     */
-    if (VALID_PTR(pSession))
-    {
-        supdrvCloseSession(&g_VBoxDrvFreeBSDDevExt, pSession);
-        if (!ASMAtomicCmpXchgPtr(&pDev->si_drv1, NULL, pSession))
-            OSDBGPRINT(("VBoxDrvFreeBSDClose: si_drv1=%p expected %p!\n", pDev->si_drv1, pSession));
-        ASMAtomicDecU32(&g_cUsers);
-        /* Don't use destroy_dev here because it may sleep resulting in a hanging user process. */
-        destroy_dev_sched(pDev);
-    }
-    else
-        OSDBGPRINT(("VBoxDrvFreeBSDClose: si_drv1=%p!\n", pSession));
-    return 0;
+static void VBoxDrvFreeBSDDtr(void *pData)
+{
+    PSUPDRVSESSION pSession = pData;
+    Log(("VBoxDrvFreeBSDDtr: pSession=%p\n", pSession));
+
+    /*
+     * Close the session.
+     */
+    supdrvCloseSession(&g_VBoxDrvFreeBSDDevExt, pSession);
+    ASMAtomicDecU32(&g_cUsers);
 }
 
@@ -389 +282 @@
 static int VBoxDrvFreeBSDIOCtl(struct cdev *pDev, u_long ulCmd, caddr_t pvData, int fFile, struct thread *pTd)
 {
-    /*
-     * Validate the input.
-     */
-    PSUPDRVSESSION pSession = (PSUPDRVSESSION)pDev->si_drv1;
-    if (RT_UNLIKELY(!VALID_PTR(pSession)))
-        return EINVAL;
+    PSUPDRVSESSION pSession;
+    devfs_get_cdevpriv((void **)&pSession);
 
     /*

trunk/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp

@@ -77 +77 @@
      * Try open the BSD device.
      */
-    int hDevice = -1;
-    char szDevice[sizeof(DEVICE_NAME) + 16];
-    for (unsigned iUnit = 0; iUnit < 1024; iUnit++)
-    {
-        errno = 0;
-        snprintf(szDevice, sizeof(szDevice), DEVICE_NAME "%d", iUnit);
-        hDevice = open(szDevice, O_RDWR, 0);
-        if (hDevice >= 0 || errno != EBUSY)
-            break;
-    }
+    int hDevice = open(DEVICE_NAME, O_RDWR, 0);
     if (hDevice < 0)
     {
@@ -98 +89 @@
             default:        rc = VERR_VM_DRIVER_OPEN_ERROR; break;
         }
-        LogRel(("Failed to open \"%s\", errno=%d, rc=%Rrc\n", szDevice, errno, rc));
+        LogRel(("Failed to open \"%s\", errno=%d, rc=%Rrc\n", DEVICE_NAME, errno, rc));
         return rc;
     }

trunk/src/VBox/HostDrivers/freebsd/Makefile.kmk

@@ -22 +22 @@
 HostDrivers-scripts_INST    = bin/src/
 HostDrivers-scripts_SOURCES = Makefile
-HostDrivers-scripts_EXEC_SOURCES = export_modules
 
 include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c

@@ -392 +392 @@
 static void rtR0MemObjFreeBSDPhysPageInit(vm_page_t pPage, vm_pindex_t iPage)
 {
+#if __FreeBSD_version <= 1000000
     pPage->wire_count = 1;
     pPage->pindex     = iPage;
     pPage->act_count  = 0;
-    pPage->oflags     = 0;
-    pPage->flags      = PG_UNMANAGED;
     atomic_add_int(&cnt.v_wire_count, 1);
+
+#if __FreeBSD_version >= 900040
+    Assert(pPage->oflags & VPO_UNMANAGED != 0);
+#else
+    Assert(pPage->flags & PG_UNMANAGED != 0);
+#endif
+#endif
 }
 
@@ -409 +415 @@
     uint32_t   cPages = cb >> PAGE_SHIFT;
     vm_paddr_t VmPhysAddrHigh;
+#if __FreeBSD_version >= 1000001
+    int        pFlags = VM_ALLOC_INTERRUPT | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED;
+#endif
 
     /* create the object. */
@@ -425 +434 @@
     if (fContiguous)
     {
+#if __FreeBSD_version >= 1000001
+        vm_page_t pPage = vm_page_alloc_contig(NULL, 0, pFlags, cPages, 0, VmPhysAddrHigh, uAlignment, 0, VM_MEMATTR_DEFAULT);
+#else
         vm_page_t pPage = vm_phys_alloc_contig(cPages, 0, VmPhysAddrHigh, uAlignment, 0);
+#endif
 
         if (pPage)
@@ -441 +454 @@
         for (uint32_t iPage = 0; iPage < cPages; iPage++)
         {
+#if __FreeBSD_version >= 1000001
+            vm_page_t pPage = vm_page_alloc_contig(NULL, iPage, pFlags, 1, 0, VmPhysAddrHigh, uAlignment, 0, VM_MEMATTR_DEFAULT);
+#else
             vm_page_t pPage = vm_phys_alloc_contig(1, 0, VmPhysAddrHigh, uAlignment, 0);
+#endif
 
             if (!pPage)