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

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.13

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/09/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/ee3e5f1825a67f387d455cbd91f803d44502bf0c

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From ee3e5f1825a67f387d455cbd91f803d44502bf0c Mon Sep 17 00:00:00 2001
From: "Min Hu (Connor)" <humin29 at 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 at huawei.com>
Acked-by: Aman Singh <aman.deep.singh at 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 7d826632dc..3eefc90bf4 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -141,14 +141,20 @@ nic_stats_display(portid_t port_id)
 	struct rte_eth_stats stats;
 	struct rte_port *port = &ports[port_id];
 	uint8_t i;
-
 	static const char *nic_stats_border = "########################";
+	int ret;
 
 	if (port_id_is_invalid(port_id, ENABLED_WARN)) {
 		print_valid_ports();
 		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 2a182eda20..cb59c85c83 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1705,6 +1705,7 @@ fwd_stats_display(void)
 	struct rte_port *port;
 	streamid_t sm_id;
 	portid_t pt_id;
+	int ret;
 	int i;
 
 	memset(ports_stats, 0, sizeof(ports_stats));
@@ -1737,7 +1738,13 @@ fwd_stats_display(void)
 		pt_id = fwd_ports_ids[i];
 		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;
 		stats.ibytes -= port->stats.ibytes;
@@ -1883,11 +1890,16 @@ 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++) {
 		struct fwd_stream *fs = fwd_streams[sm_id];
-- 
2.37.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-07 09:54:12.107804215 +0200
+++ 0021-app-testpmd-check-statistics-query-before-printing.patch	2022-07-07 09:54:10.825823752 +0200
@@ -1 +1 @@
-From baef6bbfad1b9596c7051f5c1fcc308310296342 Mon Sep 17 00:00:00 2001
+From ee3e5f1825a67f387d455cbd91f803d44502bf0c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit baef6bbfad1b9596c7051f5c1fcc308310296342 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index cc8e7aa138..bd689f9f86 100644
+index 7d826632dc..3eefc90bf4 100644
@@ -26,3 +27 @@
-@@ -249,14 +249,20 @@ nic_stats_display(portid_t port_id)
- 								diff_ns;
- 	uint64_t mpps_rx, mpps_tx, mbps_rx, mbps_tx;
+@@ -141,14 +141,20 @@ nic_stats_display(portid_t port_id)
@@ -29,0 +29,2 @@
+ 	struct rte_port *port = &ports[port_id];
+ 	uint8_t i;
@@ -50 +51 @@
-index fe2ce19f99..79bb23264b 100644
+index 2a182eda20..cb59c85c83 100644
@@ -53 +54 @@
-@@ -1982,6 +1982,7 @@ fwd_stats_display(void)
+@@ -1705,6 +1705,7 @@ fwd_stats_display(void)
@@ -61 +62 @@
-@@ -2013,7 +2014,13 @@ fwd_stats_display(void)
+@@ -1737,7 +1738,13 @@ fwd_stats_display(void)
@@ -76 +77 @@
-@@ -2108,11 +2115,16 @@ fwd_stats_reset(void)
+@@ -1883,11 +1890,16 @@ fwd_stats_reset(void)