Changeset 14506 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux

Timestamp:

Nov 24, 2008 8:46:58 AM (16 years ago)

Author:

vboxsync

Message:

Linux hostif: Added packet segmentation for host-to-guest transfer.

File:

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

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

@@ -326 +326 @@
     }
     pSG->cbTotal = pBuf->len;
+#ifdef VBOXNETFLT_SG_SUPPORT
     pSG->aSegs[0].cb = skb_headlen(pBuf);
     pSG->aSegs[0].pv = pBuf->data;
@@ -335 +336 @@
         pSG->aSegs[i+1].cb = pFrag->size;
         pSG->aSegs[i+1].pv = kmap(pFrag->page);
+        printk("%p = kmap()\n", pSG->aSegs[i+1].pv);
         pSG->aSegs[i+1].Phys = NIL_RTHCPHYS;
     }
     pSG->cSegsUsed = ++i;
+#else
+    pSG->aSegs[0].cb = pBuf->len;
+    pSG->aSegs[0].pv = pBuf->data;
+    pSG->aSegs[0].Phys = NIL_RTHCPHYS;
+    pSG->cSegsUsed = i = 1;
+#endif
+
 
 #ifdef PADD_RUNT_FRAMES_FROM_HOST
@@ -360 +369 @@
     }
 #endif
+    Log2(("vboxNetFltLinuxSkBufToSG: allocated=%d, segments=%d frags=%d next=%p frag_list=%p pkt_type=%x fSrc=%x\n",
+          pSG->cSegsAlloc, pSG->cSegsUsed, skb_shinfo(pBuf)->nr_frags, pBuf->next, skb_shinfo(pBuf)->frag_list, pBuf->pkt_type, fSrc));
+    for (i = 0; i < pSG->cSegsUsed; i++)
+        Log2(("vboxNetFltLinuxSkBufToSG:   #%d: cb=%d pv=%p\n",
+              i, pSG->aSegs[i].cb, pSG->aSegs[i].pv));
 }
 
@@ -411 +425 @@
 static unsigned vboxNetFltLinuxSGSegments(PVBOXNETFLTINS pThis, struct sk_buff *pBuf)
 {
+#ifdef VBOXNETFLT_SG_SUPPORT
     unsigned cSegs = 1 + skb_shinfo(pBuf)->nr_frags;
+#else
+    unsigned cSegs = 1;
+#endif
 #ifdef PADD_RUNT_FRAMES_FROM_HOST
     /*
@@ -422 +440 @@
 }
 
-
 /* WARNING! This function should only be called after vboxNetFltLinuxSkBufToSG()! */
 static void  vboxNetFltLinuxFreeSkBuff(struct sk_buff *pBuf, PINTNETSG pSG)
 {
+#ifdef VBOXNETFLT_SG_SUPPORT
     int i;
 
     for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++)
+    {
+        printk("kunmap(%p)\n", pSG->aSegs[i+1].pv);
         kunmap(pSG->aSegs[i+1].pv);
+    }
+#endif
             
     dev_kfree_skb(pBuf);
 }
 
