patch 'app/testpmd: fix packet transmission in noisy VNF engine' has been queued to stable release 20.11.8

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.8

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/17/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/bad17c2433b7c934b81ed961bd4ddf78b9aa3521

Thanks.

Luca Boccassi

---
>From bad17c2433b7c934b81ed961bd4ddf78b9aa3521 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Mon, 20 Feb 2023 19:34:57 +0100
Subject: [PATCH] app/testpmd: fix packet transmission in noisy VNF engine

[ upstream commit c2acd2db16cba89f403a980da5f4b6764085b01d ]

nb_rx relates to the number of packets received from the driver.
nb_tx is the total number of packets transmitted by this forward engine.

Fix the retry stage, for dequeued packets, as it was incorrectly
passing nb_rx / nb_tx as bounds of the tmp_pkts[] array, and fix tx stats
accordingly.

Fixes: 3c156061b938 ("app/testpmd: add noisy neighbour forwarding mode")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 app/test-pmd/noisy_vnf.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/noisy_vnf.c b/app/test-pmd/noisy_vnf.c
index d70940006d..1be5f77efe 100644
--- a/app/test-pmd/noisy_vnf.c
+++ b/app/test-pmd/noisy_vnf.c
@@ -213,9 +213,10 @@ flush:
 		sent = rte_eth_tx_burst(fs->tx_port, fs->tx_queue,
 					 tmp_pkts, nb_deqd);
 		if (unlikely(sent < nb_deqd) && fs->retry_enabled)
-			nb_tx += do_retry(nb_rx, nb_tx, tmp_pkts, fs);
-		inc_tx_burst_stats(fs, nb_tx);
+			sent += do_retry(nb_deqd, sent, tmp_pkts, fs);
+		inc_tx_burst_stats(fs, sent);
 		fs->fwd_dropped += drop_pkts(tmp_pkts, nb_deqd, sent);
+		nb_tx += sent;
 		ncf->prev_time = rte_get_timer_cycles();
 	}
 }
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-15 22:44:50.259993645 +0000
+++ 0011-app-testpmd-fix-packet-transmission-in-noisy-VNF-eng.patch	2023-03-15 22:44:49.523849003 +0000
@@ -1 +1 @@
-From c2acd2db16cba89f403a980da5f4b6764085b01d Mon Sep 17 00:00:00 2001
+From bad17c2433b7c934b81ed961bd4ddf78b9aa3521 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c2acd2db16cba89f403a980da5f4b6764085b01d ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index ce5a3e5e69..0e72dc034f 100644
+index d70940006d..1be5f77efe 100644
@@ -26 +27 @@
-@@ -217,9 +217,10 @@ flush:
+@@ -213,9 +213,10 @@ flush:
@@ -38 +39 @@
- end:
+ }