Changeset 22575 in vbox

Timestamp:

Aug 30, 2009 8:02:08 PM (15 years ago)

Author:

vboxsync

Message:

Additions/FreeBSD: Fixes several problems. The X11 part is mostly working now for FreeBSD 7.x and 8. Contributed by Alexander Kabaev.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/VBoxGuest-freebsd.c (modified) (23 diffs)
• common/VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (2 diffs)
• common/VBoxService/VBoxServiceVMInfo.cpp (modified) (3 diffs)
• freebsd/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c

@@ -27 +27 @@
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
+#include <sys/poll.h>
+#include <sys/selinfo.h>
 #include <sys/queue.h>
+#include <sys/lock.h>
 #include <sys/lockmgr.h>
 #include <sys/types.h>
@@ -37 +41 @@
 #include <sys/uio.h>
 #include <sys/file.h>
+#include <sys/rman.h>
 #include <machine/bus.h>
-#include <sys/rman.h>
 #include <machine/resource.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 
+#ifdef PVM
+#  undef PVM
+#endif
 #include "VBoxGuestInternal.h"
 #include <VBox/log.h>
@@ -56 +63 @@
 struct VBoxGuestDeviceState
 {
-    /** file node minor code */
-    unsigned           uMinor;
     /** Resource ID of the I/O port */
     int                iIOPortResId;
@@ -94 +99 @@
 static d_write_t  VBoxGuestFreeBSDWrite;
 static d_read_t   VBoxGuestFreeBSDRead;
+static d_poll_t   VBoxGuestFreeBSDPoll;
 
 /*
@@ -109 +115 @@
 DECLVBGL(int)    VBoxGuestFreeBSDServiceClose(void *pvSession);
 
+#ifndef D_NEEDMINOR
+# define D_NEEDMINOR 0
+#endif
+
 /*
  * Device node entry points.
@@ -115 +125 @@
 {
     .d_version =        D_VERSION,
-    .d_flags =          D_TRACKCLOSE,
+    .d_flags =          D_TRACKCLOSE | D_NEEDMINOR,
     .d_fdopen =         VBoxGuestFreeBSDOpen,
     .d_close =          VBoxGuestFreeBSDClose,
@@ -121 +131 @@
     .d_read =           VBoxGuestFreeBSDRead,
     .d_write =          VBoxGuestFreeBSDWrite,
+    .d_poll =           VBoxGuestFreeBSDPoll,
     .d_name =           DEVICE_NAME
 };
@@ -130 +141 @@
 /** The dev_clone event handler tag. */
 static eventhandler_tag     g_VBoxGuestFreeBSDEHTag;
-
+/** Reference counter */
+static volatile uint32_t    cUsers;
+/** selinfo structure used for polling. */
+static struct selinfo       g_SelInfo;
 
 /**
@@ -148 +162 @@
     if (!ppDev)
         return;
-    if (dev_stdclone(pszName, NULL, "vboxguest", &iUnit) != 1)
+    if (strcmp(pszName, "vboxguest") == 0)
+        iUnit =  -1;
+    else if (dev_stdclone(pszName, NULL, "vboxguest", &iUnit) != 1)
         return;
-    if (iUnit >= 256 || iUnit < 0)
+    if (iUnit >= 256)
     {
         Log(("VBoxGuestFreeBSDClone: iUnit=%d >= 256 - rejected\n", iUnit));
@@ -163 +179 @@
     {
         *ppDev = make_dev(&g_VBoxGuestFreeBSDChrDevSW,
-                          unit2minor(iUnit),
+                          iUnit,
                           UID_ROOT,
                           GID_WHEEL,
@@ -214 +230 @@
         {
             Log((DEVICE_NAME ":VBoxGuestFreeBSDOpen success: g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, (int)RTProcSelf()));
+            ASMAtomicIncU32(&cUsers);
             return 0;
         }
@@ -241 +258 @@
         if (!ASMAtomicCmpXchgPtr(&pDev->si_drv1, NULL, pSession))
             Log(("VBoxGuestFreeBSDClose: si_drv1=%p expected %p!\n", pDev->si_drv1, pSession));
+        ASMAtomicDecU32(&cUsers);
+        /* Don't use destroy_dev here because it may sleep resulting in a hanging user process. */
+        destroy_dev_sched(pDev);
     }
     else
@@ -344 +364 @@
 }
 
