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

Timestamp:

Jan 20, 2009 11:13:08 AM (16 years ago)

Author:

vboxsync

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

41779

Message:

Linux hostif: Fixed the issue with duplicating guest originated packets.

File:

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

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

@@ -123 +123 @@
  * The (common) global data.
  */
+#ifdef RT_ARCH_AMD64
+/**
+ * Memory for the executable memory heap (in IPRT).
+ */
+extern uint8_t g_abExecMemory[1572864]; /* 1.5 MB */
+__asm__(".section execmemory, \"awx\", @progbits\n\t"
+        ".align 32\n\t"
+        ".globl g_abExecMemory\n"
+        "g_abExecMemory:\n\t"
+        ".zero 1572864\n\t"
+        ".type g_abExecMemory, @object\n\t"
+        ".size g_abExecMemory, 1572864\n\t"
+        ".text\n\t");
+#endif
+
 static VBOXNETFLTGLOBALS g_VBoxNetFltGlobals;
 
@@ -151 +166 @@
 {
     int rc;
-    Log(("VBoxNetFltLinuxInit\n"));
-
     /*
      * Initialize IPRT.
@@ -159 +172 @@
     if (RT_SUCCESS(rc))
     {
+#ifdef RT_ARCH_AMD64
+        rc = RTR0MemExecDonate(&g_abExecMemory[0], sizeof(g_abExecMemory));
+        printk("VBoxNetFlt: dbg - g_abExecMemory=%p\n", (void *)&g_abExecMemory[0]);
+        if (RT_FAILURE(rc))
+        {
+            printk("VBoxNetFlt: failed to donate exec memory, no logging will be available.\n");
+        }
+#endif
+        Log(("VBoxNetFltLinuxInit\n"));
+
         /*
          * Initialize the globals and connect to the support driver.
@@ -268 +291 @@
 
 #define VBOXNETFLT_CB_TAG 0xA1C9D7C3
-#define VBOXNETFLT_SKB_CB(skb) (*(uint32_t*)&((skb)->cb[0]))
+#define VBOXNETFLT_SKB_TAG(skb) (*(uint32_t*)&((skb)->cb[sizeof((skb)->cb)-sizeof(uint32_t)]))
 
 /**
@@ -279 +302 @@
 DECLINLINE(bool) vboxNetFltLinuxSkBufIsOur(struct sk_buff *pBuf)
 {
-    return VBOXNETFLT_SKB_CB(pBuf) == VBOXNETFLT_CB_TAG ;
+    return VBOXNETFLT_SKB_TAG(pBuf) == VBOXNETFLT_CB_TAG ;
 }
 
@@ -333 +356 @@
             VBOX_SKB_RESET_MAC_HDR(pPkt);
         }
-        VBOXNETFLT_SKB_CB(pPkt) = VBOXNETFLT_CB_TAG;
+        VBOXNETFLT_SKB_TAG(pPkt) = VBOXNETFLT_CB_TAG;
 
         return pPkt;
@@ -422 +445 @@
     }
 #endif
-    Log2(("vboxNetFltLinuxSkBufToSG: allocated=%d, segments=%d frags=%d next=%p frag_list=%p pkt_type=%x fSrc=%x\n",
+    Log4(("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",
+        Log4(("vboxNetFltLinuxSkBufToSG:   #%d: cb=%d pv=%p\n",
               i, pSG->aSegs[i].cb, pSG->aSegs[i].pv));
 }
@@ -452 +475 @@
     PVBOXNETFLTINS pThis;
     struct net_device *pDev;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
-    Log2(("vboxNetFltLinuxPacketHandler: pBuf=%p pSkbDev=%p pPacketType=%p pOrigDev=%p\n",
-          pBuf, pSkbDev, pPacketType, pOrigDev));
-#else
-    Log2(("vboxNetFltLinuxPacketHandler: pBuf=%p pSkbDev=%p pPacketType=%p\n",
-          pBuf, pSkbDev, pPacketType));
-#endif
+    LogFlow(("vboxNetFltLinuxPacketHandler: pBuf=%p pSkbDev=%p pPacketType=%p\n",
+             pBuf, pSkbDev, pPacketType));
     /*
      * Drop it immediately?
@@ -464 +482 @@
     if (!pBuf)
         return 0;
+    
     pThis = VBOX_FLT_PT_TO_INST(pPacketType);
     pDev = (struct net_device *)ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pDev);
@@ -472 +491 @@
     }
 
+    Log4(("vboxNetFltLinuxPacketHandler: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb));
     if (vboxNetFltLinuxSkBufIsOur(pBuf))
     {
+        Log2(("vboxNetFltLinuxPacketHandler: got our own sk_buff, drop it.\n"));
         dev_kfree_skb(pBuf);
         return 0;
@@ -497 +518 @@
     skb_queue_tail(&pThis->u.s.XmitQueue, pBuf);
     schedule_work(&pThis->u.s.XmitTask);
-    Log2(("vboxNetFltLinuxPacketHandler: scheduled work %p for sk_buff %p\n",
+    Log4(("vboxNetFltLinuxPacketHandler: scheduled work %p for sk_buff %p\n",
           &pThis->u.s.XmitTask, pBuf));
     /* It does not really matter what we return, it is ignored by the kernel. */
@@ -536 +557 @@
 }
 
