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

Timestamp:

Nov 16, 2010 11:02:14 AM (14 years ago)

Author:

vboxsync

Message:

NetFlt/win: rx path fixs

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Files:

• VBoxNetFlt-win.c (modified) (3 diffs)
• VBoxNetFltCommon-win.h (modified) (2 diffs)
• VBoxNetFltPt-win.c (modified) (10 diffs)
• VBoxNetFltPt-win.h (modified) (1 diff)

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

@@ -2301 +2301 @@
     }
 
-
     FINI_INTERLOCKED_SINGLE_LIST(&pAdapt->TransferDataList);
 # if defined(DEBUG_NETFLT_LOOPBACK) || !defined(VBOX_LOOPBACK_USEFLAGS)
@@ -2453 +2452 @@
         }
 #endif
-
         /* moved to vboxNetFltOsInitInstance */
     } while(0);
@@ -3542 +3540 @@
         if (pPacket)
         {
+#ifdef VBOXNETADP
             NdisMIndicateReceivePacket(pAdapt->hMiniportHandle, &pPacket, 1);
+#else
+            /* flush any packets currently queued */
+            vboxNetFltWinPtQueueReceivedPacket(pAdapt, pPacket, TRUE /* BOOLEAN DoIndicate */);
+#endif
             cRefs--;
 #ifdef VBOXNETADP

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

@@ -334 +334 @@
 #ifndef VBOXNETADP
     /** true if we should indicate the receive complete used by the ProtocolReceeive mechanism */
-    bool                        bIndicateRcvComplete;
+    bool                        abIndicateRcvComplete[64];
 
     /** TRUE iff a request is pending at the miniport below */
@@ -366 +366 @@
     /** number of packets in the aReceivedPackets array*/
     ULONG                          cReceivedPacketCount;
-    /** flag indicating whether rx packet queueing is allowed */
-    BOOLEAN                        bIsReceivePacketQueueingDisabled;
     /** packet filter flags set by the upper protocols */
     ULONG                          fUpperProtocolSetFilter;

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

@@ -328 +328 @@
 
         pAdapt->cReceivedPacketCount = 0;
-        /* reset the value in case */
-        pAdapt->bIsReceivePacketQueueingDisabled = FALSE;
         ReturnPackets = TRUE;
     }
@@ -836 +834 @@
  * @return NONE
  */
