[dpdk-stable] patch 'net/ena: fix getting xstats global stats offset' has been queued to stable release 19.11.6

luca.boccassi at gmail.com luca.boccassi at gmail.com
Mon Nov 9 19:40:55 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 11/11/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.

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/a9009414896e9aa0d9dd000f9e263908fd223dd7

Thanks.

Luca Boccassi

---
>From a9009414896e9aa0d9dd000f9e263908fd223dd7 Mon Sep 17 00:00:00 2001
From: Michal Krawczyk <mk at semihalf.com>
Date: Fri, 30 Oct 2020 12:31:16 +0100
Subject: [PATCH] net/ena: fix getting xstats global stats offset

[ upstream commit 493107fd83a2848025dd42db67764bb0dc7943e0 ]

There was a bug in a code, which was reading stat_offset value from the
ena_stats_rx_strings array instead of ena_stats_global_strings.

It wasn't causing real problems just because ena_stats_rx_strings was
not smaller than ena_stats_global_strings and both arrays hold the same
offsets.

Fixes: 7830e905b7c9 ("net/ena: expose extended stats")

Signed-off-by: Michal Krawczyk <mk at semihalf.com>
Reviewed-by: Igor Chauskin <igorch at amazon.com>
Reviewed-by: Guy Tzalik <gtzalik at amazon.com>
---
 drivers/net/ena/ena_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index e8753ce010..a90d17ccc4 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -2479,7 +2479,7 @@ static int ena_xstats_get(struct rte_eth_dev *dev,
 		return 0;
 
 	for (stat = 0; stat < ENA_STATS_ARRAY_GLOBAL; stat++, count++) {
-		stat_offset = ena_stats_rx_strings[stat].stat_offset;
+		stat_offset = ena_stats_global_strings[stat].stat_offset;
 		stats_begin = &adapter->dev_stats;
 
 		xstats[count].id = count;
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-09 18:40:13.699734643 +0000
+++ 0067-net-ena-fix-getting-xstats-global-stats-offset.patch	2020-11-09 18:40:11.207312465 +0000
@@ -1 +1 @@
-From 493107fd83a2848025dd42db67764bb0dc7943e0 Mon Sep 17 00:00:00 2001
+From a9009414896e9aa0d9dd000f9e263908fd223dd7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 493107fd83a2848025dd42db67764bb0dc7943e0 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index c513faf202..7ab9b93ba9 100644
+index e8753ce010..a90d17ccc4 100644
@@ -27 +28 @@
-@@ -2724,7 +2724,7 @@ static int ena_xstats_get(struct rte_eth_dev *dev,
+@@ -2479,7 +2479,7 @@ static int ena_xstats_get(struct rte_eth_dev *dev,


More information about the stable mailing list