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

Timestamp:

Oct 30, 2009 2:03:30 PM (16 years ago)

Author:

vboxsync

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

54137

Message:

netflt/win: fix packet loss caused by packet status not being reset

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Files:

• VBoxNetFlt-win.c (modified) (1 diff)
• VBoxNetFlt-win.h (modified) (1 diff)
• VBoxNetFltMp-win.c (modified) (2 diffs)
• VBoxNetFltPt-win.c (modified) (5 diffs)

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

@@ -1715 +1715 @@
         PNDIS_BUFFER pBuffer;
         PVOID pMemBuf;
+
+        /* @todo: generally we do not always need to zero-initialize the complete OOB data here, reinitialize only when/what we need,
+         * however we DO need to reset the status for the packets we indicate via NdisMIndicateReceivePacket to avoid packet loss
+         * in case the status contains NDIS_STATUS_RESOURCES */
+        VBOXNETFLT_OOB_INIT(pPacket);
 
         if(bCopyMemory)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFlt-win.h

@@ -998 +998 @@
 #endif
 
-#if !defined(VBOX_NETFLT_ONDEMAND_BIND) && !defined(VBOXNETADP)
-
 /**************************************************************
  * utility methofs for ndis packet creation/initialization    *
  **************************************************************/
+
+#define VBOXNETFLT_OOB_INIT(_p) \
+    { \
+        NdisZeroMemory(NDIS_OOB_DATA_FROM_PACKET(_p), sizeof(NDIS_PACKET_OOB_DATA)); \
+        NDIS_SET_PACKET_HEADER_SIZE(_p, ETH_HEADER_SIZE); \
+    }
+
+#if !defined(VBOX_NETFLT_ONDEMAND_BIND) && !defined(VBOXNETADP)
+
 DECLINLINE(NDIS_STATUS) vboxNetFltWinCopyPacketInfoOnRecv(PNDIS_PACKET pDstPacket, PNDIS_PACKET pSrcPacket)
 {

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltMp-win.c

@@ -479 +479 @@
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
     uint64_t NanoTS = RTTimeSystemNanoTS();
+    int cPPUsage;
 
     Assert(vboxNetFltWinGetOpState(&pAdapt->MPState) == kVBoxNetDevOpState_Initialized);
@@ -496 +497 @@
 
     vboxNetFltWinWaitDereference(&pAdapt->MPState);
+
+    /* check packet pool is empty */
+    cPPUsage = NdisPacketPoolUsage(pAdapt->hRecvPacketPoolHandle);
+    Assert(cPPUsage == 0);
+    /* for debugging only, ignore the err in release */
+    NOREF(cPPUsage);
 
     vboxNetFltWinSetOpState(&pAdapt->MPState, kVBoxNetDevOpState_Deinitialized);

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltPt-win.c

@@ -291 +291 @@
     uint64_t NanoTS = RTTimeSystemNanoTS();
 #endif
+    int cPPUsage;
 
     LogFlow(("==> vboxNetFltWinPtDoUnbinding: Adapt %p\n", pAdapt));
@@ -355 +356 @@
 
     vboxNetFltWinWaitDereference(&pAdapt->PTState);
+
+    /* check packet pool is empty */
+    cPPUsage = NdisPacketPoolUsage(pAdapt->hSendPacketPoolHandle);
+    Assert(cPPUsage == 0);
+    cPPUsage = NdisPacketPoolUsage(pAdapt->hRecvPacketPoolHandle);
+    Assert(cPPUsage == 0);
+    /* for debugging only, ignore the err in release */
+    NOREF(cPPUsage);
 
     while (ASMAtomicUoReadBool((volatile bool *)&pAdapt->bOutstandingRequests))
@@ -1407 +1416 @@
             }
 
+            VBOXNETFLT_OOB_INIT(pPacket);
+
 #ifdef VBOX_LOOPBACK_USEFLAGS
             /* set "don't loopback" flags */
             NdisSetPacketFlags(pPacket, g_fPacketDontLoopBack);
+#else
+            NdisSetPacketFlags(pPacket, 0);
 #endif
 
@@ -2159 +2172 @@
     PVBOXNETFLTINS pNetFlt = PADAPT_2_PVBOXNETFLTINS(pAdapt);
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
+    int cPPUsage;
 
     ReturnStatus = NDIS_STATUS_SUCCESS;
@@ -2219 +2233 @@
 #endif
 
-        Assert(NdisPacketPoolUsage(pAdapt->hSendPacketPoolHandle) == 0);
+        /* check packet pool is empty */
+        cPPUsage = NdisPacketPoolUsage(pAdapt->hSendPacketPoolHandle);
+        Assert(cPPUsage == 0);
+        cPPUsage = NdisPacketPoolUsage(pAdapt->hRecvPacketPoolHandle);
+        Assert(cPPUsage == 0);
+        /* for debugging only, ignore the err in release */
+        NOREF(cPPUsage);
+
 #ifndef VBOX_NETFLT_ONDEMAND_BIND
-        Assert(NdisPacketPoolUsage(pAdapt->hRecvPacketPoolHandle) == 0);
         Assert(pAdapt->bOutstandingRequests == FALSE);
 #endif