Changeset 28722 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Apr 25, 2010 9:40:01 PM (15 years ago)

Author:

vboxsync

Message:

SrvIntNetR0.cpp: Combined the two NoPreempt flags into a direction mask. Hacked sending to the trunk so that we don't take the lock if fNoPreemptDsts applies.

File:

• trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -293 +293 @@
      * Updated while owning the switch table spinlock.  */
     RTMAC                   MacAddr;
-    /** Can pfnXmit cope with disabled preemption for the 'wire'. (reported) */
-    bool                    fWireNoPreempt;
-    /** Can pfnXmit cope with disabled preemption for the 'host'. (reported) */
-    bool                    fHostNoPreempt;
     /** Whether to supply physical addresses with the outbound SGs. (reported) */
     bool                    fPhysSG;
+    /** Explicit alignment. */
+    bool                    fUnused;
     /** Busy count for tracking destination table references and active sends.
      * Usually incremented while owning the switch table spinlock.  The 30th bit
      * is used to indicate wakeup. */
     uint32_t volatile       cBusy;
+    /** Mask of destinations that pfnXmit cope with disabled preemption for. */
+    uint32_t                fNoPreemptDsts;
     /** The GSO capabilities of the wire destination. (reported) */
     uint32_t                fWireGsoCapabilites;
@@ -2607 +2607 @@
      */
     int rc;
-    if (intnetR0TrunkIfOutLock(pThis))
+    if (   (fDst & pThis->fNoPreemptDsts) == fDst
+        || intnetR0TrunkIfOutLock(pThis))
     {
         if (   pSG->GsoCtx.u8Type == PDMNETWORKGSOTYPE_INVALID
@@ -2614 +2615 @@
         else
             rc = intnetR0TrunkIfSendGsoFallback(pThis, pSG, fDst);
-        intnetR0TrunkIfOutUnlock(pThis);
+
+        if ((fDst & pThis->fNoPreemptDsts) != fDst)
+            intnetR0TrunkIfOutUnlock(pThis);
     }
     else
@@ -2818 +2821 @@
     /* ASSUMES: that the trunk won't change its report while we're checking. */
     PINTNETTRUNKIF  pTrunk = pDstTab->pTrunk;
-    if (    ((fTrunkDst & INTNETTRUNKDIR_HOST) && (pTrunk->fHostNoPreempt || !pNetwork->MacTab.fHostActive))
-        &&  ((fTrunkDst & INTNETTRUNKDIR_WIRE) && (pTrunk->fWireNoPreempt || !pNetwork->MacTab.fWireActive))
-       )
+    if ((fTrunkDst & pTrunk->fNoPreemptDsts) == fTrunkDst)
         return true;
 
@@ -2859 +2860 @@
 
     bool fRc = !pTrunk
-            || (   (!pNetwork->MacTab.fHostActive || pTrunk->fHostNoPreempt || fSrc == INTNETTRUNKDIR_HOST)
-                && (!pNetwork->MacTab.fWireActive || pTrunk->fWireNoPreempt || fSrc == INTNETTRUNKDIR_WIRE) );
+            || pTrunk->fNoPreemptDsts == (INTNETTRUNKDIR_HOST | INTNETTRUNKDIR_WIRE)
+            || (   (!pNetwork->MacTab.fHostActive || (pTrunk->fNoPreemptDsts & INTNETTRUNKDIR_HOST) )
+                && (!pNetwork->MacTab.fWireActive || (pTrunk->fNoPreemptDsts & INTNETTRUNKDIR_WIRE) ) );
 
     RTSpinlockReleaseNoInts(pNetwork->hAddrSpinlock, &Tmp);
@@ -4735 +4737 @@
         pTrunk->MacAddr.au8[4]            = 0xff;
         pTrunk->MacAddr.au8[5]            = 0xff;
-        //pTrunk->fWireNoPreempt          = false;
-        //pTrunk->fHostNoPreempt          = false;
         //pTrunk->fPhysSG                 = false;
+        //pTrunk->fUnused                 = false;
         //pTrunk->cBusy                   = 0;
+        //pTrunk->fNoPreemptDsts          = 0;
         //pTrunk->fWireGsoCapabilites     = 0;
         //pTrunk->fHostGsoCapabilites     = 0;