Changeset 27973 in vbox

Timestamp:

Apr 4, 2010 12:33:03 AM (15 years ago)

Author:

vboxsync

Message:

PDM,Network/*: GSO preps.

Location:

trunk

Files:

• include/VBox/pdmnetifs.h (modified) (6 diffs)
• include/VBox/types.h (modified) (1 diff)
• src/VBox/Devices/Network/DevPCNet.cpp (modified) (1 diff)
• src/VBox/Devices/Network/DevVirtioNet.cpp (modified) (1 diff)
• src/VBox/Devices/Network/DrvIntNet.cpp (modified) (1 diff)
• src/VBox/Devices/Network/DrvNAT.cpp (modified) (2 diffs)
• src/VBox/Devices/Network/DrvNetSniffer.cpp (modified) (2 diffs)

trunk/include/VBox/pdmnetifs.h

@@ -86 +86 @@
 /** Owner mask. */
 #define PDMSCATTERGATHER_FLAGS_OWNER_MASK   UINT32_C(0x00000003)
+/** Mask of flags available to general use.
+ * The parties using the SG must all agree upon how to use these of course. */
+#define PDMSCATTERGATHER_FLAGS_AVL_MASK     UINT32_C(0x0000f000)
+/** Flags reserved for future use, MBZ. */
+#define PDMSCATTERGATHER_FLAGS_RVD_MASK     UINT32_C(0x00000ff8)
 /** @} */
 
@@ -135 +140 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnReceive,(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb));
-
 
     /**
@@ -145 +149 @@
      *
      * @param   pInterface      Pointer to this interface.
-     * @param   pSgBuf          Scatter/gather buffer of the size previously
-     *                          requested.  Pass to PDMINETWORKUP::pfnSendBuf or
-     *                          PDMINETWORKUP::pfnFreeBuf.
-     *
      * @thread  Non-EMT.
      */
@@ -195 +195 @@
      *          but there could of course be races.
      *
-     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+     * @param   pInterface      Pointer to the interface structure containing the
+     *                          called function pointer.
      * @param   cbMin           The minimum buffer size.
+     * @param   pGso            Pointer to a GSO context (only reference while in
+     *                          this call).  NULL indicates no segmentation
+     *                          offloading.  PDMSCATTERGATHER::pvUser is used to
+     *                          indicate that a network SG uses GSO, usually by
+     *                          pointing to a copy of @a pGso.
      * @param   ppSgBuf         Where to return the buffer.  The buffer will be
      *                          owned by the caller, designation owner number 1.
@@ -202 +208 @@
      * @thread  Any, but normally EMT.
      */
-    DECLR3CALLBACKMEMBER(int, pfnAllocBuf,(PPDMINETWORKUP pInterface, size_t cbMin, PPPDMSCATTERGATHER ppSgBuf));
+    DECLR3CALLBACKMEMBER(int, pfnAllocBuf,(PPDMINETWORKUP pInterface, size_t cbMin, PCPDMNETWORKGSO pGso,
+                                           PPPDMSCATTERGATHER ppSgBuf));
 
     /**
@@ -278 +285 @@
 } PDMINETWORKUP;
 /** PDMINETWORKUP interface ID. */
-#define PDMINETWORKUP_IID                       "f915243e-801a-4868-8979-b6b8594b09cc"
+#define PDMINETWORKUP_IID                       "0e603bc1-3016-41b4-b521-15c038cda16a"
 
 

trunk/include/VBox/types.h

@@ -738 +738 @@
 
 /**
+ * Forms of generic segment offloading.
+ */
+typedef enum PDMNETWORKGSOTYPE
+{
+    /** Invalid zero value. */
+    PDMNETWORKGSOTYPE_INVALID = 0,
+    /** TCP/IPv4. */
+    PDMNETWORKGSOTYPE_IPV4_TCP,
+#if 0 /* later */
+    /** TCP/IPv6. */
+    PDMNETWORKGSOTYPE_IPV6_TCP,
+    /** UDP/IPv4. */
+    PDMNETWORKGSOTYPE_IPV4_UDP,
+    /** UDP/IPv6. */
+    PDMNETWORKGSOTYPE_IPV6_UDP,
+    /** IPv6 over IPv4 tunneling. */
+    PDMNETWORKGSOTYPE_IPV4_TCPV6,
+    /** TCP/IPv6 over IPv4 tunneling.
+     * The header offsets and sizes relates to IPv4 and TCP, the IPv6 header is
+     * figured out as needed.
+     * @todo Needs checking against facts, this is just an outline of the idea. */
+    PDMNETWORKGSOTYPE_IPV4_TCPV6_TCP,
+    /** UDP/IPv6 over IPv4 tunneling.
+     * The header offsets and sizes relates to IPv4 and UDP, the IPv6 header is
+     * figured out as needed.
+     * @todo Needs checking against facts, this is just an outline of the idea. */
+    PDMNETWORKGSOTYPE_IPV4_TCPV6_UDP,
+#endif
+    /** The end of valid GSO types. */
+    PDMNETWORKGSOTYPE_END
+} PDMNETWORKGSOTYPE;
+
+
+/**
+ * Generic segment offloading context.
+ *
+ * We generally follow the E1000 specs wrt to which header fields we change.
+ * However the GSO type implies where the checksum fields are and that they are
+ * always updated from scratch (no half done pseudo checksums).
+ *
+ * @remarks This is part of the internal network GSO packets.  Take great care
+ *          when making changes.  The size is expected to be exactly 8 bytes.
+ */
+typedef struct PDMNETWORKGSO
+{
+    /** The type of segmentation offloading we're performing (PDMNETWORKGSOTYPE). */
+    uint8_t             u8Type;
+    /** The total header size. */
+    uint8_t             cbHdrs;
+    /** The max segment size (MSS) to apply. */
+    uint16_t            cbMaxSeg;
+
+    /** Offset of the first header (IPv4 / IPv6). */
+    uint8_t             offHdr1;
+    /** The size of the first header (IPv4 / IPv6). */
+    uint8_t             cbHdr1;
+
+    /** Offset of the second header (TCP / UDP). */
+    uint8_t             offHdr2;
+    /** The size of the second header (TCP / UDP). */
+    uint8_t             cbHdr2;
+} PDMNETWORKGSO;
+/** Pointer to a GSO context. */
+typedef PDMNETWORKGSO *PPDMNETWORKGSO;
+/** Pointer to a const GSO context. */
+typedef PDMNETWORKGSO const *PCPDMNETWORKGSO;
+
+
+/**
  * The current ROM page protection.
  *

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

@@ -2110 +2110 @@
         if (RT_LIKELY(pDrv))
         {
-            rc = pDrv->pfnAllocBuf(pDrv, cbMin, ppSgBuf);
+            rc = pDrv->pfnAllocBuf(pDrv, cbMin, NULL /*pGso*/, ppSgBuf);
             AssertMsg(rc == VINF_SUCCESS || rc == VERR_TRY_AGAIN || rc == VERR_NET_DOWN || rc == VERR_NO_MEMORY, ("%Rrc\n", rc));
             if (RT_FAILURE(rc))

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

