Changeset 40652 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 26, 2012 4:36:16 PM (13 years ago)

Author:

vboxsync

Message:

NetShaper,E1000: Basic framework and partial implementation for network shaper

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/DevE1000.cpp (modified) (8 diffs)
• Network/DrvNetShaper.cpp (added)
• build/VBoxDD.cpp (modified) (1 diff)
• build/VBoxDD.h (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -391 +391 @@
  endif
 
+ ifdef VBOX_WITH_NETSHAPER
+  VBoxDD_DEFS           += VBOX_WITH_NETSHAPER
+  VBoxDD_SOURCES        += \
+        Network/DrvNetShaper.cpp
+ endif
+
  # --- Storage bits. ---
 

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -184 +184 @@
 
 #define STATUS_LU       0x00000002
+#define STATUS_TXOFF    0x00000010
 
 #define EECD_EE_WIRES 0x0F
@@ -3113 +3114 @@
         int rc = pDrv->pfnAllocBuf(pDrv, cbMin, fGso ? &pState->GsoCtx : NULL, &pSg);
         if (RT_FAILURE(rc))
+        {
+            /* Suspend TX as we are out of buffers atm */
+            STATUS |= STATUS_TXOFF;
             return rc;
+        }
     }
     else
@@ -3642 +3647 @@
  * @thread  E1000_TX
  */
-static void e1kXmitDesc(E1KSTATE* pState, E1KTXDESC* pDesc, RTGCPHYS addr, bool fOnWorkerThread)
-{
+static int e1kXmitDesc(E1KSTATE* pState, E1KTXDESC* pDesc, RTGCPHYS addr, bool fOnWorkerThread)
+{
+    int rc = VINF_SUCCESS;
     uint32_t cbVTag = 0;
 
@@ -3731 +3737 @@
                 E1kLog3(("%s About to allocate TX buffer: cbVTag=%u\n", INSTANCE(pState), cbVTag));
                 if (e1kCanDoGso(&pState->GsoCtx, &pDesc->data, &pState->contextTSE))
-                    e1kXmitAllocBuf(pState, pState->contextTSE.dw2.u20PAYLEN + pState->contextTSE.dw3.u8HDRLEN + cbVTag,
+                    rc = e1kXmitAllocBuf(pState, pState->contextTSE.dw2.u20PAYLEN + pState->contextTSE.dw3.u8HDRLEN + cbVTag,
                                     true /*fExactSize*/, true /*fGso*/);
+                else if (pDesc->data.cmd.fTSE)
+                    rc = e1kXmitAllocBuf(pState, pState->contextTSE.dw3.u16MSS + pState->contextTSE.dw3.u8HDRLEN + cbVTag,
+                                         pDesc->data.cmd.fTSE  /*fExactSize*/, false /*fGso*/);
                 else
-                    e1kXmitAllocBuf(pState, pState->contextTSE.dw3.u16MSS + pState->contextTSE.dw3.u8HDRLEN + cbVTag,
-                                    pDesc->data.cmd.fTSE  /*fExactSize*/, false /*fGso*/);
+                    rc = e1kXmitAllocBuf(pState, pDesc->data.cmd.u20DTALEN + cbVTag,
+                                         pDesc->data.cmd.fEOP  /*fExactSize*/, false /*fGso*/);
+
+                /**
+                 * @todo: Perhaps it is not that simple for GSO packets! We may
+                 * need to unwind some changes.
+                 */
+                if (RT_FAILURE(rc))
+                {
+                    STAM_PROFILE_ADV_STOP(&pState->CTX_SUFF_Z(StatTransmit), a);
+                    break;
+                }
                 /** @todo Is there any way to indicating errors other than collisions? Like
                  *        VERR_NET_DOWN. */
@@ -3825 +3844 @@
                 E1kLog3(("%s About to allocate TX buffer: cbVTag=%u\n", INSTANCE(pState), cbVTag));
                 /** @todo reset status bits? */
-                e1kXmitAllocBuf(pState, pDesc->legacy.cmd.u16Length + cbVTag, pDesc->legacy.cmd.fEOP, false /*fGso*/);
+                rc = e1kXmitAllocBuf(pState, pDesc->legacy.cmd.u16Length + cbVTag, pDesc->legacy.cmd.fEOP, false /*fGso*/);
+                if (RT_FAILURE(rc))
+                {
+                    STAM_PROFILE_ADV_STOP(&pState->CTX_SUFF_Z(StatTransmit), a);
+                    break;
+                }
+
                 /** @todo Is there any way to indicating errors other than collisions? Like
                  *        VERR_NET_DOWN. */
@@ -3861 +3886 @@
             break;
     }
+
+    return rc;
 }
 
@@ -3900 +3927 @@
 
             e1kLoadDesc(pState, &desc, ((uint64_t)TDBAH << 32) + TDBAL + TDH * sizeof(desc));
-            e1kXmitDesc(pState, &desc, ((uint64_t)TDBAH << 32) + TDBAL + TDH * sizeof(desc), fOnWorkerThread);
+            rc = e1kXmitDesc(pState, &desc, ((uint64_t)TDBAH << 32) + TDBAL + TDH * sizeof(desc), fOnWorkerThread);
+            /* If we failed to transmit descriptor we will try it again later */
+            if (RT_FAILURE(rc))
+                break;
             if (++TDH * sizeof(desc) >= TDLEN)
                 TDH = 0;
@@ -3935 +3965 @@
 {
     E1KSTATE *pState = RT_FROM_MEMBER(pInterface, E1KSTATE, INetworkDown);
+    /* Resume suspended transmission */
+    STATUS &= ~STATUS_TXOFF;
     e1kXmitPending(pState, true /*fOnWorkerThread*/);
 }

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -257 +257 @@
     if (RT_FAILURE(rc))
         return rc;
+#ifdef VBOX_WITH_NETSHAPER
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvNetShaper);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif /* VBOX_WITH_NETSHAPER */
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvAUDIO);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -111 +111 @@
 extern const PDMDRVREG g_DrvDedicatedNic;
 extern const PDMDRVREG g_DrvNAT;
+#ifdef VBOX_WITH_NETSHAPER
+extern const PDMDRVREG g_DrvNetShaper;
+#endif /* VBOX_WITH_NETSHAPER */
 extern const PDMDRVREG g_DrvNetSniffer;
 extern const PDMDRVREG g_DrvAUDIO;