+#ifndef LOG_ENABLED
+#define vboxNetFltDumpPacket(a, b, c, d)
+#else
+static void vboxNetFltDumpPacket(PINTNETSG pSG, bool fEgress, const char *pszWhere, int iIncrement)
+{
+    uint8_t *pInt, *pExt;
+    static int iPacketNo = 1;
+    iPacketNo += iIncrement;
+    if (fEgress)
+    {
+        pExt = pSG->aSegs[0].pv;
+        pInt = pExt + 6;
+    }
+    else
+    {
+        pInt = pSG->aSegs[0].pv;
+        pExt = pInt + 6;
+    }
+    Log(("VBoxNetFlt: (int)%02x:%02x:%02x:%02x:%02x:%02x"
+         " %s (%s)%02x:%02x:%02x:%02x:%02x:%02x (%u bytes) packet #%u\n",
+         pInt[0], pInt[1], pInt[2], pInt[3], pInt[4], pInt[5],
+         fEgress ? "-->" : "<--", pszWhere,
+         pExt[0], pExt[1], pExt[2], pExt[3], pExt[4], pExt[5],
+         pSG->cbTotal, iPacketNo));
+    Log3(("%.*Rhxd\n", pSG->aSegs[0].cb, pSG->aSegs[0].pv));
+}
+#endif
+
 static int vboxNetFltLinuxForwardSegment(PVBOXNETFLTINS pThis, struct sk_buff *pBuf, uint32_t fSrc)
 {
@@ -551 +600 @@
 
         pTmp = pSG->aSegs[0].pv;
-        Log(("VBoxNetFlt: (int)%02x:%02x:%02x:%02x:%02x:%02x"
-             " <-- (%s)%02x:%02x:%02x:%02x:%02x:%02x (%u bytes)\n",
-             pTmp[0], pTmp[1], pTmp[2], pTmp[3], pTmp[4], pTmp[5],
-             (fSrc & INTNETTRUNKDIR_HOST) ? "host" : "wire",
-             pTmp[6], pTmp[7], pTmp[8], pTmp[9], pTmp[10], pTmp[11],
-             pSG->cbTotal));
+        vboxNetFltDumpPacket(pSG, false, (fSrc & INTNETTRUNKDIR_HOST) ? "host" : "wire", 1);
         pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, pSG, fSrc);
-        Log2(("VBoxNetFlt: Dropping the sk_buff.\n"));
+        Log4(("VBoxNetFlt: Dropping the sk_buff.\n"));
         vboxNetFltLinuxFreeSkBuff(pBuf, pSG);
     }
@@ -611 +655 @@
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
 
-    Log2(("vboxNetFltLinuxXmitTask: Got work %p.\n", pWork));
+    Log4(("vboxNetFltLinuxXmitTask: Got work %p.\n", pWork));
     pThis = VBOX_FLT_XT_TO_INST(pWork);
     /*
@@ -805 +849 @@
 }
 
-
 int  vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, PINTNETSG pSG, uint32_t fDst)
 {
-    uint8_t *pTmp;
     struct net_device * pDev;
     int err;
@@ -814 +856 @@
 
     LogFlow(("vboxNetFltPortOsXmit: pThis=%p (%s)\n", pThis, pThis->szName));
-
-    pTmp = pSG->aSegs[0].pv;
 
     pDev = vboxNetFltLinuxRetainNetDev(pThis);
@@ -828 +868 @@
             if (pBuf)
             {
-                Log(("VBoxNetFlt: (int)%02x:%02x:%02x:%02x:%02x:%02x"
-                     " --> (wire)%02x:%02x:%02x:%02x:%02x:%02x (%u bytes)\n",
-                     pTmp[6], pTmp[7], pTmp[8], pTmp[9], pTmp[10], pTmp[11],
-                     pTmp[0], pTmp[1], pTmp[2], pTmp[3], pTmp[4], pTmp[5],
-                     pSG->cbTotal));
+                vboxNetFltDumpPacket(pSG, true, "wire", 1);
+                Log4(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb));
+                Log4(("vboxNetFltPortOsXmit: dev_queue_xmit(%p)\n", pBuf));
                 err = dev_queue_xmit(pBuf);
                 if (err)
@@ -849 +887 @@
             if (pBuf)
             {
-                Log(("VBoxNetFlt: (int)%02x:%02x:%02x:%02x:%02x:%02x"
-                     " --> (host)%02x:%02x:%02x:%02x:%02x:%02x (%u bytes)\n",
-                     pTmp[6], pTmp[7], pTmp[8], pTmp[9], pTmp[10], pTmp[11],
-                     pTmp[0], pTmp[1], pTmp[2], pTmp[3], pTmp[4], pTmp[5],
-                     pSG->cbTotal));
+                vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1);
+                Log4(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb));
+                Log4(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf));
                 err = netif_rx_ni(pBuf);
                 if (err)
@@ -876 +912 @@
     {
         fRc = !!(pDev->promiscuity - (ASMAtomicUoReadBool(&pThis->u.s.fPromiscuousSet) & 1));
-        Log(("vboxNetFltPortOsIsPromiscuous: returns %d, pDev->promiscuity=%d, fPromiscuousSet=%d\n",
-             fRc, pDev->promiscuity, pThis->u.s.fPromiscuousSet));
+        LogFlow(("vboxNetFltPortOsIsPromiscuous: returns %d, pDev->promiscuity=%d, fPromiscuousSet=%d\n",
+                 fRc, pDev->promiscuity, pThis->u.s.fPromiscuousSet));
         vboxNetFltLinuxReleaseNetDev(pThis, pDev);
     }