Assign correct data length to each segments according
to the given pkt_len and nb_pkt_segs, instead of
using pkt_len as the data_len of every packet segment
Fixes: a9c9e9698d5e ("app/test: allow to create packets of different sizes")
Cc: [email protected]
Signed-off-by: Zhuobin Huang <[email protected]>
---
.mailmap | 1 +
app/test/packet_burst_generator.c | 18 ++++++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/.mailmap b/.mailmap
index a9f4f28fba..9128fde9c5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1576,6 +1576,7 @@ Zhipeng Lu <[email protected]>
Zhirun Yan <[email protected]>
Zhiwei He <[email protected]>
Zhiyong Yang <[email protected]>
+Zhuobin Huang <[email protected]>
Zi Hu <[email protected]>
Zijie Pan <[email protected]>
Ziyang Xuan <[email protected]>
diff --git a/app/test/packet_burst_generator.c
b/app/test/packet_burst_generator.c
index 6b42b9b83b..898b717073 100644
--- a/app/test/packet_burst_generator.c
+++ b/app/test/packet_burst_generator.c
@@ -269,6 +269,8 @@ generate_packet_burst(struct rte_mempool *mp, struct
rte_mbuf **pkts_burst,
struct rte_mbuf *pkt_seg;
struct rte_mbuf *pkt;
+ const uint8_t pkt_seg_data_len = pkt_len / nb_pkt_segs;
+
for (nb_pkt = 0; nb_pkt < nb_pkt_per_burst; nb_pkt++) {
pkt = rte_pktmbuf_alloc(mp);
if (pkt == NULL) {
@@ -278,7 +280,7 @@ generate_packet_burst(struct rte_mempool *mp, struct
rte_mbuf **pkts_burst,
break;
}
- pkt->data_len = pkt_len;
+ pkt->data_len = pkt_seg_data_len;
pkt_seg = pkt;
for (i = 1; i < nb_pkt_segs; i++) {
pkt_seg->next = rte_pktmbuf_alloc(mp);
@@ -288,7 +290,10 @@ generate_packet_burst(struct rte_mempool *mp, struct
rte_mbuf **pkts_burst,
goto nomore_mbuf;
}
pkt_seg = pkt_seg->next;
- pkt_seg->data_len = pkt_len;
+ if (i != nb_pkt_segs - 1)
+ pkt_seg->data_len = pkt_seg_data_len;
+ else
+ pkt_seg->data_len = pkt_seg_data_len + pkt_len
% nb_pkt_segs;
}
pkt_seg->next = NULL; /* Last segment of packet. */
@@ -350,6 +355,8 @@ generate_packet_burst_proto(struct rte_mempool *mp,
struct rte_mbuf *pkt_seg;
struct rte_mbuf *pkt;
+ const uint8_t pkt_seg_data_len = pkt_len / nb_pkt_segs;
+
for (nb_pkt = 0; nb_pkt < nb_pkt_per_burst; nb_pkt++) {
pkt = rte_pktmbuf_alloc(mp);
if (pkt == NULL) {
@@ -359,7 +366,7 @@ generate_packet_burst_proto(struct rte_mempool *mp,
break;
}
- pkt->data_len = pkt_len;
+ pkt->data_len = pkt_seg_data_len;
pkt_seg = pkt;
for (i = 1; i < nb_pkt_segs; i++) {
pkt_seg->next = rte_pktmbuf_alloc(mp);
@@ -369,7 +376,10 @@ generate_packet_burst_proto(struct rte_mempool *mp,
goto nomore_mbuf;
}
pkt_seg = pkt_seg->next;
- pkt_seg->data_len = pkt_len;
+ if (i != nb_pkt_segs - 1)
+ pkt_seg->data_len = pkt_seg_data_len;
+ else
+ pkt_seg->data_len = pkt_seg_data_len + pkt_len
% nb_pkt_segs;
}
pkt_seg->next = NULL; /* Last segment of packet. */
--
2.34.1
