Changeset 13076 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Oct 8, 2008 12:36:37 PM (16 years ago)

Author:

vboxsync

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

37555

Message:

Solaris/VBoxNetFlt: small optimization for unplumbed interfaces.

File:

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

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

@@ -2142 +2142 @@
  * Initializes a packet identifier.
  *
- * @param   pMsg        Pointer to the message.
+ * @param   pTag        Pointer to the packed identifier.
+ * @param   pMsg        Pointer to the message to be identified.
  *
  * @remarks Warning!!! This function assumes 'pMsg' is an unchained message.
@@ -2756 +2757 @@
         if (RT_SUCCESS(rc))
             return rc;
-    
+
         LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface failed. rc=%Vrc\n", rc));
         RTSemFastMutexDestroy(pThis->u.s.hFastMtx);
@@ -2808 +2809 @@
                 putnext(WR(pPromiscStream->Stream.pReadQueue), pMsg);
             }
-        }
-    }
-
-    /*
-     * Create a message block and send it up the host stack (upstream).
-     */
+            else
+            {
+                LogRel((DEVICE_NAME ":vboxNetFltPortOsXmit vboxNetFltSolarisMBlkFromSG failed.\n"));
+                rc = VERR_NO_MEMORY;
+            }
+        }
+    }
+
     if (fDst & INTNETTRUNKDIR_HOST)
     {
+        /*
+         * For unplumbed interfaces we would not be bound to IP or ARP.
+         * We either bind to both or neither; so atomic reading one should be sufficient.
+         */
+        vboxnetflt_stream_t *pIpStream  = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvIpStream);
+        if (!pIpStream)
+            return rc;
+
+        /*
+         * Create a message block and send it up the host stack (upstream).
+         */
         mblk_t *pMsg = vboxNetFltSolarisMBlkFromSG(pThis, pSG, fDst);
         if (RT_LIKELY(pMsg))
@@ -2829 +2843 @@
                 LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST ARP\n"));
 
-                /*
-                 * Construct a DL_UNITDATA_IND style message for ARP as it doesn't understand fast path.
-                 */
-                mblk_t *pDlpiMsg;
-                int rc = vboxNetFltSolarisRawToUnitData(pMsg, &pDlpiMsg);
-                if (RT_SUCCESS(rc))
+                vboxnetflt_stream_t *pArpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvArpStream);
+                if (pArpStream)
                 {
-                    pMsg = pDlpiMsg;
-
-                    vboxnetflt_stream_t *pArpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvArpStream);
-                    if (pArpStream)
+                    /*
+                     * Construct a DL_UNITDATA_IND style message for ARP as it doesn't understand fast path.
+                     */
+                    mblk_t *pDlpiMsg;
+                    int rc = vboxNetFltSolarisRawToUnitData(pMsg, &pDlpiMsg);
+                    if (RT_SUCCESS(rc))
                     {
+                        pMsg = pDlpiMsg;
+
                         queue_t *pArpReadQueue = pArpStream->pReadQueue;
                         putnext(pArpReadQueue, pMsg);
@@ -2846 +2860 @@
                     else
                     {
-                        /*
-                         * For unplumbed interfaces we may not be bound to ARP.
-                         */
+                        LogRel((DEVICE_NAME ":vboxNetFltSolarisRawToUnitData failed!\n"));
                         freemsg(pMsg);
+                        rc = VERR_NO_MEMORY;
                     }
                 }
                 else
-                {
-                    LogRel((DEVICE_NAME ":vboxNetFltSolarisRawToUnitData failed! rc=%d\n", rc));
-                    freemsg(pMsg);
-                    rc = VERR_NO_MEMORY;
-                }
+                    freemsg(pMsg);  /* Should really never happen... */
             }
             else
@@ -2866 +2875 @@
                 LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST\n"));
 
-                vboxnetflt_stream_t *pIpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvIpStream);
-                if (pIpStream)
+                mblk_t *pMsg = vboxNetFltSolarisMBlkFromSG(pThis, pSG, fDst);
+                if (RT_LIKELY(pMsg))
                 {
                     pMsg->b_rptr += sizeof(RTNETETHERHDR);
@@ -2875 +2884 @@
                 else
                 {
-                    /*
-                     * For unplumbed interfaces we may not be bound to IP.
-                     */
+                    LogRel((DEVICE_NAME ":vboxNetFltSolarisRawToUnitData failed!\n"));
                     freemsg(pMsg);
+                    rc = VERR_NO_MEMORY;
                 }
             }
         }
         else
-            rc = VERR_NO_MEMORY;
+        {
+            LogRel((DEVICE_NAME ":vboxNetFltSolarisMBlkFromSG failed.\n"));
+            rc = VERR_NO_MEMORY;                
+        }
     }