@@ -175,6 +175,49 @@ 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 *buffer,
+ size_t headroom) {
+ struct dp_packet *new_buffer;
+ uint32_t pkt_len = dp_packet_size(buffer);
+
+ /* copy multi-seg data */
+ if (buffer->source == DPBUF_DPDK && buffer->mbuf.nb_segs > 1) {
+ uint32_t offset = 0;
+ void *dst = NULL;
+ struct rte_mbuf *tmbuf = CONST_CAST(struct rte_mbuf *,
+ &(buffer->mbuf));
+
+ new_buffer = dp_packet_new_with_headroom(pkt_len, headroom);
+ dp_packet_set_size(new_buffer, pkt_len + headroom);
+ dst = dp_packet_tail(new_buffer);
+
+ while (tmbuf) {
+ rte_memcpy((char *)dst + offset,
+ rte_pktmbuf_mtod(tmbuf, void *), tmbuf->data_len);
+ offset += tmbuf->data_len;
+ tmbuf = tmbuf->next;
+ }
+ } else {
+ new_buffer = dp_packet_clone_data_with_headroom(dp_packet_data(buffer),
+ pkt_len, 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));
+
+ dp_packet_copy_mbuf_flags(new_buffer, buffer);
+ if (dp_packet_rss_valid(new_buffer)) {
+ new_buffer->mbuf.hash.rss = buffer->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. */
@@ -182,29 +225,25 @@ struct dp_packet *
dp_packet_clone_with_headroom(const struct dp_packet *buffer, size_t headroom)
{
struct dp_packet *new_buffer;
+ 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);
+ pkt_len, 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));
-#ifdef DPDK_NETDEV
- dp_packet_copy_mbuf_flags(new_buffer, buffer);
- if (dp_packet_rss_valid(new_buffer)) {
- 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
}
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. */