Changeset 50321 in vbox

Timestamp:

Feb 5, 2014 8:30:46 AM (11 years ago)

Author:

vboxsync

Message:

Mac OS X host: prevent stuck-in-dock: r91968 is substituted with the new solution: send dummy packet in a context of a kernel thread in order to associate interface's receive thread w/ our new kernel thread instead of VirtualBoxVM process.

Location:

trunk

Files:

• include/VBox/VBoxNetSend.h (added)
• src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp (modified) (3 diffs)
• src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (modified) (6 diffs)

trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp

@@ -32 +32 @@
 #include <VBox/err.h>
 #include <VBox/version.h>
+#include <VBox/VBoxNetSend.h>
 #include <iprt/assert.h>
 #include <iprt/initterm.h>
@@ -233 +234 @@
 }
 
-
-/**
- * Constructs and submits a dummy packet to ifnet_input(). This is a workaround
- * for "stuck dock icon" issue. When the first packet goes through the interface
- * DLIL grabs a reference to the thread that submits the packet and holds it
- * until the interface is destroyed. By submitting this dummy we make DLIL grab
- * the thread of a non-GUI process.
- *
- * Most of this function was copied from vboxNetFltDarwinMBufFromSG().
- *
- * @returns VBox status code.
- * @param   pIfNet      The interface that will hold the reference to the calling
- *                      thread. We submit dummy as if it was coming from this interface.
- */
-static int vboxNetSendDummy(ifnet_t pIfNet)
-{
-    int rc = 0;
-    size_t cbTotal = 50; /* No Ethernet header */
-    mbuf_how_t How = MBUF_WAITOK;
-
-    mbuf_t pPkt = NULL;
-    errno_t err = mbuf_allocpacket(How, cbTotal, NULL, &pPkt);
-    if (!err)
-    {
-        /* Skip zero sized memory buffers (paranoia). */
-        mbuf_t pCur = pPkt;
-        while (pCur && !mbuf_maxlen(pCur))
-            pCur = mbuf_next(pCur);
-        Assert(pCur);
-
-        /* Set the required packet header attributes. */
-        mbuf_pkthdr_setlen(pPkt, cbTotal);
-        mbuf_pkthdr_setheader(pPkt, mbuf_data(pCur));
-
-        mbuf_setlen(pCur, cbTotal);
-        memset(mbuf_data(pCur), 0, cbTotal);
-
-        mbuf_pkthdr_setrcvif(pPkt, pIfNet); /* will crash without this. */
-
-        errno_t err = ifnet_input(pIfNet, pPkt, NULL);
-        if (err)
-        {
-            rc = RTErrConvertFromErrno(err);
-            mbuf_freem(pPkt);
-        }
-    }
-    else
-        rc = RTErrConvertFromErrno(err);
-
-    return rc;
-}
 
 int vboxNetAdpOsCreate(PVBOXNETADP pThis, PCRTMAC pMACAddress)
@@ -347 +297 @@
             {
                 ifnet_set_mtu(pThis->u.s.pIface, VBOXNETADP_MTU);
-                vboxNetSendDummy(pThis->u.s.pIface);
+                VboxNetSendDummy(pThis->u.s.pIface);
                 return VINF_SUCCESS;
             }

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp

@@ -35 +35 @@
 #include <VBox/intnetinline.h>
 #include <VBox/version.h>
+#include <VBox/VBoxNetSend.h>
 #include <iprt/initterm.h>
 #include <iprt/assert.h>
@@ -44 +45 @@
 #include <iprt/time.h>
 #include <iprt/net.h>
+#include <iprt/thread.h>
 
 #include <mach/kmod.h>
@@ -883 +885 @@
 
 
+/** A worker for vboxNetFltSendDummy() thread. */
+static int vboxNetFltSendDummyWorker(RTTHREAD ThreadSelf, void *pvUser)
+{
+    Assert(pvUser);
+    ifnet_t pIfNet = (ifnet_t)pvUser;
+    return VboxNetSendDummy(pIfNet);
+}
+
+/*
+ * Prevent GUI icon freeze issue when VirtualBoxVM process terminates.
+ *
+ * This function is a workaround for stuck-in-dock issue. The
+ * idea here is to send a dummy packet to an interface from the
+ * context of a kernel thread. Therefore, an XNU's receive
+ * thread (which is created as a result if we are the first who
+ * is communicating with the interface) will be associated with the
+ * kernel thread instead of VirtualBoxVM process.
+ *
+ * @param pIfNet    Interface to be used to send data.
+ */
+static void vboxNetFltSendDummy(ifnet_t pIfNet)
+{
+    RTTHREAD dummyThread;
+    int rc;
+
+    rc = RTThreadCreate(&dummyThread, vboxNetFltSendDummyWorker, (void *)pIfNet, 0,
+        RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "DummyThread");
+
+    if (RT_SUCCESS(rc))
+    {
+        RTThreadWait(dummyThread, RT_INDEFINITE_WAIT, NULL);
+        LogFlow(("vboxNetFltSendDummy: a dummy packet has been successfully sent in order to prevent stuck-in-dock issue\n"));
+    }
+    else
+        LogFlow(("vboxNetFltSendDummy: unable to send dummy packet in order to prevent stuck-in-dock issue\n"));
+}
+
 /**
  * Internal worker for vboxNetFltOsInitInstance and vboxNetFltOsMaybeRediscovered.
@@ -917 +956 @@
     ASMAtomicUoWritePtr(&pThis->u.s.pIfNet, pIfNet);
     RTSpinlockReleaseNoInts(pThis->hSpinlock);
+
+    /* Prevent stuck-in-dock issue by associating interface receive thread with kernel thread */
+    vboxNetFltSendDummy(pIfNet);
 
     /*
@@ -983 +1025 @@
 
 
-/**
- * Attempt to detect if a cable is attached to a network card.
- * There is no direct way to detect this at any time. We assume
- * if interface's baud rate is not zero then cable is attached.
- */
-static int vboxNetFltCableAttached(ifnet_t pIfNet)
-{
-    return (ifnet_baudrate(pIfNet) != 0);
-}
-
-
 int  vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
 {
@@ -1002 +1033 @@
     if (pIfNet)
     {
-        /*
-         * Do not send any data to a network stack if cable is not attached
-         * to a network card device in order to prevent stuck-in-dock problem. */
-        if (!vboxNetFltCableAttached(pIfNet))
-        {
-            vboxNetFltDarwinReleaseIfNet(pThis, pIfNet);
-            return rc;
-        }
-
         /*
          * Create a mbuf for the gather list and push it onto the wire.