Changeset 12770 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris

Timestamp:

Sep 26, 2008 2:54:09 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/vboxnetflt: Fixed loopback handling.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (16 diffs)

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

@@ -858 +858 @@
 
     bool fSendUpstream = true;
-    bool fActive = false;
-    bool fRetained = false;
     vboxnetflt_stream_t *pStream = pQueue->q_ptr;
     PVBOXNETFLTINS pThis = NULL;
@@ -881 +879 @@
             RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
             RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-            fActive = ASMAtomicUoReadBool(&pThis->fActive);
+            const bool fActive = ASMAtomicUoReadBool(&pThis->fActive);
             vboxNetFltRetain(pThis, true);
-            fRetained = true;
             RTSpinlockRelease(pThis->hSpinlock, &Tmp);
 
@@ -988 +985 @@
                 }
             }
+
+            vboxNetFltRelease(pThis, true);        
         }
         else
@@ -1007 +1006 @@
             putbq(pQueue, pMsg);
     }
-
-    if (fRetained)
-        vboxNetFltRelease(pThis, true);
 
     return 0;
@@ -2377 +2373 @@
         return VERR_NET_MSG_SIZE;
 
+    int rc = RTSemFastMutexRequest(pThis->u.s.hFastMtx);
+    AssertRCReturn(rc, rc);
+
     PVBOXNETFLTPACKETID pCur = NULL;
-    int rc = VINF_SUCCESS;
     if (pPromiscStream->cLoopback < VBOXNETFLT_LOOPBACK_SIZE)
     {
@@ -2446 +2444 @@
         pPromiscStream->pTail->pNext = pCur;
         pPromiscStream->pTail = pCur;
+        pCur->pNext = NULL;
+        pCur->cbPacket = 0;
+        pPromiscStream->cLoopback--;
 
         vboxNetFltSolarisInitPacketId(pCur, pMsg);
@@ -2451 +2452 @@
                 pPromiscStream->cLoopback));
     }
+
+    RTSemFastMutexRelease(pThis->u.s.hFastMtx);
 
     return rc;
@@ -2483 +2486 @@
         return false;
 
+    int rc = RTSemFastMutexRequest(pThis->u.s.hFastMtx);
+    AssertRCReturn(rc, rc);
+
     PVBOXNETFLTPACKETID pPrev = NULL;
     PVBOXNETFLTPACKETID pCur = pPromiscStream->pHead;
-    bool fIsOur = false;
+    bool fIsOurPacket = false;
     while (pCur)
     {
@@ -2529 +2535 @@
         }
         pPromiscStream->cLoopback--;
+        fIsOurPacket = true;
 
         LogFlow((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk found packet %p cLoopback=%d\n", pMsg, pPromiscStream->cLoopback));
-        return true;
-    }
-
-    NOREF(pThis);
-    return false;
+        break;
+    }
+
+    RTSemFastMutexRelease(pThis->u.s.hFastMtx);
+    return fIsOurPacket;
 }
 
@@ -2566 +2573 @@
      * Don't loopback packets we transmit to the wire.
      */
-#if 0
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-    bool fOurPacket = vboxNetFltSolarisIsOurMBlk(pThis, pPromiscStream, pMsg);
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-
-    if (fOurPacket)
+    if (vboxNetFltSolarisIsOurMBlk(pThis, pPromiscStream, pMsg))
     {
         LogFlow((DEVICE_NAME ":Avoiding packet loopback.\n"));
@@ -2578 +2579 @@
         return VINF_SUCCESS;
     }
-#endif
+
+#if 0
+    /*
+     * Yeah, I wish.
+     */
     if (pMsg->b_flag & MSGNOLOOP)
     {
@@ -2584 +2589 @@
         return VINF_SUCCESS;
     }
+#endif
 
     /*
@@ -2917 +2923 @@
     LogFlow((DEVICE_NAME ":vboxNetFltOsDeleteInstance pThis=%p\n"));
     vboxNetFltSolarisDetachFromInterface(pThis);
+
+    if (pThis->u.s.hFastMtx != NIL_RTSEMFASTMUTEX)
+    {
+        RTSemFastMutexDestroy(pThis->u.s.hFastMtx);
+        pThis->u.s.hFastMtx = NIL_RTSEMFASTMUTEX;
+    }
 }
 
@@ -2923 +2935 @@
 {
     LogFlow((DEVICE_NAME ":vboxNetFltOsInitInstance pThis=%p\n"));
-    return vboxNetFltSolarisAttachToInterface(pThis);
+
+    /*
+     * Mutex used for loopback lockouts.
+     */
+    int rc = RTSemFastMutexCreate(&pThis->u.s.hFastMtx);
+    if (RT_SUCCESS(rc))
+    {
+        rc = vboxNetFltSolarisAttachToInterface(pThis);
+        if (RT_SUCCESS(rc))
+            return rc;
+    
+        LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface failed. rc=%Vrc\n", rc));
+        RTSemFastMutexDestroy(pThis->u.s.hFastMtx);
+        pThis->u.s.hFastMtx = NIL_RTSEMFASTMUTEX;
+    }
+
+    return rc;
 }
 
@@ -2935 +2963 @@
     pThis->u.s.pvArpStream = NULL;
     pThis->u.s.pvPromiscStream = NULL;
+    pThis->u.s.hFastMtx = NIL_RTSEMFASTMUTEX;
     bzero(&pThis->u.s.Mac, sizeof(pThis->u.s.Mac));
     return VINF_SUCCESS;
@@ -2965 +2994 @@
                 LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_WIRE\n"));
 
+                vboxNetFltSolarisQueueLoopback(pThis, pPromiscStream, pMsg);
+
 #if 0
-                RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-                RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-
-                vboxNetFltSolarisQueueLoopback(pThis, pPromiscStream, pMsg);
-
-                RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+                /*
+                 * Too bad we can't keep this, though it "works"....
+                 */
+                pMsg->b_flag |= MSGNOLOOP;
 #endif
-
-                pMsg->b_flag |= MSGNOLOOP;
                 putnext(WR(pPromiscStream->Stream.pReadQueue), pMsg);
             }