Changeset 12731 in vbox

Timestamp:

Sep 25, 2008 1:35:55 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/vboxnetflt: Workaround for hanging problem; will solve properly later.

File:

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

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

@@ -294 +294 @@
 typedef struct VBOXNETFLTPACKETID *PVBOXNETFLTPACKETID;
 
-
 /**
  * vboxnetflt_stream_t: per-stream data (multiple streams per interface)
@@ -316 +315 @@
     bool fRawMode;                        /* whether raw mode request was successful */
     uint32_t ModeReqId;                   /* track MIOCTLs for swallowing our fake request acknowledgements */
+    size_t cLoopback;                     /* loopback queue size list */
     PVBOXNETFLTPACKETID pHead;            /* loopback packet identifier head */
     PVBOXNETFLTPACKETID pTail;            /* loopback packet identifier tail */
-    size_t cLoopback;                     /* loopback queue size list */
 } vboxnetflt_promisc_stream_t;
 
@@ -710 +709 @@
         default:    /* Heh. */
         {
-                RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-                AssertRelease(pStream->Type);
-                break;
+            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+            AssertRelease(pStream->Type);
+            break;
         }
     }
@@ -856 +855 @@
 static int VBoxNetFltSolarisModReadPut(queue_t *pQueue, mblk_t *pMsg)
 {
-    /*
-     * Yes, I'm paranoid.
-     */
-    if (!pMsg)
-    {
-        LogRel((DEVICE_NAME ":VBoxNetFltSolarisModReadPut huh?? Invalid parameters.\n"));
-        return 0;
-    }
-
     LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut pQueue=%p pMsg=%p\n", pQueue, pMsg));
 
@@ -877 +867 @@
      * is somehow still in the host stream we must try not to panic the host.
      */
-    if (   pStream
+    if (   pMsg
+        && pStream
         && pStream->Type == kPromiscStream)
     {
@@ -906 +897 @@
                         && pPromiscStream->fRawMode)
                     {
-                        RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
                         vboxNetFltSolarisRecv(pThis, pStream, pQueue, pMsg);
-                        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
                         fSendUpstream = false;
                     }
@@ -1004 +993 @@
     }
 
-    if (   fSendUpstream
-        && pMsg)
+    if (fSendUpstream)
     {
         /*
@@ -1017 +1005 @@
         }
         else
-            putq(pQueue, pMsg);
+            putbq(pQueue, pMsg);
     }
 
@@ -1225 +1213 @@
         }
         else
-            putq(pQueue, pMsg);
+            putbq(pQueue, pMsg);
     }
 
@@ -2389 +2377 @@
         return VERR_NET_MSG_SIZE;
 
-    PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pMsg->b_rptr;
     PVBOXNETFLTPACKETID pCur = NULL;
     int rc = VINF_SUCCESS;
@@ -2426 +2413 @@
                 break;
             }
-            else
+            else if (pPromiscStream->pTail)
             {
-                Assert(pPromiscStream->pTail);
                 pCur = RTMemAlloc(sizeof(VBOXNETFLTPACKETID));
                 if (RT_UNLIKELY(!pCur))
@@ -2580 +2566 @@
      * Don't loopback packets we transmit to the wire.
      */
-    if (vboxNetFltSolarisIsOurMBlk(pThis, pPromiscStream, pMsg))
+#if 0
+    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
+    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    bool fOurPacket = vboxNetFltSolarisIsOurMBlk(pThis, pPromiscStream, pMsg);
+    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+
+    if (fOurPacket)
     {
         LogFlow((DEVICE_NAME ":Avoiding packet loopback.\n"));
+        freemsg(pMsg);
+        return VINF_SUCCESS;
+    }
+#endif
+    if (pMsg->b_flag & MSGNOLOOP)
+    {
         freemsg(pMsg);
         return VINF_SUCCESS;
@@ -2609 +2607 @@
     }
     vboxNetFltSolarisAnalyzeMBlk(pMsg);
-
 #endif
 
@@ -2957 +2954 @@
     LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit pThis=%p pSG=%p fDst=%d\n", pThis, pSG, fDst));
 
-    /*
-     * Create a message block and send it down the wire (downstream).
-     */
     int rc = VINF_SUCCESS;
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
     if (fDst & INTNETTRUNKDIR_WIRE)
     {
-        mblk_t *pMsg = vboxNetFltSolarisMBlkFromSG(pThis, pSG, fDst);
-        if (RT_LIKELY(pMsg))
-        {
-            LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_WIRE\n"));
-
-            RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-
-            vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
-            queue_t *pPromiscWriteQueue = WR(pPromiscStream->Stream.pReadQueue);
-
-            rc = vboxNetFltSolarisQueueLoopback(pThis, pPromiscStream, pMsg);
-
-            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-
-            putnext(pPromiscWriteQueue, pMsg);
-        }
-        else
-            rc = VERR_NO_MEMORY;
+        vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
+        if (RT_LIKELY(pPromiscStream))
+        {
+            mblk_t *pMsg = vboxNetFltSolarisMBlkFromSG(pThis, pSG, fDst);
+            if (RT_LIKELY(pMsg))
+            {
+                LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_WIRE\n"));
+
+#if 0
+                RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
+                RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+
+                vboxNetFltSolarisQueueLoopback(pThis, pPromiscStream, pMsg);
+
+                RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+#endif
+
+                pMsg->b_flag |= MSGNOLOOP;
+                putnext(WR(pPromiscStream->Stream.pReadQueue), pMsg);
+            }
+        }
     }