-static ssize_t VBoxGuestFreeBSDWrite (struct cdev *pDev, struct uio *pUio, int fIo)
+static int VBoxGuestFreeBSDPoll (struct cdev *pDev, int fEvents, struct thread *td)
+{
+    int fEventsProcessed;
+
+    LogFlow((DEVICE_NAME "::Poll: fEvents=%d\n", fEvents));
+
+    PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pDev->si_drv1;
+    if (RT_UNLIKELY(!VALID_PTR(pSession))) {
+        Log((DEVICE_NAME "::Poll: no state data for %s\n", devtoname(pDev)));
+        return (fEvents & (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM));
+    }
+
+    uint32_t u32CurSeq = ASMAtomicUoReadU32(&g_DevExt.u32MousePosChangedSeq);
+    if (pSession->u32MousePosChangedSeq != u32CurSeq)
+    {
+        fEventsProcessed = fEvents & (POLLIN | POLLRDNORM);
+        pSession->u32MousePosChangedSeq = u32CurSeq;
+    }
+    else
+    {
+        fEventsProcessed = 0;
+
+        selrecord(td, &g_SelInfo);
+    }
+
+    return fEventsProcessed;
+}
+
+static int VBoxGuestFreeBSDWrite (struct cdev *pDev, struct uio *pUio, int fIo)
 {
     return 0;
 }
 
