Changeset 28153 in vbox for trunk/include/VBox

Timestamp:

Apr 9, 2010 5:58:51 PM (15 years ago)

Author:

vboxsync

Message:

VBoxNetFlt-linux: Receive GSO frames from the host, save calls into SrvIntNet as well as ring-0 <-> ring-3 context switches on the DrvIntNet receive thread.

File:

• trunk/include/VBox/pdmnetinline.h (modified) (8 diffs)

trunk/include/VBox/pdmnetinline.h

@@ -4 +4 @@
  *
  * This is all inlined because it's too tedious to create 2-3 libraries to
- * contain it all (same bad excuse as for intnetinline.h).  C++ only because of
- * mixed code and variables.
+ * contain it all (same bad excuse as for intnetinline.h).
  */
 
@@ -48 +47 @@
 DECLINLINE(bool) PDMNetGsoIsValid(PCPDMNETWORKGSO pGso, size_t cbGsoMax, size_t cbFrame)
 {
+    PDMNETWORKGSOTYPE enmType;
+
     if (RT_UNLIKELY(cbGsoMax < sizeof(*pGso)))
         return false;
 
-    PDMNETWORKGSOTYPE const enmType = (PDMNETWORKGSOTYPE)pGso->u8Type;
+    enmType = (PDMNETWORKGSOTYPE)pGso->u8Type;
     if (RT_UNLIKELY( enmType <= PDMNETWORKGSOTYPE_INVALID || enmType >= PDMNETWORKGSOTYPE_END ))
         return false;
@@ -127 +128 @@
 DECLINLINE(uint32_t) PDMNetGsoCalcSegmentCount(PCPDMNETWORKGSO pGso, size_t cbFrame)
 {
+    size_t cbPayload;
     Assert(PDMNetGsoIsValid(pGso, sizeof(*pGso), cbFrame));
-    size_t cbPayload = cbFrame - pGso->cbHdrs;
+    cbPayload = cbFrame - pGso->cbHdrs;
     return (uint32_t)((cbPayload + pGso->cbMaxSeg - 1) / pGso->cbMaxSeg);
 }
@@ -266 +268 @@
 {
     /*
-     * Check assumptions.
-     */
-    Assert(iSeg < cSegs);
-    Assert(cSegs == PDMNetGsoCalcSegmentCount(pGso, cbFrame));
-    Assert(PDMNetGsoIsValid(pGso, sizeof(*pGso), cbFrame));
-
-    /*
      * Figure out where the payload is and where the header starts before we
      * do the protocol specific carving.
@@ -284 +279 @@
 
     /*
+     * Check assumptions (doing it after declaring the variables because of C).
+     */
+    Assert(iSeg < cSegs);
+    Assert(cSegs == PDMNetGsoCalcSegmentCount(pGso, cbFrame));
+    Assert(PDMNetGsoIsValid(pGso, sizeof(*pGso), cbFrame));
+
+    /*
      * Copy the header and do the protocol specific massaging of it.
      */
@@ -332 +334 @@
     }
 
-    *pcbSegFrame = cbSegPayload + pGso->cbHdrs;
+    *pcbSegFrame = cbSegFrame;
     return pbSegHdrs;
 }
@@ -364 +366 @@
 {
     /*
-     * Check assumptions.
-     */
-    Assert(iSeg < cSegs);
-    Assert(cSegs == PDMNetGsoCalcSegmentCount(pGso, cbFrame));
-    Assert(PDMNetGsoIsValid(pGso, sizeof(*pGso), cbFrame));
-
-    /*
      * Figure out where the payload is and where the header starts before we
      * do the protocol specific carving.
@@ -378 +373 @@
                                        ? pGso->cbMaxSeg
                                        : (uint32_t)(cbFrame - iSeg * pGso->cbMaxSeg - pGso->cbHdrs);
+
+    /*
+     * Check assumptions (doing it after declaring the variables because of C).
+     */
+    Assert(iSeg < cSegs);
+    Assert(cSegs == PDMNetGsoCalcSegmentCount(pGso, cbFrame));
+    Assert(PDMNetGsoIsValid(pGso, sizeof(*pGso), cbFrame));
 
     /*