patch 'app/testpmd: check statistics query before printing' has been queued to stable release 21.11.2

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/30/22. 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/5e1545b730ffd4d46ad090071eed4f4ab71d60ac

Thanks.

Kevin

---
From 5e1545b730ffd4d46ad090071eed4f4ab71d60ac Mon Sep 17 00:00:00 2001
From: "Min Hu (Connor)" <humin29@huawei.com>
Date: Wed, 6 Apr 2022 16:45:36 +0800
Subject: [PATCH] app/testpmd: check statistics query before printing

[ upstream commit baef6bbfad1b9596c7051f5c1fcc308310296342 ]

In function 'fwd_stats_display', if function 'rte_eth_stats_get' fails,
'stats' is uncertainty value. The display result will be abnormal.

This patch check the return value of 'rte_eth_stats_get' to avoid
display abnormal stats.

Fixes: 53324971a14e ("app/testpmd: display/clear forwarding stats on demand")

Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
Acked-by: Aman Singh <aman.deep.singh@intel.com>
---
 app/test-pmd/config.c  | 10 ++++++++--
 app/test-pmd/testpmd.c | 16 ++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index e812f57151..38f268423b 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -249,6 +249,6 @@ nic_stats_display(portid_t port_id)
 	uint64_t mpps_rx, mpps_tx, mbps_rx, mbps_tx;
 	struct rte_eth_stats stats;
-
 	static const char *nic_stats_border = "########################";
+	int ret;
 
 	if (port_id_is_invalid(port_id, ENABLED_WARN)) {
@@ -256,5 +256,11 @@ nic_stats_display(portid_t port_id)
 		return;
 	}
-	rte_eth_stats_get(port_id, &stats);
+	ret = rte_eth_stats_get(port_id, &stats);
+	if (ret != 0) {
+		fprintf(stderr,
+			"%s: Error: failed to get stats (port %u): %d",
+			__func__, port_id, ret);
+		return;
+	}
 	printf("\n  %s NIC statistics for port %-2d %s\n",
 	       nic_stats_border, port_id, nic_stats_border);
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 2387cc1d9e..e4f9d5f147 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1984,4 +1984,5 @@ fwd_stats_display(void)
 	streamid_t sm_id;
 	portid_t pt_id;
+	int ret;
 	int i;
 
@@ -2015,5 +2016,11 @@ fwd_stats_display(void)
 		port = &ports[pt_id];
 
-		rte_eth_stats_get(pt_id, &stats);
+		ret = rte_eth_stats_get(pt_id, &stats);
+		if (ret != 0) {
+			fprintf(stderr,
+				"%s: Error: failed to get stats (port %u): %d",
+				__func__, pt_id, ret);
+			continue;
+		}
 		stats.ipackets -= port->stats.ipackets;
 		stats.opackets -= port->stats.opackets;
@@ -2110,9 +2117,14 @@ fwd_stats_reset(void)
 	streamid_t sm_id;
 	portid_t pt_id;
+	int ret;
 	int i;
 
 	for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) {
 		pt_id = fwd_ports_ids[i];
-		rte_eth_stats_get(pt_id, &ports[pt_id].stats);
+		ret = rte_eth_stats_get(pt_id, &ports[pt_id].stats);
+		if (ret != 0)
+			fprintf(stderr,
+				"%s: Error: failed to clear stats (port %u):%d",
+				__func__, pt_id, ret);
 	}
 	for (sm_id = 0; sm_id < cur_fwd_config.nb_fwd_streams; sm_id++) {
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-05-25 17:26:59.254196818 +0100
+++ 0028-app-testpmd-check-statistics-query-before-printing.patch	2022-05-25 17:26:58.595828373 +0100
@@ -1 +1 @@
-From baef6bbfad1b9596c7051f5c1fcc308310296342 Mon Sep 17 00:00:00 2001
+From 5e1545b730ffd4d46ad090071eed4f4ab71d60ac Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit baef6bbfad1b9596c7051f5c1fcc308310296342 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index cc8e7aa138..bd689f9f86 100644
+index e812f57151..38f268423b 100644
@@ -26 +27 @@
-@@ -250,6 +250,6 @@ nic_stats_display(portid_t port_id)
+@@ -249,6 +249,6 @@ nic_stats_display(portid_t port_id)
@@ -34 +35 @@
-@@ -257,5 +257,11 @@ nic_stats_display(portid_t port_id)
+@@ -256,5 +256,11 @@ nic_stats_display(portid_t port_id)
@@ -48 +49 @@
-index fe2ce19f99..79bb23264b 100644
+index 2387cc1d9e..e4f9d5f147 100644
@@ -51 +52 @@
-@@ -1983,4 +1983,5 @@ fwd_stats_display(void)
+@@ -1984,4 +1984,5 @@ fwd_stats_display(void)
@@ -57 +58 @@
-@@ -2014,5 +2015,11 @@ fwd_stats_display(void)
+@@ -2015,5 +2016,11 @@ fwd_stats_display(void)
@@ -70 +71 @@
-@@ -2109,9 +2116,14 @@ fwd_stats_reset(void)
+@@ -2110,9 +2117,14 @@ fwd_stats_reset(void)