diff mbox

[ovs-dev,3/5] lib/dp-packet: Fix data_len issue with multi-segments

Message ID 1493568934-3099-4-git-send-email-qdy220091330@gmail.com
State Superseded
Headers show

Commit Message

Michael Qiu April 30, 2017, 4:15 p.m. UTC 
From: Michael Qiu <qiudayu@chinac.com>

When a packet is from DPDK source, and it contains
multiple segments, data_len is not equal to the
packet size. This patch fix this issue.

Signed-off-by: Michael Qiu <qiudayu@chinac.com>
Signed-off-by: Marcin Ksiadz <marcinx.ksiadz@intel.com>
Signed-off-by: Mark Kavanagh <mark.b.kavanagh@intel.com>
Signed-off-by: Przemyslaw Lal <przemyslawx.lal@intel.com>
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
---
 lib/dp-packet.h | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)
diff mbox

Patch

diff --git a/lib/dp-packet.h b/lib/dp-packet.h
index 7c1e637..e32f157 100644
--- a/lib/dp-packet.h
+++ b/lib/dp-packet.h
@@ -24,6 +24,10 @@ 
 #include "util.h"
 #include "netdev-dpdk.h"
 
+#ifdef DPDK_NETDEV
+#include "rte_ether.h"
+#endif
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -409,17 +413,19 @@  dp_packet_size(const struct dp_packet *b)
 static inline void
 dp_packet_set_size(struct dp_packet *b, uint32_t v)
 {
-    /* netdev-dpdk does not currently support segmentation; consequently, for
-     * all intents and purposes, 'data_len' (16 bit) and 'pkt_len' (32 bit) may
-     * be used interchangably.
-     *
-     * On the datapath, it is expected that the size of packets
-     * (and thus 'v') will always be <= UINT16_MAX; this means that there is no
-     * loss of accuracy in assigning 'v' to 'data_len'.
+    /*
+     * Assign current segment length. If total length is greater than
+     * max data length in a segment, additional calculation is needed
      */
-    b->mbuf.data_len = (uint16_t)v;  /* Current seg length. */
-    b->mbuf.pkt_len = v;             /* Total length of all segments linked to
-                                      * this segment. */
+    if (v > (b->mbuf.buf_len - b->mbuf.data_off)) {
+        b->mbuf.data_len =
+            (uint16_t) (b->mbuf.buf_len - b->mbuf.data_off);
+    } else {
+        b->mbuf.data_len = (uint16_t) v;
+    }
+
+    /* Total length of all segments linked to this segment. */
+    b->mbuf.pkt_len = v;
 }
 
 static inline uint16_t