From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 119E2427EF for ; Wed, 22 Mar 2023 11:32:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0DA6341148; Wed, 22 Mar 2023 11:32:28 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id E3B4A40A84 for ; Wed, 22 Mar 2023 11:32:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679481145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ojpkKZ8M8SLcLEXhdalzc8PE/lr2IB2B1LYWHM17stI=; b=H7cosUjNXBuF4AlqoL81+ghd/G/owo6HDJ01OJhLEl+uQgTf2s7MOmHebcpTTSKwh4Fcd3 C2olyXGev2TZJ+gILbFZfqwEGFibzyHXzdNSYMpKyotVzscHXspyzjpiIBzt4n5K9LF7OU Q9FUDsDYDXA4Lf8F6IYomhkWpuxuz2M= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-655-BgSOVD0SPN2Q0nmEnM0WMQ-1; Wed, 22 Mar 2023 06:32:22 -0400 X-MC-Unique: BgSOVD0SPN2Q0nmEnM0WMQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 09D60101A550; Wed, 22 Mar 2023 10:32:22 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABB2D492C14; Wed, 22 Mar 2023 10:32:20 +0000 (UTC) From: Kevin Traynor To: Zhuobin Huang Cc: David Marchand , dpdk stable Subject: patch 'test: fix segment length in packet generator' has been queued to stable release 21.11.4 Date: Wed, 22 Mar 2023 10:31:50 +0000 Message-Id: <20230322103209.456098-3-ktraynor@redhat.com> In-Reply-To: <20230322103209.456098-1-ktraynor@redhat.com> References: <20230322103209.456098-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/24/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/988dc26cabb05a62859cc343006e8351124b6684 Thanks. Kevin --- >From 988dc26cabb05a62859cc343006e8351124b6684 Mon Sep 17 00:00:00 2001 From: Zhuobin Huang Date: Mon, 6 Mar 2023 14:51:56 +0800 Subject: [PATCH] test: fix segment length in packet generator [ upstream commit b88b8af25e7cbb267584bd4c36d3615c4b20109f ] 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") Signed-off-by: Zhuobin Huang Reviewed-by: David Marchand --- .mailmap | 1 + app/test/packet_burst_generator.c | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.mailmap b/.mailmap index 4018f0fc47..6a56239c3a 100644 --- a/.mailmap +++ b/.mailmap @@ -1585,4 +1585,5 @@ Zhirun Yan Zhiwei He Zhiyong Yang +Zhuobin Huang Zi Hu Zijie Pan diff --git a/app/test/packet_burst_generator.c b/app/test/packet_burst_generator.c index 8ac24577ba..7556bb5512 100644 --- a/app/test/packet_burst_generator.c +++ b/app/test/packet_burst_generator.c @@ -263,9 +263,9 @@ generate_packet_burst(struct rte_mempool *mp, struct rte_mbuf **pkts_burst, int nb_pkt_per_burst, uint8_t pkt_len, uint8_t nb_pkt_segs) { - int i, nb_pkt = 0; - size_t eth_hdr_size; - + const uint8_t pkt_seg_data_len = pkt_len / nb_pkt_segs; struct rte_mbuf *pkt_seg; struct rte_mbuf *pkt; + size_t eth_hdr_size; + int i, nb_pkt = 0; for (nb_pkt = 0; nb_pkt < nb_pkt_per_burst; nb_pkt++) { @@ -278,5 +278,5 @@ nomore_mbuf: } - pkt->data_len = pkt_len; + pkt->data_len = pkt_seg_data_len; pkt_seg = pkt; for (i = 1; i < nb_pkt_segs; i++) { @@ -288,5 +288,8 @@ 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. */ @@ -344,9 +347,9 @@ generate_packet_burst_proto(struct rte_mempool *mp, int nb_pkt_per_burst, uint8_t pkt_len, uint8_t nb_pkt_segs) { - int i, nb_pkt = 0; - size_t eth_hdr_size; - + const uint8_t pkt_seg_data_len = pkt_len / nb_pkt_segs; struct rte_mbuf *pkt_seg; struct rte_mbuf *pkt; + size_t eth_hdr_size; + int i, nb_pkt = 0; for (nb_pkt = 0; nb_pkt < nb_pkt_per_burst; nb_pkt++) { @@ -359,5 +362,5 @@ nomore_mbuf: } - pkt->data_len = pkt_len; + pkt->data_len = pkt_seg_data_len; pkt_seg = pkt; for (i = 1; i < nb_pkt_segs; i++) { @@ -369,5 +372,8 @@ 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-22 10:30:08.000627723 +0000 +++ 0003-test-fix-segment-length-in-packet-generator.patch 2023-03-22 10:30:07.873866516 +0000 @@ -1 +1 @@ -From b88b8af25e7cbb267584bd4c36d3615c4b20109f Mon Sep 17 00:00:00 2001 +From 988dc26cabb05a62859cc343006e8351124b6684 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b88b8af25e7cbb267584bd4c36d3615c4b20109f ] + @@ -30 +32 @@ -index 6b42b9b83b..867a88da00 100644 +index 8ac24577ba..7556bb5512 100644 @@ -33 +35 @@ -@@ -264,9 +264,9 @@ generate_packet_burst(struct rte_mempool *mp, struct rte_mbuf **pkts_burst, +@@ -263,9 +263,9 @@ generate_packet_burst(struct rte_mempool *mp, struct rte_mbuf **pkts_burst, @@ -46 +48 @@ -@@ -279,5 +279,5 @@ nomore_mbuf: +@@ -278,5 +278,5 @@ nomore_mbuf: @@ -53 +55 @@ -@@ -289,5 +289,8 @@ nomore_mbuf: +@@ -288,5 +288,8 @@ nomore_mbuf: @@ -63 +65 @@ -@@ -345,9 +348,9 @@ generate_packet_burst_proto(struct rte_mempool *mp, +@@ -344,9 +347,9 @@ generate_packet_burst_proto(struct rte_mempool *mp, @@ -76 +78 @@ -@@ -360,5 +363,5 @@ nomore_mbuf: +@@ -359,5 +362,5 @@ nomore_mbuf: @@ -83 +85 @@ -@@ -370,5 +373,8 @@ nomore_mbuf: +@@ -369,5 +372,8 @@ nomore_mbuf: