@@ -179,6 +179,41 @@ dp_packet_clone(const struct dp_packet *buffer)
return dp_packet_clone_with_headroom(buffer, 0);
}
+#ifdef DPDK_NETDEV
+struct dp_packet *
+dp_packet_clone_with_headroom(const struct dp_packet *b, size_t headroom) {
+ struct dp_packet *new_buffer;
+ uint32_t pkt_len = dp_packet_size(b);
+
+ /* Copy multi-seg data. */
+ if (b->source == DPBUF_DPDK && !rte_pktmbuf_is_contiguous(&b->mbuf)) {
+ void *dst = NULL;
+ struct rte_mbuf *mbuf = CONST_CAST(struct rte_mbuf *, &b->mbuf);
+
+ new_buffer = dp_packet_new_with_headroom(pkt_len, headroom);
+ dst = dp_packet_data(new_buffer);
+ dp_packet_set_size(new_buffer, pkt_len);
+
+ if (!rte_pktmbuf_read(mbuf, 0, pkt_len, dst)) {
+ dp_packet_delete(new_buffer);
+ return NULL;
+ }
+ } else {
+ new_buffer = dp_packet_clone_data_with_headroom(dp_packet_data(b),
+ dp_packet_size(b),
+ headroom);
+ }
+
+ dp_packet_copy_common_members(new_buffer, b);
+
+ dp_packet_copy_mbuf_flags(new_buffer, b);
+ if (dp_packet_rss_valid(new_buffer)) {
+ new_buffer->mbuf.hash.rss = b->mbuf.hash.rss;
+ }
+
+ return new_buffer;
+}
+#else
/* Creates and returns a new dp_packet whose data are copied from 'buffer'.
* The returned dp_packet will additionally have 'headroom' bytes of
* headroom. */
@@ -187,22 +222,16 @@ dp_packet_clone_with_headroom(const struct dp_packet *buffer, size_t headroom)
{
struct dp_packet *new_buffer;
uint32_t mark;
+ uint32_t pkt_len = dp_packet_size(buffer);
new_buffer = dp_packet_clone_data_with_headroom(dp_packet_data(buffer),
- dp_packet_size(buffer),
- headroom);
- /* Copy the following fields into the returned buffer: l2_pad_size,
- * l2_5_ofs, l3_ofs, l4_ofs, cutlen, packet_type and md. */
- memcpy(&new_buffer->l2_pad_size, &buffer->l2_pad_size,
- sizeof(struct dp_packet) -
- offsetof(struct dp_packet, l2_pad_size));
+ pkt_len, headroom);
-#ifdef DPDK_NETDEV
- new_buffer->mbuf.ol_flags = buffer->mbuf.ol_flags;
-#endif
+ dp_packet_copy_comon_members(new_buffer, buffer);
- if (dp_packet_rss_valid(buffer)) {
- dp_packet_set_rss_hash(new_buffer, dp_packet_get_rss_hash(buffer));
+ new_buffer->rss_hash_valid = buffer->rss_hash_valid;
+ if (dp_packet_rss_valid(new_buffer)) {
+ new_buffer->rss_hash = buffer->rss_hash;
}
if (dp_packet_has_flow_mark(buffer, &mark)) {
dp_packet_set_flow_mark(new_buffer, mark);
@@ -210,6 +239,7 @@ dp_packet_clone_with_headroom(const struct dp_packet *buffer, size_t headroom)
return new_buffer;
}
+#endif
/* Creates and returns a new dp_packet that initially contains a copy of the
* 'size' bytes of data starting at 'data' with no headroom or tailroom. */
@@ -149,6 +149,10 @@ struct dp_packet *dp_packet_clone_data_with_headroom(const void *, size_t,
size_t headroom);
static inline void dp_packet_delete(struct dp_packet *);
+static inline void
+dp_packet_copy_common_members(struct dp_packet *new_b,
+ const struct dp_packet *b);
+
static inline void *dp_packet_at(const struct dp_packet *, size_t offset,
size_t size);
static inline void *dp_packet_at_assert(const struct dp_packet *,
@@ -159,6 +163,8 @@ dp_packet_mbuf_from_offset(const struct dp_packet *b, size_t *offset);
void
dp_packet_mbuf_write(struct rte_mbuf *mbuf, int16_t ofs, uint32_t len,
const void *data);
+static inline void
+dp_packet_copy_mbuf_flags(struct dp_packet *dst, const struct dp_packet *src);
#endif
static inline void *dp_packet_tail(const struct dp_packet *);
static inline void *dp_packet_end(const struct dp_packet *);
@@ -212,6 +218,17 @@ dp_packet_delete(struct dp_packet *b)
}
}
+/* Copies the following fields into the 'new_b', which represent the common
+ * fields between DPDK and non-DPDK packets: l2_pad_size, l2_5_ofs, l3_ofs,
+ * l4_ofs, cutlen, packet_type and md. */
+static inline void
+dp_packet_copy_common_members(struct dp_packet *new_b,
+ const struct dp_packet *b) {
+ memcpy(&new_b->l2_pad_size, &b->l2_pad_size,
+ sizeof(struct dp_packet) -
+ offsetof(struct dp_packet, l2_pad_size));
+}
+
/* If 'b' contains at least 'offset + size' bytes of data, returns a pointer to
* byte 'offset'. Otherwise, returns a null pointer. For DPDK packets, this
* means the 'offset' + 'size' must fall within the same mbuf (not necessarily
@@ -715,6 +732,18 @@ dp_packet_set_allocated(struct dp_packet *b, uint16_t s)
b->mbuf.buf_len = s;
}
+static inline 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;
+ const struct rte_mbuf *buf_src = &src->mbuf;
+
+ buf_dst->ol_flags = buf_src->ol_flags;
+ buf_dst->packet_type = buf_src->packet_type;
+ buf_dst->tx_offload = buf_src->tx_offload;
+}
+
/* Returns the RSS hash of the packet 'p'. Note that the returned value is
* correct only if 'dp_packet_rss_valid(p)' returns true */
static inline uint32_t
@@ -2472,6 +2472,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++;
}