-static VOID
-vboxNetFltWinPtQueueReceivedPacket(
+DECLHIDDEN(VOID) vboxNetFltWinPtQueueReceivedPacket(
     IN PADAPT       pAdapt,
     IN PNDIS_PACKET Packet,
@@ -849 +846 @@
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
 
-    Assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
     do{
         RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
@@ -878 +874 @@
          */
 
-        if ((pAdapt->cReceivedPacketCount == MAX_RECEIVE_PACKET_ARRAY_SIZE) || DoIndicate || bReturn
-                || pAdapt->bIsReceivePacketQueueingDisabled)
+        if ((pAdapt->cReceivedPacketCount == MAX_RECEIVE_PACKET_ARRAY_SIZE) || DoIndicate || bReturn)
         {
             NdisMoveMemory(PacketArray,
@@ -894 +889 @@
             {
                 DoIndicate = TRUE;
-                pAdapt->bIsReceivePacketQueueingDisabled = TRUE;
             }
         }
@@ -904 +898 @@
         if(DoIndicate)
         {
-            /* the tcp stack can send ACK packets right in the context of its PtReceive for this packet,
-             * and those (tcp-sent) packets can be looped back again.
-             * If this happens there is a possibility that new RX packets are received by us
-             * after we do this NdisMIndicateReceivePacket and before we do a new NdisMIndicateReceivePacket
-             * for the looped back tcp-sent packet.
-             * If we queue those newly received packets and indicate them together with the looped back packet
-             * with the latter NdisMIndicateReceivePacket, we may end up tcp stack sending ACKs in the context of its PtReceive again.
-             * Thus this may lead to stack overflows on a heavy network loads.
-             * To prevent this we disable the RX packet queuing when we do NdisMIndicateReceivePacket here,
-             * thus if new packets arrive to us in another thread, we simply indicate them up instead of queuing them.
-             * */
-            Assert(pAdapt->bIsReceivePacketQueueingDisabled);
             NdisMIndicateReceivePacket(pAdapt->hMiniportHandle, PacketArray, NumberOfPackets);
-            RTSpinlockAcquireNoInts(pNetFlt->hSpinlock, &Tmp);
-            pAdapt->bIsReceivePacketQueueingDisabled = FALSE;
-            RTSpinlockReleaseNoInts(pNetFlt->hSpinlock, &Tmp);
         }
     }
@@ -1820 +1799 @@
             Assert(fAdaptActive);
 
-            pAdapt->bIndicateRcvComplete = TRUE;
-            switch (pAdapt->Medium)
-            {
-                case NdisMedium802_3:
-                case NdisMediumWan:
-                    NdisMEthIndicateReceive(pAdapt->hMiniportHandle,
-                                                 MacReceiveContext,
-                                                 (PCHAR)pHeaderBuffer,
-                                                 cbHeaderBuffer,
-                                                 pLookAheadBuffer,
-                                                 cbLookAheadBuffer,
-                                                 cbPacket);
-                    break;
-                default:
-                    Assert(FALSE);
-                    break;
+            {
+                ULONG Proc = KeGetCurrentProcessorNumber();
+                pAdapt->abIndicateRcvComplete[Proc] = TRUE;
+                switch (pAdapt->Medium)
+                {
+                    case NdisMedium802_3:
+                    case NdisMediumWan:
+                        NdisMEthIndicateReceive(pAdapt->hMiniportHandle,
+                                                     MacReceiveContext,
+                                                     (PCHAR)pHeaderBuffer,
+                                                     cbHeaderBuffer,
+                                                     pLookAheadBuffer,
+                                                     cbLookAheadBuffer,
+                                                     cbPacket);
+                        break;
+                    default:
+                        Assert(FALSE);
+                        break;
+                }
             }
         } while(0);
@@ -1882 +1864 @@
     bool bNetFltActive;
     bool fAdaptActive = vboxNetFltWinReferenceAdaptNetFlt(pNetFlt, pAdapt, &bNetFltActive);
+    ULONG Proc = KeGetCurrentProcessorNumber();
 
     vboxNetFltWinPtFlushReceiveQueue(pAdapt, false);
@@ -1887 +1870 @@
     if ((pAdapt->hMiniportHandle != NULL)
                /* && (pAdapt->MPDeviceState == NdisDeviceStateD0) */
-                && (pAdapt->bIndicateRcvComplete == TRUE))
+                && (pAdapt->abIndicateRcvComplete[Proc] == TRUE))
     {
         switch (pAdapt->Medium)
@@ -1901 +1884 @@
     }
 
-    pAdapt->bIndicateRcvComplete = FALSE;
+    pAdapt->abIndicateRcvComplete[Proc] = FALSE;
 
     if(fAdaptActive)

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

@@ -30 +30 @@
 DECLHIDDEN(NDIS_STATUS) vboxNetFltWinPtDoUnbinding(PADAPT pAdapt, bool bOnUnbind);
 DECLHIDDEN(VOID) vboxNetFltWinPtFlushReceiveQueue(IN PADAPT pAdapt, IN bool bReturn);
+DECLHIDDEN(VOID) vboxNetFltWinPtQueueReceivedPacket(IN PADAPT pAdapt, IN PNDIS_PACKET Packet, IN BOOLEAN DoIndicate);
 DECLHIDDEN(VOID) vboxNetFltWinPtRequestComplete(IN NDIS_HANDLE ProtocolBindingContext, IN PNDIS_REQUEST NdisRequest, IN NDIS_STATUS Status);
 DECLHIDDEN(bool) vboxNetFltWinPtCloseAdapter(PADAPT pAdapt, PNDIS_STATUS pStatus);