Changeset 28830 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/freebsd

Timestamp:

Apr 27, 2010 2:05:25 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

60746

Message:

IntNet,VBoxNetFlt: Cleaned up the locking protocol between IntNet and NetFlt. Eleminated the out-bound trunk lock that IntNet always took when calling NetFlt.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c (modified) (9 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c

@@ -316 +316 @@
     bool fActive;
 
-    fActive = ASMAtomicUoReadBool(&pThis->fActive);
+    fActive = vboxNetFltTryRetainBusyActive(pThis);
 
     NGI_GET_M(item, m);
@@ -338 +338 @@
         {
             ether_demux(ifp, m);
+            if (fActive)
+                vboxNetFltRelease(pThis, true /*fBusy*/);
             return (0);
         }
@@ -345 +347 @@
         taskqueue_enqueue_fast(taskqueue_fast, &pThis->u.s.tskin);
     }
-    /**
+    /*
      * Handle mbufs on the outgoing hook, frames going to the interface
      */
@@ -351 +353 @@
     {
         if (mtag != NULL || !fActive)
-            return ether_output_frame(ifp, m);
+        {
+            int rc = ether_output_frame(ifp, m);
+            if (fActive)
+                vboxNetFltRelease(pThis, true /*fBusy*/);
+            return rc;
+        }
         mtx_lock_spin(&pThis->u.s.outq.ifq_mtx);
         _IF_ENQUEUE(&pThis->u.s.outq, m);
@@ -361 +368 @@
         m_freem(m);
     }
+
+    if (fActive)
+        vboxNetFltRelease(pThis, true /*fBusy*/);
     return (0);
 }
@@ -370 +380 @@
 
     /* Prevent node shutdown if we're active */
-    fActive = ASMAtomicUoReadBool(&pThis->fActive);
-    if (fActive)
+    if (pThis->enmTrunkState == INTNETTRUNKIFSTATE_ACTIVE)
         return (EBUSY);
     NG_NODE_UNREF(node);
@@ -548 +557 @@
         return VERR_INTERNAL_ERROR;
 
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    RTSpinlockAcquireNoInts(pThis->hSpinlock, &Tmp);
+
     ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.ifp, ifp);
     pThis->u.s.node = node;
@@ -564 +574 @@
     TASK_INIT(&pThis->u.s.tskout, 0, vboxNetFltFreeBSDoutput, pThis);
 
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    RTSpinlockReleaseNoInts(pThis->hSpinlock, &Tmp);
 
     NG_NODE_SET_PRIVATE(node, pThis);
@@ -575 +585 @@
     /** @todo keep these reports up to date, either by polling for changes or
      *        intercept some control flow if possible. */
-    Assert(pThis->pSwitchPort);
-    pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
-    pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, vboxNetFltFreeBsdIsPromiscuous(pThis));
-    pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
-    pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
+    if (vboxNetFltTryRetainBusyNotDisconnected(pThis))
+    {
+        Assert(pThis->pSwitchPort);
+        pThis->pSwitchPort->pfnReportMacAddress(pThis->pSwitchPort, &pThis->u.s.MacAddr);
+        pThis->pSwitchPort->pfnReportPromiscuousMode(pThis->pSwitchPort, vboxNetFltFreeBsdIsPromiscuous(pThis));
+        pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, 0, INTNETTRUNKDIR_WIRE | INTNETTRUNKDIR_HOST);
+        pThis->pSwitchPort->pfnReportNoPreemptDsts(pThis->pSwitchPort, 0 /* none */);
+        vboxNetFltRelease(pThis, true /*fBusy*/);
+    }
 
     return VINF_SUCCESS;