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

Timestamp:

Feb 12, 2016 12:29:58 PM (9 years ago)

Author:

vboxsync

Message:

NetLwf/Win(bugref:8246): Support jumbo frames over 2 KB

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp (modified) (7 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp

@@ -17 +17 @@
 
 //#define VBOXNETLWF_SYNC_SEND
+/* Payload + Ethernet header + VLAN tag = Max Ethernet frame size */
+#define VBOXNETLWF_MAX_FRAME_SIZE(mtu) (mtu +  sizeof(RTNETETHERHDR) + 4)
 
 #include <VBox/version.h>
@@ -193 +195 @@
     /** MAC address of underlying adapter */
     RTMAC MacAddr;
+    /** Saved MTU size */
+    ULONG uMtuSize;
     /** Saved offload configuration */
     NDIS_OFFLOAD SavedOffloadConfig;
@@ -834 +838 @@
     pModuleCtx->cPendingBuffers = 0;
 #endif /* !VBOXNETLWF_SYNC_SEND */
-    /* Allocate buffer pools */
-    NET_BUFFER_LIST_POOL_PARAMETERS PoolParams;
-    NdisZeroMemory(&PoolParams, sizeof(PoolParams));
-    PoolParams.Header.Type = NDIS_OBJECT_TYPE_DEFAULT;
-    PoolParams.Header.Revision = NET_BUFFER_LIST_POOL_PARAMETERS_REVISION_1;
-    PoolParams.Header.Size = sizeof(PoolParams);
-    PoolParams.ProtocolId = NDIS_PROTOCOL_ID_DEFAULT;
-    PoolParams.fAllocateNetBuffer = TRUE;
-    PoolParams.ContextSize = 0; /** @todo Do we need to consider underlying drivers? I think not. */
-    PoolParams.PoolTag = VBOXNETLWF_MEM_TAG;
-#ifndef VBOXNETLWF_SYNC_SEND
-    PoolParams.DataSize = 2048; /** @todo figure out the optimal size, use several pools if necessary, make configurable, etc */
-#endif /* !VBOXNETLWF_SYNC_SEND */
-
-    pModuleCtx->hPool = NdisAllocateNetBufferListPool(hFilter, &PoolParams);
-    if (!pModuleCtx->hPool)
-    {
-        LogError(("vboxNetLwfWinAttach: NdisAllocateNetBufferListPool failed\n"));
-        NdisFreeIoWorkItem(pModuleCtx->hWorkItem);
-        NdisFreeMemory(pModuleCtx, 0, 0);
-        return NDIS_STATUS_RESOURCES;
-    }
-    Log4(("vboxNetLwfWinAttach: allocated NBL+NB pool 0x%p\n", pModuleCtx->hPool));
 
     NDIS_FILTER_ATTRIBUTES Attributes;
@@ -970 +951 @@
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Restarting, LwfState_Paused);
 
