Changeset 12123 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Sep 5, 2008 11:05:31 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/vboxnetflt: fixed & enabled checksumming. Enabeld fast path ack's.

File:

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

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

@@ -520 +520 @@
 static int VBoxNetFltSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pvArg, void **ppResult)
 {
-    LogFlow((DEVICE_NAME ":VBoxNetFltSolarisGetInfo pDip=%p enmCmd=%d pArg=%p instance=%d\n", pDip, enmCmd, getminor((dev_t)pvArg)));
+    LogFlow((DEVICE_NAME ":VBoxNetFltSolarisGetInfo pDip=%p enmCmd=%d pArg=%p instance=%d\n", pDip, enmCmd,
+                getminor((dev_t)pvArg)));
 
     switch (enmCmd)
@@ -557 +558 @@
     Assert(pQueue);
 
-    LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModOpen pQueue=%p pDev=%p fOpenMode=%d fStreamMode=%d\n", pQueue, pDev, fOpenMode, fStreamMode));
+    LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModOpen pQueue=%p pDev=%p fOpenMode=%d fStreamMode=%d\n", pQueue, pDev,
+            fOpenMode, fStreamMode));
 
     /*
@@ -638 +640 @@
     WR(pQueue)->q_ptr = pStream;
 
-    /** @todo Get rid of linked list maintenance; we're not a virtual DLPI device slaving for ring-3 consumers. */
     /*
      * Link it to the list of streams.
@@ -985 +986 @@
                              * Since we are evil, let's acknowledge the request ourselves!
                              */
-                            miocnak(pQueue, pMsg, 0, EINVAL);
+                            miocack(pQueue, pMsg, 0, EINVAL);
                             fSendDownstream = false;
                             LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModWritePut: Fast path request when we need raw mode!\n"));
@@ -1251 +1252 @@
         bcopy(pMsg->b_rptr + pPhysAddrAck->dl_addr_offset, &pThis->u.s.Mac, sizeof(pThis->u.s.Mac));
 
-        LogFlow((DEVICE_NAME ":vboxNetFltSolarisCachePhysAddr: DL_PHYS_ADDR_ACK: Mac=%.*Rhxs\n", sizeof(pThis->u.s.Mac), &pThis->u.s.Mac));
+        LogFlow((DEVICE_NAME ":vboxNetFltSolarisCachePhysAddr: DL_PHYS_ADDR_ACK: Mac=%.*Rhxs\n", sizeof(pThis->u.s.Mac),
+                    &pThis->u.s.Mac));
     }
 }
@@ -1382 +1384 @@
 static int vboxNetFltSolarisRelink(vnode_t *pVNode, struct lifreq *pInterface, int IpMuxFd, int ArpMuxFd)
 {
-    LogFlow((DEVICE_NAME ":vboxNetFltSolarisRelink: pVNode=%p pInterface=%p IpMuxFd=%d ArpMuxFd=%d\n", pVNode, pInterface, IpMuxFd, ArpMuxFd));
+    LogFlow((DEVICE_NAME ":vboxNetFltSolarisRelink: pVNode=%p pInterface=%p IpMuxFd=%d ArpMuxFd=%d\n", pVNode,
+            pInterface, IpMuxFd, ArpMuxFd));
 
     int NewIpMuxId;
@@ -1623 +1626 @@
                                  * Inject/Eject from the host IP stack.
                                  */
-                                rc = strioctl(pVNodeIp, fAttach ? _I_INSERT : _I_REMOVE, (intptr_t)&StrMod, 0, K_TO_K, kcred, &ret);
+                                rc = strioctl(pVNodeIp, fAttach ? _I_INSERT : _I_REMOVE, (intptr_t)&StrMod, 0, K_TO_K,
+                                            kcred, &ret);
                                 if (!rc)
                                 {
@@ -1630 +1634 @@
                                      */
                                     g_VBoxNetFltSolarisState.CurType = kArpStream;
-                                    rc = strioctl(pVNodeArp, fAttach ? _I_INSERT : _I_REMOVE, (intptr_t)&ArpStrMod, 0, K_TO_K, kcred, &ret);
+                                    rc = strioctl(pVNodeArp, fAttach ? _I_INSERT : _I_REMOVE, (intptr_t)&ArpStrMod, 0, K_TO_K,
+                                                kcred, &ret);
                                     if (!rc)
                                     {
@@ -1643 +1648 @@
                                         if (VBOX_SUCCESS(rc))
                                         {
-                                            bool fRawModeOk = !fAttach;         /* Raw mode check is always ok during the detach case */
+                                            bool fRawModeOk = !fAttach;   /* Raw mode check is always ok during the detach case */
                                             if (fAttach)
                                             {
@@ -1671 +1676 @@
                                                 ldi_close(IPDevHandle, FREAD | FWRITE, kcred);
 
-                                                LogFlow((DEVICE_NAME ":vboxNetFltSolarisModSetup: Success! %s %s@(Ip:%d Arp:%d) %s interface %s\n",
-                                                        fAttach ? "Injected" : "Ejected", StrMod.mod_name, StrMod.pos, ArpStrMod.pos,
-                                                        fAttach ? "to" : "from", pThis->szName));
+                                                LogFlow((DEVICE_NAME ":vboxNetFltSolarisModSetup: Success! %s %s@(Ip:%d Arp:%d) "
+                                                        "%s interface %s\n", fAttach ? "Injected" : "Ejected", StrMod.mod_name,
+                                                        StrMod.pos, ArpStrMod.pos, fAttach ? "to" : "from", pThis->szName));
                                                 return VINF_SUCCESS;
                                             }
@@ -1681 +1686 @@
                                         else
                                         {
-                                            LogRel((DEVICE_NAME ":vboxNetFltSolarisModSetup: module relinking failed. Mode=%s rc=%d.\n",
+                                            LogRel((DEVICE_NAME ":vboxNetFltSolarisModSetup: Relinking failed. Mode=%s rc=%d.\n",
                                                     fAttach ? "inject" : "eject", rc));
                                         }
@@ -1709 +1714 @@
                             }
                             else
-                                LogRel((DEVICE_NAME ":vboxNetFltSolarisModSetup: vboxNetFltSolarisDetermineModPos failed. rc=%d rc2=%d\n", rc, rc2));
+                                LogRel((DEVICE_NAME ":vboxNetFltSolarisModSetup: failed to find position. rc=%d rc2=%d\n", rc, rc2));
                         }
                         else
@@ -2099 +2104 @@
 
     bool fChecksumAdjusted = false;
-#if 0
+#if 1
     if (fSrc & INTNETTRUNKDIR_HOST)
     {
@@ -2200 +2205 @@
  *                  This must not be DLPI linked messages, must be M_DATA.
  *
- * @remarks This function expects raw mblk_t (chained is acceptible) and if it
- *          returns a corrected message, the passed in input message has been
- *          freed and should not be referenced anymore.
+ * @remarks If this function returns a checksum adjusted message, the
+ *          passed in input message has been freed and should not be
+ *          referenced anymore by the caller.
  */
 static mblk_t *vboxNetFltSolarisFixChecksums(mblk_t *pMsg)
@@ -2223 +2228 @@
          */
         size_t cbIpPacket = 0;
+        mblk_t *pFullMsg = NULL;
         if (pMsg->b_cont)
         {
@@ -2252 +2258 @@
             }
 
-            freemsg(pMsg);
-            pMsg = pFullMsg;
-            DB_TYPE(pMsg) = M_DATA;
-            pEthHdr = (PRTNETETHERHDR)pMsg->b_rptr;
-        }
-
-        cbIpPacket = MBLKL(pMsg) - sizeof(RTNETETHERHDR);
+            DB_TYPE(pFullMsg) = M_DATA;
+            pEthHdr = (PRTNETETHERHDR)pFullMsg->b_rptr;
+            cbIpPacket = MBLKL(pFullMsg) - sizeof(RTNETETHERHDR);
+        }
+        else
+            cbIpPacket = MBLKL(pMsg) - sizeof(RTNETETHERHDR);
 
         /*
@@ -2301 +2306 @@
             LogFlow((DEVICE_NAME ":fixed IP checkum.\n"));
 
+            /*
+             * If we made a copy and the checksum is corrected on the copy,
+             * free the original, return the checksum fixed copy.
+             */
+            if (pFullMsg)
+            {
+                freemsg(pMsg);
+                return pFullMsg;
+            }
+
             return pMsg;
         }
+
+        /*
+         * If we made a copy and the checksum is NOT corrected, free the copy,
+         * and return NULL.
+         */
+        if (pFullMsg)
+            freemsg(pFullMsg);
     }
 
@@ -2341 +2363 @@
     else
     {
-        LogFlow((DEVICE_NAME ":Unknown EtherType=%x D=%.6Rhxs S=%.6Rhxs\n", RT_H2BE_U16(pEthHdr->EtherType), &pEthHdr->DstMac, &pEthHdr->SrcMac));
+        LogFlow((DEVICE_NAME ":Unknown EtherType=%x D=%.6Rhxs S=%.6Rhxs\n", RT_H2BE_U16(pEthHdr->EtherType), &pEthHdr->DstMac,
+                    &pEthHdr->SrcMac));
         /* LogFlow((DEVICE_NAME ":%.*Vhxd\n", MBLKL(pMsg), pMsg->b_rptr)); */
     }