[dpdk-stable] patch 'examples/ioat: fix stats print' has been queued to stable release 19.11.6

luca.boccassi at gmail.com luca.boccassi at gmail.com
Wed Oct 28 11:44:37 CET 2020


Hi,

FYI, your patch has been queued to stable release 19.11.6

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

Thanks.

Luca Boccassi

---
>From 1046574c774105dc4b955ae5ec2e102068eef758 Mon Sep 17 00:00:00 2001
From: Kevin Laatz <kevin.laatz at intel.com>
Date: Thu, 17 Sep 2020 14:07:40 +0100
Subject: [PATCH] examples/ioat: fix stats print

[ upstream commit 64d0a9097d96e554697f8473f196266bfaf62b9d ]

Currently some of the status string at the top of the stats output is being
cut off. To fix this, the status string array size has been increased.
In addition to this, the "\n" has been moved to the printf, rather than
having it in the last string, in case of future formatting issues due to
truncation.

Bugzilla ID: 536
Fixes: 632bcd9b5d4f ("examples/ioat: print statistics")

Signed-off-by: Kevin Laatz <kevin.laatz at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 examples/ioat/ioatfwd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c
index b66ee73bce..7971442b5d 100644
--- a/examples/ioat/ioatfwd.c
+++ b/examples/ioat/ioatfwd.c
@@ -168,7 +168,7 @@ print_stats(char *prgname)
 	struct rte_rawdev_xstats_name *names_xstats;
 	uint64_t *xstats;
 	unsigned int *ids_xstats, nb_xstats;
-	char status_string[120]; /* to print at the top of the output */
+	char status_string[255]; /* to print at the top of the output */
 	int status_strlen;
 	int ret;
 
@@ -194,7 +194,7 @@ print_stats(char *prgname)
 		"Rx Queues = %d, ", nb_queues);
 	status_strlen += snprintf(status_string + status_strlen,
 		sizeof(status_string) - status_strlen,
-		"Ring Size = %d\n", ring_size);
+		"Ring Size = %d", ring_size);
 
 	/* Allocate memory for xstats names and values */
 	ret = rte_rawdev_xstats_names_get(
@@ -251,7 +251,7 @@ print_stats(char *prgname)
 
 		memset(&delta_ts, 0, sizeof(struct total_statistics));
 
-		printf("%s", status_string);
+		printf("%s\n", status_string);
 
 		for (i = 0; i < cfg.nb_ports; i++) {
 			port_id = cfg.ports[i].rxtx_port;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:15.414850746 +0000
+++ 0118-examples-ioat-fix-stats-print.patch	2020-10-28 10:35:11.672832496 +0000
@@ -1,8 +1,10 @@
-From 64d0a9097d96e554697f8473f196266bfaf62b9d Mon Sep 17 00:00:00 2001
+From 1046574c774105dc4b955ae5ec2e102068eef758 Mon Sep 17 00:00:00 2001
 From: Kevin Laatz <kevin.laatz at intel.com>
 Date: Thu, 17 Sep 2020 14:07:40 +0100
 Subject: [PATCH] examples/ioat: fix stats print
 
+[ upstream commit 64d0a9097d96e554697f8473f196266bfaf62b9d ]
+
 Currently some of the status string at the top of the stats output is being
 cut off. To fix this, the status string array size has been increased.
 In addition to this, the "\n" has been moved to the printf, rather than
@@ -11,7 +13,6 @@
 
 Bugzilla ID: 536
 Fixes: 632bcd9b5d4f ("examples/ioat: print statistics")
-Cc: stable at dpdk.org
 
 Signed-off-by: Kevin Laatz <kevin.laatz at intel.com>
 Acked-by: Bruce Richardson <bruce.richardson at intel.com>
@@ -20,7 +21,7 @@
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c
-index e6d1d1236e..8cf606e25b 100644
+index b66ee73bce..7971442b5d 100644
 --- a/examples/ioat/ioatfwd.c
 +++ b/examples/ioat/ioatfwd.c
 @@ -168,7 +168,7 @@ print_stats(char *prgname)


More information about the stable mailing list