-    vboxNetLwfWinChangeState(pModuleCtx, LwfState_Running, LwfState_Restarting);
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
+    ULONG uNewMtuSize = 1500; /* If we fail to find out MTU, we can always assume 1500. */
+    PNDIS_RESTART_ATTRIBUTES pAttributes = pParameters->RestartAttributes;
+    while (pAttributes && pAttributes->Oid != OID_GEN_MINIPORT_RESTART_ATTRIBUTES)
+        pAttributes = pAttributes->Next;
+    if (pAttributes)
+    {
+        PNDIS_RESTART_GENERAL_ATTRIBUTES pGenAttrs = (PNDIS_RESTART_GENERAL_ATTRIBUTES)pAttributes->Data;
+        uNewMtuSize = pGenAttrs->MtuSize;
+    }
+
+    /* Let's see if MTU has changed. Re-allocate the pool if it has. */
+    if (pModuleCtx->uMtuSize != uNewMtuSize)
+    {
+        pModuleCtx->uMtuSize = uNewMtuSize;
+        if (pModuleCtx->hPool)
+        {
+            /*
+             * Don't need to wait for pending sends to complete since we are already
+             * in paused state. Just free the old pool.
+             */
+            NdisFreeNetBufferListPool(pModuleCtx->hPool);
+            pModuleCtx->hPool = NULL;
+        }
+    }
+    if (!pModuleCtx->hPool)
+    {
+        /* Allocate a new pool. */
+        NET_BUFFER_LIST_POOL_PARAMETERS PoolParams;
+        NdisZeroMemory(&PoolParams, sizeof(PoolParams));
+        PoolParams.Header.Type = NDIS_OBJECT_TYPE_DEFAULT;
+        PoolParams.Header.Revision = NET_BUFFER_LIST_POOL_PARAMETERS_REVISION_1;
+        PoolParams.Header.Size = sizeof(PoolParams);
+        PoolParams.ProtocolId = NDIS_PROTOCOL_ID_DEFAULT;
+        PoolParams.fAllocateNetBuffer = TRUE;
+        PoolParams.ContextSize = 0; /** @todo Do we need to consider underlying drivers? I think not. */
+        PoolParams.PoolTag = VBOXNETLWF_MEM_TAG;
+#ifndef VBOXNETLWF_SYNC_SEND
+        PoolParams.DataSize = VBOXNETLWF_MAX_FRAME_SIZE(pModuleCtx->uMtuSize);
+#endif /* !VBOXNETLWF_SYNC_SEND */
+
+        pModuleCtx->hPool = NdisAllocateNetBufferListPool(pModuleCtx->hFilter, &PoolParams);
+        if (!pModuleCtx->hPool)
+        {
+            LogError(("vboxNetLwfWinRestart: NdisAllocateNetBufferListPool failed\n"));
+            Status = NDIS_STATUS_RESOURCES;
+        }
+        else
+        {
+            Log4(("vboxNetLwfWinRestart: allocated NBL+NB pool 0x%p with MTU=%u\n",
+                  pModuleCtx->hPool, pModuleCtx->uMtuSize));
+        }
+    }
+
+    vboxNetLwfWinChangeState(pModuleCtx, Status == NDIS_STATUS_SUCCESS ? LwfState_Running : LwfState_Paused, LwfState_Restarting);
     LogFlow(("<==vboxNetLwfWinRestart: Status = 0x%x\n", Status));
     return Status;
@@ -1022 +1056 @@
     uint16_t uEthType = RT_N2H_U16(*(uint16_t*)(pHdr+12));
     Log2(("NetLWF: %s (%d bytes), %RTmac => %RTmac, EthType=%s(0x%x)\n",
-          cszText, cb, pHdr+6, pHdr, vboxNetLwfWinEthTypeStr(uEthType), uEthType));
+          cszText, pSG->cbTotal, pHdr+6, pHdr, vboxNetLwfWinEthTypeStr(uEthType), uEthType));
     pHdr += sizeof(RTNETETHERHDR);
     if (uEthType == RTNET_ETHERTYPE_VLAN)
@@ -1169 +1203 @@
 {
     AssertReturn(pSG->cSegsUsed >= 1, NULL);
-    LogFlow(("==>vboxNetLwfWinSGtoNB: segments=%d\n", pSG->cSegsUsed));
+    LogFlow(("==>vboxNetLwfWinSGtoNB: segments=%d hPool=%p cb=%u max=%u\n", pSG->cSegsUsed,
+             pModule->hPool, pSG->cbTotal, VBOXNETLWF_MAX_FRAME_SIZE(pModule->uMtuSize)));
+    AssertReturn(pModule->hPool, NULL);
 
 #ifdef VBOXNETLWF_SYNC_SEND
@@ -1214 +1250 @@
     }
 #else /* !VBOXNETLWF_SYNC_SEND */
-    AssertReturn(pSG->cbTotal < 2048, NULL);
+    AssertReturn(pSG->cbTotal <= VBOXNETLWF_MAX_FRAME_SIZE(pModule->uMtuSize), NULL); 
     PNET_BUFFER_LIST pBufList = NdisAllocateNetBufferList(pModule->hPool,
                                                           0 /** @todo ContextSize */,