-static ssize_t VBoxGuestFreeBSDRead (struct cdev *pDev, struct uio *pUio, int fIo)
+static int VBoxGuestFreeBSDRead (struct cdev *pDev, struct uio *pUio, int fIo)
 {
     return 0;
@@ -356 +404 @@
 static int VBoxGuestFreeBSDDetach(device_t pDevice)
 {
-    struct VBoxGuestDeviceState *pState = (struct VBoxGuestDeviceState *)device_get_softc(pDevice);
-
-    /*
-     * Reserve what we did in VBoxGuestFreeBSDAttach.
-     */
+    struct VBoxGuestDeviceState *pState = device_get_softc(pDevice);
+
+    if (cUsers > 0)
+        return EBUSY;
+
+    /*
+     * Reverse what we did in VBoxGuestFreeBSDAttach.
+     */
+    if (g_VBoxGuestFreeBSDEHTag != NULL)
+        EVENTHANDLER_DEREGISTER(dev_clone, g_VBoxGuestFreeBSDEHTag);
+
     clone_cleanup(&g_pVBoxGuestFreeBSDClones);
 
@@ -372 +426 @@
     VBoxGuestDeleteDevExt(&g_DevExt);
 
-    free(pState, M_VBOXDEV);
     RTR0Term();
 
@@ -391 +444 @@
 
     return fOurIRQ ? 0 : 1;
+}
+
+void VBoxGuestNativeISRMousePollEvent(PVBOXGUESTDEVEXT pDevExt)
+{
+    LogFlow((DEVICE_NAME "::NativeISRMousePollEvent:\n"));
+
+    /*
+     * Wake up poll waiters.
+     */
+    selwakeup(&g_SelInfo);
 }
 
@@ -409 +472 @@
 
 #if __FreeBSD_version >= 700000
-    rc = bus_setup_intr(pDevice, pState->pIrqRes, INTR_TYPE_BIO, NULL, (driver_intr_t *)VBoxGuestFreeBSDISR, pState, &pState->pfnIrqHandler);
+    rc = bus_setup_intr(pDevice, pState->pIrqRes, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (driver_intr_t *)VBoxGuestFreeBSDISR, pState,
+                        &pState->pfnIrqHandler);
 #else
     rc = bus_setup_intr(pDevice, pState->pIrqRes, INTR_TYPE_BIO, (driver_intr_t *)VBoxGuestFreeBSDISR, pState, &pState->pfnIrqHandler);
@@ -448 +512 @@
     struct VBoxGuestDeviceState *pState = NULL;
 
+    cUsers = 0;
+
     /*
      * Initialize IPRT R0 driver, which internally calls OS-specific r0 init.
@@ -459 +525 @@
 
     pState = device_get_softc(pDevice);
-    if (!pState)
-    {
-        pState = malloc(sizeof(struct VBoxGuestDeviceState), M_VBOXDEV, M_NOWAIT | M_ZERO);
-        if (!pState)
-            return ENOMEM;
-
-        device_set_softc(pDevice, pState);
-    }
 
     /*
@@ -473 +531 @@
     iResId                 = PCIR_BAR(0);
     pState->pIOPortRes     = bus_alloc_resource_any(pDevice, SYS_RES_IOPORT, &iResId, RF_ACTIVE);
-    pState->uIOPortBase    = bus_get_resource_start(pDevice, SYS_RES_IOPORT, iResId);
+    pState->uIOPortBase    = rman_get_start(pState->pIOPortRes);
     pState->iIOPortResId   = iResId;
     if (pState->uIOPortBase)
@@ -483 +541 @@
         pState->pVMMDevMemRes    = bus_alloc_resource_any(pDevice, SYS_RES_MEMORY, &iResId, RF_ACTIVE);
         pState->VMMDevMemHandle  = rman_get_bushandle(pState->pVMMDevMemRes);
-        pState->VMMDevMemSize    = bus_get_resource_count(pDevice, SYS_RES_MEMORY, iResId);
-
-        pState->pMMIOBase = (void *)pState->VMMDevMemHandle;
+        pState->VMMDevMemSize    = rman_get_size(pState->pVMMDevMemRes);
+
+        pState->pMMIOBase       = rman_get_virtual(pState->pVMMDevMemRes);
         pState->iVMMDevMemResId = iResId;
         if (pState->pMMIOBase)
@@ -492 +550 @@
              * Call the common device extension initializer.
              */
-            rc = VBoxGuestInitDevExt(&g_DevExt, pState->uIOPortBase, pState->pMMIOBase,
-                                     pState->VMMDevMemSize, VBOXOSTYPE_FreeBSD, 0);
+            rc = VBoxGuestInitDevExt(&g_DevExt, pState->uIOPortBase,
+                                     pState->pMMIOBase, pState->VMMDevMemSize,
+                                     VBOXOSTYPE_FreeBSD, VMMDEV_EVENT_MOUSE_POSITION_CHANGED);
             if (RT_SUCCESS(rc))
             {
@@ -563 +622 @@
 MODULE_VERSION(vboxguest, 1);
 
-#if 0/** @todo This shouldn't be needed. if it is, that means exceptions hasn't been disabled correctly. */
-int __gxx_personality_v0 = 0xdeadbeef;
-#endif
-
-
 /* Common code that depend on g_DevExt. */
 #include "VBoxGuestIDC-unix.c.h"

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -187 +187 @@
     g_File = hf;
 
-#elif defined(RT_OS_FREEBSD)
-    /*
-     * Try open the BSD device. The device cloning makes this a bit of work.
-     */
-# if defined(VBOX_VBGLR3_XFREE86)
-    int File = 0;
-# else
-    RTFILE File = 0;
-# endif
-    int rc;
-    char szDevice[RT_MAX(sizeof(VBOXGUEST_DEVICE_NAME), sizeof(VBOXGUEST_USER_DEVICE_NAME)) + 16];
-    for (unsigned iUnit = 0; iUnit < 1024; iUnit++)
-    {
-        RTStrPrintf(szDevice, sizeof(szDevice), pszDeviceName "%d", iUnit);
-# if defined(VBOX_VBGLR3_XFREE86)
-        File = xf86open(szDevice, XF86_O_RDWR);
-        if (File >= 0)
-            break;
-# else
-        rc = RTFileOpen(&File, szDevice, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-        if (RT_SUCCESS(rc))
-            break;
-# endif
-    }
-
-# if defined(VBOX_VBGLR3_XFREE86)
-    if (File == -1)
-        return VERR_OPEN_FAILED;
-# else
-    if (RT_FAILURE(rc))
-        return rc;
-# endif
-
-    g_File = File;
-
-#elif defined(VBOX_VBGLR3_XFREE86) && !defined(RT_OS_FREEBSD)
+#elif defined(VBOX_VBGLR3_XFREE86)
     int File = xf86open(pszDeviceName, XF86_O_RDWR);
     if (File == -1)
@@ -230 +195 @@
 #else
 
-    /* The default implemenation. (linux, solaris) */
+    /* The default implemenation. (linux, solaris, freebsd) */
     RTFILE File;
     int rc = RTFileOpen(&File, pszDeviceName, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -34 +34 @@
 # include <arpa/inet.h>
 # include <errno.h>
-# include <net/if.h>
 # include <netinet/in.h>
 # include <sys/ioctl.h>
 # include <sys/socket.h>
+# include <net/if.h>
 # include <unistd.h>
 # include <utmp.h>
@@ -236 +236 @@
         ::LsaFreeReturnBuffer(pSessions);
  #endif /* TARGET_NT4 */
+#elif defined(RT_OS_FREEBSD)
+        /* TODO: Port me */
 #else
         utmp* ut_user;
@@ -378 +380 @@
                 return -1;
             }
- #ifdef RT_OS_SOLARIS
+ #if defined(RT_OS_SOLARIS)  || defined(RT_OS_FREEBSD)
             pAddress = (sockaddr_in *)&ifrequest[i].ifr_addr;
  #else

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

@@ -28 +28 @@
 
 # Include sub-makefiles.
-include $(PATH_SUB_CURRENT)/vboxvfs/Makefile.kmk
+#include $(PATH_SUB_CURRENT)/vboxvfs/Makefile.kmk
+#include $(PATH_SUB_CURRENT)/drm/Makefile.kmk
 
 # Globals
@@ -60 +61 @@
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl \
                 $(PATH_BIN)/additions/vboxguest.ko \
+                $(PATH_BIN)/additions/vboxvideo.ko \
+                $(PATH_BIN)/additions/vboxvfs.ko \
                 $(PATH_BIN)/additions/VBoxClient \
                 $(PATH_BIN)/additions/VBoxService \