@@ -388 +388 @@
 
 #ifdef IN_RING3
+
 /**
  * Wakeup the RX thread.

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

@@ -190 +190 @@
  * @interface_method_impl{PDMINETWORKUP,pfnAllocBuf}
  */
-static DECLCALLBACK(int) drvR3IntNetUp_AllocBuf(PPDMINETWORKUP pInterface, size_t cbMin, PPPDMSCATTERGATHER ppSgBuf)
+static DECLCALLBACK(int) drvR3IntNetUp_AllocBuf(PPDMINETWORKUP pInterface, size_t cbMin,
+                                                PCPDMNETWORKGSO pGso,  PPPDMSCATTERGATHER ppSgBuf)
 {
     PDRVINTNET  pThis = RT_FROM_MEMBER(pInterface, DRVINTNET, INetworkUpR3);
     int         rc    = VINF_SUCCESS;
     Assert(cbMin < UINT32_MAX / 2);
+AssertReturn(!pGso, VERR_NOT_IMPLEMENTED); /** @todo GSO buffer allocation. */
 
     /*

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

@@ -417 +417 @@
  * @interface_method_impl{PDMINETWORKUP,pfnAllocBuf}
  */
-static DECLCALLBACK(int) drvNATNetworkUp_AllocBuf(PPDMINETWORKUP pInterface, size_t cbMin, PPPDMSCATTERGATHER ppSgBuf)
+static DECLCALLBACK(int) drvNATNetworkUp_AllocBuf(PPDMINETWORKUP pInterface, size_t cbMin,
+                                                  PCPDMNETWORKGSO pGso, PPPDMSCATTERGATHER ppSgBuf)
 {
     PDRVNAT pThis = RT_FROM_MEMBER(pInterface, DRVNAT, INetworkUp);
+AssertReturn(!pGso, VERR_NOT_IMPLEMENTED); /** @todo GSO buffer allocation. */
 
     /*
@@ -506 +508 @@
 {
     PPDMSCATTERGATHER pSgBuf;
-    int rc = drvNATNetworkUp_AllocBuf(pInterface, cb, &pSgBuf);
+    int rc = drvNATNetworkUp_AllocBuf(pInterface, cb, NULL /*pGso*/, &pSgBuf);
     if (RT_SUCCESS(rc))
     {

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

@@ -85 +85 @@
  * @interface_method_impl{PDMINETWORKUP,pfnAllocBuf}
  */
-static DECLCALLBACK(int) drvNetSnifferUp_AllocBuf(PPDMINETWORKUP pInterface, size_t cbMin, PPPDMSCATTERGATHER ppSgBuf)
+static DECLCALLBACK(int) drvNetSnifferUp_AllocBuf(PPDMINETWORKUP pInterface, size_t cbMin,
+                                                  PCPDMNETWORKGSO pGso, PPPDMSCATTERGATHER ppSgBuf)
 {
     PDRVNETSNIFFER pThis = RT_FROM_MEMBER(pInterface, DRVNETSNIFFER, INetworkUp);
     if (RT_UNLIKELY(!pThis->pIBelowNet))
         return VERR_NET_DOWN;
-    return pThis->pIBelowNet->pfnAllocBuf(pThis->pIBelowNet, cbMin, ppSgBuf);
+    return pThis->pIBelowNet->pfnAllocBuf(pThis->pIBelowNet, cbMin, pGso, ppSgBuf);
 }
 
@@ -117 +118 @@
     /* output to sniffer */
     RTCritSectEnter(&pThis->Lock);
+    /** @todo Deal with GSO here. */
     PcapFileFrame(pThis->File, pThis->StartNanoTS,
                   pSgBuf->aSegs[0].pvSeg,