[PATCH v3] mbuf: fix packet copy

[Morten Brørup]

mbuf: fix packet copy

Requests for copying the at the end of a packet incorrectly returned NULL,
as if copying past the end of a packet.

When allocating the mbuf for the copy from a mempool using pinned external
buffers, the external flag in this mbuf was not preserved.

Fixes: c3a90c381daa ("mbuf: add a copy routine")

Signed-off-by: Morten Brørup <mb at smartsharesystems.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev at huawei.com>
---
v3:
* Improved comment about flags being copied from newly allocated mbuf.
* Added test cases for copying at and past end of packet. (Stephen)
v2:
* Improved comment about preserving flags for newly allocated mbuf
  potentially using pinned external buffer.
* Added missing spaces in expression. (Stephen)
---
 app/test/test_mbuf.c | 20 ++++++++++++++++++++
 lib/mbuf/rte_mbuf.c  | 10 +++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index 17be977f31..19b49cec12 100644
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -541,6 +541,26 @@ test_pktmbuf_copy(struct rte_mempool *pktmbuf_pool,
 
 	rte_pktmbuf_free(copy2);
 
+	/* test offset copy at the end */
+	copy2 = rte_pktmbuf_copy(copy, pktmbuf_pool,
+				 2 * sizeof(uint32_t), UINT32_MAX);
+	if (copy2 == NULL)
+		GOTO_FAIL("cannot copy at the end of the copy\n");
+
+	if (rte_pktmbuf_pkt_len(copy2) != 0)
+		GOTO_FAIL("copy at the end, length incorrect\n");
+
+	if (rte_pktmbuf_data_len(copy2) != 0)
+		GOTO_FAIL("copy at the end, data length incorrect\n");
+
+	rte_pktmbuf_free(copy2);
+
+	/* test offset copy past the end */
+	copy2 = rte_pktmbuf_copy(copy, pktmbuf_pool,
+				 2 * sizeof(uint32_t) + 1, UINT32_MAX);
+	if (copy2 != NULL)
+		GOTO_FAIL("can copy past the end of the copy\n");
+
 	/* test truncation copy */
 	copy2 = rte_pktmbuf_copy(copy, pktmbuf_pool,
 				 0, sizeof(uint32_t));
diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
index 0d931c7a15..a5d16e4c97 100644
--- a/lib/mbuf/rte_mbuf.c
+++ b/lib/mbuf/rte_mbuf.c
@@ -675,7 +675,7 @@ rte_pktmbuf_copy(const struct rte_mbuf *m, struct rte_mempool *mp,
 	__rte_mbuf_sanity_check(m, 1);
 
 	/* check for request to copy at offset past end of mbuf */
-	if (unlikely(off >= m->pkt_len))
+	if (unlikely(off > m->pkt_len))
 		return NULL;
 
 	mc = rte_pktmbuf_alloc(mp);
@@ -688,8 +688,12 @@ rte_pktmbuf_copy(const struct rte_mbuf *m, struct rte_mempool *mp,
 
 	__rte_pktmbuf_copy_hdr(mc, m);
 
-	/* copied mbuf is not indirect or external */
-	mc->ol_flags = m->ol_flags & ~(RTE_MBUF_F_INDIRECT|RTE_MBUF_F_EXTERNAL);
+	/*
+	 * copy flags except indirect and external,
+	 * while preserving flags of newly allocated mbuf
+	 * (specifically RTE_MBUF_F_EXTERNAL if using pinned external buffer)
+	 */
+	mc->ol_flags |= m->ol_flags & ~(RTE_MBUF_F_INDIRECT | RTE_MBUF_F_EXTERNAL);
 
 	prev = &mc->next;
 	m_last = mc;
-- 
2.43.0