patch 'net/iavf: fix mbuf release in Arm multi-process' has been queued to stable release 22.11.8

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.8

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/21/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/1011c5f2e70fdad2ea21c61cf73fd34a05bbe00a

Thanks.

Luca Boccassi

---
>From 1011c5f2e70fdad2ea21c61cf73fd34a05bbe00a Mon Sep 17 00:00:00 2001
From: Yang Ming <ming.1.yang at nokia-sbell.com>
Date: Fri, 7 Mar 2025 13:40:22 +0800
Subject: [PATCH] net/iavf: fix mbuf release in Arm multi-process

[ upstream commit 289d1b2e348032543f9b823d2eaf3d0e0073af56 ]

This patch addresses a bug related to mbuf release in the Arm
architecture. The previous patch resolved the mbuf release issue
in a multi-process environment but was only applicable to the
x86 architecture, leaving Arm unaddressed.
This patch extends the fix to include the Arm architecture,
ensuring consistent behavior across both x86 and Arm platforms.

Fixes: fced83c1229e ("net/iavf: fix mbuf release in multi-process")

Signed-off-by: Yang Ming <ming.1.yang at nokia-sbell.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/iavf/iavf_rxtx.c          | 3 +++
 drivers/net/iavf/iavf_rxtx.h          | 2 ++
 drivers/net/iavf/iavf_rxtx_vec_neon.c | 8 ++------
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 3272553b5c..1f82d1cf3f 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -368,6 +368,9 @@ struct iavf_rxq_ops iavf_rxq_release_mbufs_ops[] = {
 #ifdef RTE_ARCH_X86
 	[IAVF_REL_MBUFS_SSE_VEC].release_mbufs = iavf_rx_queue_release_mbufs_sse,
 #endif
+#ifdef RTE_ARCH_ARM64
+	[IAVF_REL_MBUFS_NEON_VEC].release_mbufs = iavf_rx_queue_release_mbufs_neon,
+#endif
 };
 
 static const
diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h
index 180f7ec108..b56519a507 100644
--- a/drivers/net/iavf/iavf_rxtx.h
+++ b/drivers/net/iavf/iavf_rxtx.h
@@ -416,6 +416,7 @@ enum iavf_rxtx_rel_mbufs_type {
 	IAVF_REL_MBUFS_DEFAULT		= 0,
 	IAVF_REL_MBUFS_SSE_VEC		= 1,
 	IAVF_REL_MBUFS_AVX512_VEC	= 2,
+	IAVF_REL_MBUFS_NEON_VEC		= 3,
 };
 
 /* Receive Flex Descriptor profile IDs: There are a total
@@ -724,6 +725,7 @@ void iavf_set_default_ptype_table(struct rte_eth_dev *dev);
 void iavf_tx_queue_release_mbufs_avx512(struct iavf_tx_queue *txq);
 void iavf_rx_queue_release_mbufs_sse(struct iavf_rx_queue *rxq);
 void iavf_tx_queue_release_mbufs_sse(struct iavf_tx_queue *txq);
+void iavf_rx_queue_release_mbufs_neon(struct iavf_rx_queue *rxq);
 
 static inline
 void iavf_dump_rx_descriptor(struct iavf_rx_queue *rxq,
diff --git a/drivers/net/iavf/iavf_rxtx_vec_neon.c b/drivers/net/iavf/iavf_rxtx_vec_neon.c
index 83825aa427..23c1d6c3a2 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_neon.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_neon.c
@@ -391,20 +391,16 @@ iavf_recv_pkts_vec(void *__rte_restrict rx_queue,
 	return _recv_raw_pkts_vec(rx_queue, rx_pkts, nb_pkts, NULL);
 }
 
-static void __rte_cold
+void __rte_cold
 iavf_rx_queue_release_mbufs_neon(struct iavf_rx_queue *rxq)
 {
 	_iavf_rx_queue_release_mbufs_vec(rxq);
 }
 
-static const struct iavf_rxq_ops neon_vec_rxq_ops = {
-	.release_mbufs = iavf_rx_queue_release_mbufs_neon,
-};
-
 int __rte_cold
 iavf_rxq_vec_setup(struct iavf_rx_queue *rxq)
 {
-	rxq->ops = &neon_vec_rxq_ops;
+	rxq->rel_mbufs_type = IAVF_REL_MBUFS_NEON_VEC;
 	return iavf_rxq_vec_setup_default(rxq);
 }
 
-- 
2.47.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-03-19 14:20:57.121189100 +0000
+++ 0001-net-iavf-fix-mbuf-release-in-Arm-multi-process.patch	2025-03-19 14:20:57.049288704 +0000
@@ -1 +1 @@
-From 289d1b2e348032543f9b823d2eaf3d0e0073af56 Mon Sep 17 00:00:00 2001
+From 1011c5f2e70fdad2ea21c61cf73fd34a05bbe00a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 289d1b2e348032543f9b823d2eaf3d0e0073af56 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -19,3 +20,3 @@
- drivers/net/intel/iavf/iavf_rxtx.c          | 3 +++
- drivers/net/intel/iavf/iavf_rxtx.h          | 2 ++
- drivers/net/intel/iavf/iavf_rxtx_vec_neon.c | 8 ++------
+ drivers/net/iavf/iavf_rxtx.c          | 3 +++
+ drivers/net/iavf/iavf_rxtx.h          | 2 ++
+ drivers/net/iavf/iavf_rxtx_vec_neon.c | 8 ++------
@@ -24,5 +25,5 @@
-diff --git a/drivers/net/intel/iavf/iavf_rxtx.c b/drivers/net/intel/iavf/iavf_rxtx.c
-index 657963750d..a999073691 100644
---- a/drivers/net/intel/iavf/iavf_rxtx.c
-+++ b/drivers/net/intel/iavf/iavf_rxtx.c
-@@ -380,6 +380,9 @@ struct iavf_rxq_ops iavf_rxq_release_mbufs_ops[] = {
+diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
+index 3272553b5c..1f82d1cf3f 100644
+--- a/drivers/net/iavf/iavf_rxtx.c
++++ b/drivers/net/iavf/iavf_rxtx.c
+@@ -368,6 +368,9 @@ struct iavf_rxq_ops iavf_rxq_release_mbufs_ops[] = {
@@ -37,6 +38,6 @@
- static inline void
-diff --git a/drivers/net/intel/iavf/iavf_rxtx.h b/drivers/net/intel/iavf/iavf_rxtx.h
-index 6a54b446cf..823a6efa9a 100644
---- a/drivers/net/intel/iavf/iavf_rxtx.h
-+++ b/drivers/net/intel/iavf/iavf_rxtx.h
-@@ -404,6 +404,7 @@ enum iavf_rxtx_rel_mbufs_type {
+ static const
+diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h
+index 180f7ec108..b56519a507 100644
+--- a/drivers/net/iavf/iavf_rxtx.h
++++ b/drivers/net/iavf/iavf_rxtx.h
+@@ -416,6 +416,7 @@ enum iavf_rxtx_rel_mbufs_type {
@@ -50,2 +51,2 @@
-@@ -729,6 +730,7 @@ void iavf_set_default_ptype_table(struct rte_eth_dev *dev);
- void iavf_tx_queue_release_mbufs_avx512(struct ci_tx_queue *txq);
+@@ -724,6 +725,7 @@ void iavf_set_default_ptype_table(struct rte_eth_dev *dev);
+ void iavf_tx_queue_release_mbufs_avx512(struct iavf_tx_queue *txq);
@@ -53 +54 @@
- void iavf_tx_queue_release_mbufs_sse(struct ci_tx_queue *txq);
+ void iavf_tx_queue_release_mbufs_sse(struct iavf_tx_queue *txq);
@@ -58,5 +59,5 @@
-diff --git a/drivers/net/intel/iavf/iavf_rxtx_vec_neon.c b/drivers/net/intel/iavf/iavf_rxtx_vec_neon.c
-index 6bc8e1db2a..a583340f15 100644
---- a/drivers/net/intel/iavf/iavf_rxtx_vec_neon.c
-+++ b/drivers/net/intel/iavf/iavf_rxtx_vec_neon.c
-@@ -393,20 +393,16 @@ iavf_recv_pkts_vec(void *__rte_restrict rx_queue,
+diff --git a/drivers/net/iavf/iavf_rxtx_vec_neon.c b/drivers/net/iavf/iavf_rxtx_vec_neon.c
+index 83825aa427..23c1d6c3a2 100644
+--- a/drivers/net/iavf/iavf_rxtx_vec_neon.c
++++ b/drivers/net/iavf/iavf_rxtx_vec_neon.c
+@@ -391,20 +391,16 @@ iavf_recv_pkts_vec(void *__rte_restrict rx_queue,
@@ -82,2 +83 @@
- 	rxq->mbuf_initializer = ci_rxq_mbuf_initializer(rxq->port_id);
- 	return 0;
+ 	return iavf_rxq_vec_setup_default(rxq);
@@ -84,0 +85 @@
+