patch 'net/nfp: fix Rx descriptor' has been queued to stable release 23.11.1

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.1

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/31/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=48fe88cb3ce34d1d38859ef2856eda2113bfc8c7

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 48fe88cb3ce34d1d38859ef2856eda2113bfc8c7 Mon Sep 17 00:00:00 2001
From: Long Wu <long.wu at corigine.com>
Date: Mon, 11 Dec 2023 13:45:26 +0800
Subject: [PATCH] net/nfp: fix Rx descriptor
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 580ea0b09a7c293c8912884109dc92abfea1229a ]

If the Rx loop is broken and PMD does not update the descriptor, packets
will not be received successfully.

Fixes: 766d51c9ce29 ("net/nfp: merge receive function")

Signed-off-by: Long Wu <long.wu at corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Peng Zhang <peng.zhang at corigine.com>
---
 drivers/net/nfp/nfp_rxtx.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c
index f21e120a43..8ca651ba55 100644
--- a/drivers/net/nfp/nfp_rxtx.c
+++ b/drivers/net/nfp/nfp_rxtx.c
@@ -747,15 +747,6 @@ nfp_net_recv_pkts(void *rx_queue,
 		/* Checking the checksum flag */
 		nfp_net_rx_cksum(rxq, rxds, mb);

-		if (meta.port_id == 0) {
-			rx_pkts[avail++] = mb;
-		} else if (nfp_flower_pf_dispatch_pkts(hw, mb, meta.port_id)) {
-			avail_multiplexed++;
-		} else {
-			rte_pktmbuf_free(mb);
-			break;
-		}
-
 		/* Now resetting and updating the descriptor */
 		rxds->vals[0] = 0;
 		rxds->vals[1] = 0;
@@ -768,6 +759,15 @@ nfp_net_recv_pkts(void *rx_queue,
 		rxq->rd_p++;
 		if (unlikely(rxq->rd_p == rxq->rx_count)) /* Wrapping */
 			rxq->rd_p = 0;
+
+		if (meta.port_id == 0) {
+			rx_pkts[avail++] = mb;
+		} else if (nfp_flower_pf_dispatch_pkts(hw, mb, meta.port_id)) {
+			avail_multiplexed++;
+		} else {
+			rte_pktmbuf_free(mb);
+			break;
+		}
 	}

 	if (nb_hold == 0)
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-05 17:39:33.732004191 +0800
+++ 0090-net-nfp-fix-Rx-descriptor.patch	2024-03-05 17:39:30.843566495 +0800
@@ -1 +1 @@
-From 580ea0b09a7c293c8912884109dc92abfea1229a Mon Sep 17 00:00:00 2001
+From 48fe88cb3ce34d1d38859ef2856eda2113bfc8c7 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 580ea0b09a7c293c8912884109dc92abfea1229a ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 5094bbf145..3840e2372c 100644
+index f21e120a43..8ca651ba55 100644
@@ -23 +25 @@
-@@ -765,15 +765,6 @@ nfp_net_recv_pkts(void *rx_queue,
+@@ -747,15 +747,6 @@ nfp_net_recv_pkts(void *rx_queue,
@@ -39 +41 @@
-@@ -786,6 +777,15 @@ nfp_net_recv_pkts(void *rx_queue,
+@@ -768,6 +759,15 @@ nfp_net_recv_pkts(void *rx_queue,