patch 'net/nfp: fix representor port statistics' has been queued to stable release 24.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.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 03/12/25. 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/0b3b586e7535b9c2635dca1a65d60d158a41a039

Thanks.

Kevin

---
>From 0b3b586e7535b9c2635dca1a65d60d158a41a039 Mon Sep 17 00:00:00 2001
From: Long Wu <long.wu at corigine.com>
Date: Tue, 25 Feb 2025 09:34:54 +0800
Subject: [PATCH] net/nfp: fix representor port statistics

[ upstream commit 87a5cc7c3e829b8a14fe9cb6db7feb0161c10861 ]

The 'ipackets'/'opackets' are used to record the number
of packets on representor port received/sent. But the
code does not consider concurrent calculation of
'ipackets'/'opackets'. If multiple queues are calculated
'ipackets'/'opackets' simultaneously, it will result in
incorrect results.

The previous logic has recorded the number of packets on
each queue, therefore driver only needs to add the data of
all queues to obtain the data of the representor port.

Based on this, modify code to fix the issue.

Fixes: 636e133ec891 ("net/nfp: update Tx and Rx for multiple PF")
Fixes: 82a2c286f35a ("net/nfp: support xstats for flower firmware")

Signed-off-by: Long Wu <long.wu at corigine.com>
---
 drivers/net/nfp/flower/nfp_flower.c            |  2 --
 .../net/nfp/flower/nfp_flower_representor.c    | 18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c
index f087d0dfdc..804ad494d5 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -239,5 +239,4 @@ nfp_flower_multiple_pf_recv_pkts(void *rx_queue,
 			data_len += rx_pkts[i]->data_len;
 
-		repr->repr_stats.ipackets += recv;
 		repr->repr_stats.q_ipackets[rxq->qidx] += recv;
 		repr->repr_stats.q_ibytes[rxq->qidx] += data_len;
@@ -278,5 +277,4 @@ nfp_flower_multiple_pf_xmit_pkts(void *tx_queue,
 			data_len += tx_pkts[i]->data_len;
 
-		repr->repr_stats.opackets += sent;
 		repr->repr_stats.q_opackets[txq->qidx] += sent;
 		repr->repr_stats.q_obytes[txq->qidx] += data_len;
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c
index 9601aa5f96..e377d45e53 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -316,7 +316,23 @@ nfp_flower_repr_stats_get(struct rte_eth_dev *ethdev,
 		struct rte_eth_stats *stats)
 {
+	uint16_t i;
 	struct nfp_flower_representor *repr;
 
 	repr = ethdev->data->dev_private;
+
+	repr->repr_stats.ipackets = 0;
+	repr->repr_stats.ibytes = 0;
+	for (i = 0; i < ethdev->data->nb_rx_queues; i++) {
+		repr->repr_stats.ipackets += repr->repr_stats.q_ipackets[i];
+		repr->repr_stats.ibytes += repr->repr_stats.q_ibytes[i];
+	}
+
+	repr->repr_stats.opackets = 0;
+	repr->repr_stats.obytes = 0;
+	for (i = 0; i < ethdev->data->nb_tx_queues; i++) {
+		repr->repr_stats.opackets += repr->repr_stats.q_opackets[i];
+		repr->repr_stats.obytes += repr->repr_stats.q_obytes[i];
+	}
+
 	rte_memcpy(stats, &repr->repr_stats, sizeof(struct rte_eth_stats));
 
@@ -386,5 +402,4 @@ nfp_flower_repr_rx_burst(void *rx_queue,
 			data_len += rx_pkts[i]->data_len;
 
-		repr->repr_stats.ipackets += total_dequeue;
 		repr->repr_stats.q_ipackets[rxq->qidx] += total_dequeue;
 		repr->repr_stats.q_ibytes[rxq->qidx] += data_len;
@@ -435,5 +450,4 @@ nfp_flower_repr_tx_burst(void *tx_queue,
 			data_len += tx_pkts[i]->data_len;
 
-		repr->repr_stats.opackets += sent;
 		repr->repr_stats.q_opackets[txq->qidx] += sent;
 		repr->repr_stats.q_obytes[txq->qidx] += data_len;
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-03-07 11:02:57.425951706 +0000
+++ 0014-net-nfp-fix-representor-port-statistics.patch	2025-03-07 11:02:56.853335626 +0000
@@ -1 +1 @@
-From 87a5cc7c3e829b8a14fe9cb6db7feb0161c10861 Mon Sep 17 00:00:00 2001
+From 0b3b586e7535b9c2635dca1a65d60d158a41a039 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 87a5cc7c3e829b8a14fe9cb6db7feb0161c10861 ]
+
@@ -21 +22,0 @@
-Cc: stable at dpdk.org