[ovs-dev] [RFC v5 5/8] dp-packet: copy mbuf info for packet copy

Tiago Lam tiago.lam at intel.com
Tue May 1 17:02:11 UTC 2018


From: Michael Qiu <qiudayu at chinac.com>

Currently, when doing packet copy, lots of DPDK mbuf's info
will be missed, like packet type, ol_flags, etc.
Those information is very important for DPDK to do
packets processing.

Co-authored-by: Mark Kavanagh <mark.b.kavanagh at intel.com>
[mark.b.kavanagh at intel.com rebased]
Co-authored-by: Tiago Lam <tiago.lam at intel.com>

Signed-off-by: Michael Qiu <qiudayu at chinac.com>
Signed-off-by: Mark Kavanagh <mark.b.kavanagh at intel.com>
Signed-off-by: Tiago Lam <tiago.lam at intel.com>
---
 lib/dp-packet.c   | 25 +++++++++++++++++++------
 lib/dp-packet.h   |  3 +++
 lib/netdev-dpdk.c |  1 +
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/lib/dp-packet.c b/lib/dp-packet.c
index fd9fad0..a2793f7 100644
--- a/lib/dp-packet.c
+++ b/lib/dp-packet.c
@@ -48,6 +48,22 @@ dp_packet_use__(struct dp_packet *b, void *base, size_t allocated,
     dp_packet_init__(b, allocated, source);
 }
 
+#ifdef DPDK_NETDEV
+void
+dp_packet_copy_mbuf_flags(struct dp_packet *dst, const struct dp_packet *src) {
+    ovs_assert(dst != NULL && src != NULL);
+    struct rte_mbuf *buf_dst = &(dst->mbuf);
+    struct rte_mbuf buf_src = src->mbuf;
+
+    buf_dst->nb_segs = buf_src.nb_segs;
+    buf_dst->ol_flags = buf_src.ol_flags;
+    buf_dst->packet_type = buf_src.packet_type;
+    buf_dst->tx_offload = buf_src.tx_offload;
+}
+#else
+#define dp_packet_copy_mbuf_flags(arg1, arg2)
+#endif
+
 /* Initializes 'b' as an empty dp_packet that contains the 'allocated' bytes of
  * memory starting at 'base'.  'base' should be the first byte of a region
  * obtained from malloc().  It will be freed (with free()) if 'b' is resized or
@@ -177,15 +193,12 @@ dp_packet_clone_with_headroom(const struct dp_packet *buffer, size_t headroom)
             offsetof(struct dp_packet, l2_pad_size));
 
 #ifdef DPDK_NETDEV
-    new_buffer->mbuf.ol_flags = buffer->mbuf.ol_flags;
-#else
-    new_buffer->rss_hash_valid = buffer->rss_hash_valid;
-#endif
-
+    dp_packet_copy_mbuf_flags(new_buffer, buffer);
     if (dp_packet_rss_valid(new_buffer)) {
-#ifdef DPDK_NETDEV
         new_buffer->mbuf.hash.rss = buffer->mbuf.hash.rss;
 #else
+    new_buffer->rss_hash_valid = buffer->rss_hash_valid;
+    if (dp_packet_rss_valid(new_buffer)) {
         new_buffer->rss_hash = buffer->rss_hash;
 #endif
     }
diff --git a/lib/dp-packet.h b/lib/dp-packet.h
index 93b0aaf..4607699 100644
--- a/lib/dp-packet.h
+++ b/lib/dp-packet.h
@@ -119,6 +119,9 @@ void dp_packet_init_dpdk(struct dp_packet *, size_t allocated);
 void dp_packet_init(struct dp_packet *, size_t);
 void dp_packet_uninit(struct dp_packet *);
 
+void dp_packet_copy_mbuf_flags(struct dp_packet *dst,
+                               const struct dp_packet *src);
+
 struct dp_packet *dp_packet_new(size_t);
 struct dp_packet *dp_packet_new_with_headroom(size_t, size_t headroom);
 struct dp_packet *dp_packet_clone(const struct dp_packet *);
diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
index 7008492..c9de742 100644
--- a/lib/netdev-dpdk.c
+++ b/lib/netdev-dpdk.c
@@ -2149,6 +2149,7 @@ dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch)
         memcpy(rte_pktmbuf_mtod(pkts[txcnt], void *),
                dp_packet_data(packet), size);
         dp_packet_set_size((struct dp_packet *)pkts[txcnt], size);
+        dp_packet_copy_mbuf_flags((struct dp_packet *)pkts[txcnt], packet);
 
         txcnt++;
     }
-- 
2.7.4



More information about the dev mailing list