-static void vboxNetFltLinuxForwardToIntNet(PVBOXNETFLTINS pThis, struct sk_buff *pBuf)
-{
-    bool fDropIt;
-    unsigned cSegs;
-    uint32_t fSrc = pBuf->pkt_type == PACKET_OUTGOING ? INTNETTRUNKDIR_HOST : INTNETTRUNKDIR_WIRE;
-    /*
-     * Finalize out-bound packets since the stack puts off finalizing
-     * TCP/IP checksums as long as possible.
-     * ASSUMES this only applies to outbound IP packets.
-     *
-    if (    (fSrc & INTNETTRUNKDIR_HOST)
-        &&  eProtocol == PF_INET)
-    {
-        Assert(!pvFrame);
-        mbuf_outbound_finalize(pMBuf, eProtocol, sizeof(RTNETETHERHDR));
-    }*/
-
-    /*
-     * Create a (scatter/)gather list for the mbuf and feed it to the internal network.
-     */
-    fDropIt = false;
-    cSegs = vboxNetFltLinuxSGSegments(pThis, pBuf);
+static int vboxNetFltLinuxForwardSegment(PVBOXNETFLTINS pThis, struct sk_buff *pBuf, uint32_t fSrc)
+{
+    unsigned cSegs = vboxNetFltLinuxSGSegments(pThis, pBuf);
     if (cSegs < MAX_SKB_FRAGS)
     {
@@ -463 +466 @@
         {
             Log(("VBoxNetFlt: Failed to allocate SG buffer.\n"));
-            return;
+            return VERR_NO_MEMORY;
         }
         vboxNetFltLinuxSkBufToSG(pThis, pBuf, pSG, cSegs, fSrc);
@@ -479 +482 @@
     }
 
+    return VINF_SUCCESS;
+}
+
+static void vboxNetFltLinuxForwardToIntNet(PVBOXNETFLTINS pThis, struct sk_buff *pBuf)
+{
+    struct sk_buff *pNext, *pSegment = NULL;
+    uint32_t fSrc = pBuf->pkt_type == PACKET_OUTGOING ? INTNETTRUNKDIR_HOST : INTNETTRUNKDIR_WIRE;
+
+#ifndef VBOXNETFLT_SG_SUPPORT
+    /*
+     * Get rid of fragmented packets, they cause too much trouble.
+     */
+    struct sk_buff *pCopy = skb_copy(pBuf, GFP_KERNEL);
+    kfree_skb(pBuf);
+    if (!pCopy)
+    {
+        LogRel(("VBoxNetFlt: Failed to allocate packet buffer, dropping the packet.\n"));
+        return;
+    }
+    pBuf = pCopy;
+#endif
+
+    Log2(("vboxNetFltLinuxForwardToIntNet: cb=%u gso_size=%u gso_segs=%u gso_type=%u\n",
+          pBuf->len, skb_shinfo(pBuf)->gso_size, skb_shinfo(pBuf)->gso_segs, skb_shinfo(pBuf)->gso_type));
+
+    if (skb_is_gso(pBuf))
+    {
+        /* Need to segment the packet */
+        struct sk_buff *pSegments = skb_gso_segment(pBuf, 0); /* No features, very dumb device */
+        pBuf->next = pSegments;
+    }
+    /*
+     * Create a (scatter/)gather list for the sk_buff and feed it to the internal network.
+     */
+    for (pSegment = pBuf; pSegment; pSegment = pNext)
+    {
+        pNext = pSegment->next;
+        pSegment->next = 0;
+        vboxNetFltLinuxForwardSegment(pThis, pSegment, fSrc);
+    }
 }
 
@@ -698 +741 @@
     {
         /*
-         * Create a mbuf for the gather list and push it onto the wire.
+         * Create a sk_buff for the gather list and push it onto the wire.
          */
         if (fDst & INTNETTRUNKDIR_WIRE)
@@ -719 +762 @@
 
         /*
-         * Create a mbuf for the gather list and push it onto the host stack.
+         * Create a sk_buff for the gather list and push it onto the host stack.
          */
         if (fDst & INTNETTRUNKDIR_HOST)
@@ -797 +840 @@
             Assert(!pThis->u.s.fPromiscuousSet);
 
+#if 0
             /*
              * Try bring the interface up and running if it's down.
@@ -803 +847 @@
             if ((fIf & (IFF_UP | IFF_RUNNING)) != (IFF_UP | IFF_RUNNING))
             {
+                rtnl_lock();
                 err = dev_change_flags(pDev, fIf | IFF_UP);
+                rtnl_unlock();
                 fIf = dev_get_flags(pDev);
             }
@@ -814 +860 @@
                 && !ASMAtomicReadBool(&pThis->u.s.fPromiscuousSet))
             {
+#endif
                 rtnl_lock();
                 dev_set_promiscuity(pDev, 1);
@@ -831 +878 @@
                 }
 #endif
+#if 0
             }
             else if (!err)
@@ -836 +884 @@
             if (err)
                 LogRel(("VBoxNetFlt: Failed to put '%s' into promiscuous mode, err=%d (%d->%d)\n", pThis->szName, err, cPromiscBefore, VBOX_GET_PCOUNT(pDev)));
+#endif
         }
         else