@@ -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
}
@@ -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 *);
@@ -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++;
}