patch 'net/hns3: fix crash for NEON and SVE' has been queued to stable release 20.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.10

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/10/23. 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/ce4857d3dc4602b75d034e4df9f8f261fac9a92c

Thanks.

Luca Boccassi

---
>From ce4857d3dc4602b75d034e4df9f8f261fac9a92c Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Fri, 27 Oct 2023 14:09:41 +0800
Subject: [PATCH] net/hns3: fix crash for NEON and SVE

[ upstream commit 01843ab2f2fc8c3137258ec39b2cb6f62ba7b8a2 ]

Driver may fail to allocate bulk mbufs for Neon and SVE when rearm
mbuf. Currently, driver keeps going to handle packets even if there
isn't available descriptors to receive packets at this moment.
As a result, driver probably fills the mbufs with invalid data to
application and accesses to illegal address because of the VLD bit
of the descriptor at the "rx_rearm_start" position still being set.
So driver has to clear VLD bit for this descriptor in this scenario
in case of receiving packets later.

In addition, it is possible that the sum of the "rx_rearm_nb" and
"rx_rearm_start" is greater than total descriptor number of Rx queue
in the above scenario. So the index of rxq->sw_ring[] to set mbuf
pointer to NULL should also be fixed to avoid out-of-bounds memory
access.

Fixes: a3d4f4d291d7 ("net/hns3: support NEON Rx")
Fixes: f81a18f49152 ("net/hns3: fix mbuf leakage when RxQ started after reset")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
---
 drivers/net/hns3/hns3_rxtx.c         | 2 +-
 drivers/net/hns3/hns3_rxtx_vec.c     | 5 +++++
 drivers/net/hns3/hns3_rxtx_vec_sve.c | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index e0abcce695..4f1354fb19 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -55,7 +55,7 @@ hns3_rx_queue_release_mbufs(struct hns3_rx_queue *rxq)
 			}
 		}
 		for (i = 0; i < rxq->rx_rearm_nb; i++)
-			rxq->sw_ring[rxq->rx_rearm_start + i].mbuf = NULL;
+			rxq->sw_ring[(rxq->rx_rearm_start + i) % rxq->nb_rx_desc].mbuf = NULL;
 	}
 
 	for (i = 0; i < rxq->bulk_mbuf_num; i++)
diff --git a/drivers/net/hns3/hns3_rxtx_vec.c b/drivers/net/hns3/hns3_rxtx_vec.c
index 63f910165e..a3c81005f0 100644
--- a/drivers/net/hns3/hns3_rxtx_vec.c
+++ b/drivers/net/hns3/hns3_rxtx_vec.c
@@ -57,6 +57,11 @@ hns3_rxq_rearm_mbuf(struct hns3_rx_queue *rxq)
 
 	if (unlikely(rte_mempool_get_bulk(rxq->mb_pool, (void *)rxep,
 					  HNS3_DEFAULT_RXQ_REARM_THRESH) < 0)) {
+		/*
+		 * Clear VLD bit for the first descriptor rearmed in case
+		 * of going to receive packets later.
+		 */
+		rxdp[0].rx.bd_base_info = 0;
 		rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;
 		return;
 	}
diff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c
index 888008d73f..37d4029412 100644
--- a/drivers/net/hns3/hns3_rxtx_vec_sve.c
+++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c
@@ -243,6 +243,11 @@ hns3_rxq_rearm_mbuf_sve(struct hns3_rx_queue *rxq)
 
 	if (unlikely(rte_mempool_get_bulk(rxq->mb_pool, (void *)rxep,
 					  HNS3_DEFAULT_RXQ_REARM_THRESH) < 0)) {
+		/*
+		 * Clear VLD bit for the first descriptor rearmed in case
+		 * of going to receive packets later.
+		 */
+		rxdp[0].rx.bd_base_info = 0;
 		rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;
 		return;
 	}
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-08 19:23:52.501435963 +0000
+++ 0011-net-hns3-fix-crash-for-NEON-and-SVE.patch	2023-11-08 19:23:51.757395961 +0000
@@ -1 +1 @@
-From 01843ab2f2fc8c3137258ec39b2cb6f62ba7b8a2 Mon Sep 17 00:00:00 2001
+From ce4857d3dc4602b75d034e4df9f8f261fac9a92c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 01843ab2f2fc8c3137258ec39b2cb6f62ba7b8a2 ]
+
@@ -23 +24,0 @@
-Cc: stable at dpdk.org
@@ -27,3 +28,4 @@
- drivers/net/hns3/hns3_rxtx.c     | 2 +-
- drivers/net/hns3/hns3_rxtx_vec.h | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
+ drivers/net/hns3/hns3_rxtx.c         | 2 +-
+ drivers/net/hns3/hns3_rxtx_vec.c     | 5 +++++
+ drivers/net/hns3/hns3_rxtx_vec_sve.c | 5 +++++
+ 3 files changed, 11 insertions(+), 1 deletion(-)
@@ -32 +34 @@
-index 13214d02d5..f28ca040be 100644
+index e0abcce695..4f1354fb19 100644
@@ -35 +37 @@
-@@ -51,7 +51,7 @@ hns3_rx_queue_release_mbufs(struct hns3_rx_queue *rxq)
+@@ -55,7 +55,7 @@ hns3_rx_queue_release_mbufs(struct hns3_rx_queue *rxq)
@@ -44,5 +46,21 @@
-diff --git a/drivers/net/hns3/hns3_rxtx_vec.h b/drivers/net/hns3/hns3_rxtx_vec.h
-index a9a6774294..9018e79c2f 100644
---- a/drivers/net/hns3/hns3_rxtx_vec.h
-+++ b/drivers/net/hns3/hns3_rxtx_vec.h
-@@ -106,6 +106,11 @@ hns3_rxq_rearm_mbuf(struct hns3_rx_queue *rxq)
+diff --git a/drivers/net/hns3/hns3_rxtx_vec.c b/drivers/net/hns3/hns3_rxtx_vec.c
+index 63f910165e..a3c81005f0 100644
+--- a/drivers/net/hns3/hns3_rxtx_vec.c
++++ b/drivers/net/hns3/hns3_rxtx_vec.c
+@@ -57,6 +57,11 @@ hns3_rxq_rearm_mbuf(struct hns3_rx_queue *rxq)
+ 
+ 	if (unlikely(rte_mempool_get_bulk(rxq->mb_pool, (void *)rxep,
+ 					  HNS3_DEFAULT_RXQ_REARM_THRESH) < 0)) {
++		/*
++		 * Clear VLD bit for the first descriptor rearmed in case
++		 * of going to receive packets later.
++		 */
++		rxdp[0].rx.bd_base_info = 0;
+ 		rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;
+ 		return;
+ 	}
+diff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c
+index 888008d73f..37d4029412 100644
+--- a/drivers/net/hns3/hns3_rxtx_vec_sve.c
++++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c
+@@ -243,6 +243,11 @@ hns3_rxq_rearm_mbuf_sve(struct hns3_rx_queue *rxq)