patch 'net/iavf: skip RSS teardown during PF-initiated reset' has been queued to stable release 24.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 24.11.9

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/07/26. 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/431ca727691aab2e01f1dfe2d00defdf54a14575

Thanks.

Luca Boccassi

---
>From 431ca727691aab2e01f1dfe2d00defdf54a14575 Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov at intel.com>
Date: Fri, 23 Oct 2026 10:32:27 +0100
Subject: [PATCH] net/iavf: skip RSS teardown during PF-initiated reset

[ upstream commit 580cdc8921e1402b96752f130c8d779b8cb6ce9e ]

During PF-initiated reset recovery, `iavf_dev_close()` skips flow flush
to avoid sending virtchnl messages to the PF. However, `iavf_hash_uninit()`
is still called unconditionally, even though any existing RSS configuration
is now invalid because of PF-initiated reset.

Move the RSS teardown under the same `pf_reset_in_progress` check as flow
flush, so that no RSS configuration messages are sent during PF-initiated
reset recovery.

Fixes: 4dad1a6815d6 ("net/iavf: skip flow flush during PF-initiated reset")

Signed-off-by: Anatoly Burakov <anatoly.burakov at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/iavf/iavf.h        |  1 +
 drivers/net/iavf/iavf_ethdev.c |  5 ++++-
 drivers/net/iavf/iavf_hash.c   | 12 ++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
index 5ebe06be101..549a69bb4c0 100644
--- a/drivers/net/iavf/iavf.h
+++ b/drivers/net/iavf/iavf.h
@@ -538,6 +538,7 @@ int iavf_add_del_rss_cfg(struct iavf_adapter *adapter,
 int iavf_get_hena_caps(struct iavf_adapter *adapter, uint64_t *caps);
 int iavf_set_hena(struct iavf_adapter *adapter, uint64_t hena);
 int iavf_rss_hash_set(struct iavf_adapter *ad, uint64_t rss_hf, bool add);
+void iavf_hash_uninit(struct iavf_adapter *ad);
 int iavf_add_del_mc_addr_list(struct iavf_adapter *adapter,
 			struct rte_ether_addr *mc_addrs,
 			uint32_t mc_addrs_num, bool add);
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index b1a56c0ee9a..c7a93a6a88c 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -3025,8 +3025,11 @@ iavf_dev_close(struct rte_eth_dev *dev)
 	iavf_security_ctx_destroy(adapter);
 
 	/* Skip the virtchnl-emitting teardown on a PF-initiated reset */
-	if (!vf->pf_reset_in_progress)
+	if (!vf->pf_reset_in_progress) {
+		/* remove RSS configuration */
+		iavf_hash_uninit(adapter);
 		iavf_flow_flush(dev, NULL);
+	}
 	iavf_flow_uninit(adapter);
 
 	/*
diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index 0e85cd26a50..35b68cc8a98 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -77,7 +77,7 @@ static int
 iavf_hash_destroy(struct iavf_adapter *ad, struct rte_flow *flow,
 		  struct rte_flow_error *error);
 static void
-iavf_hash_uninit(struct iavf_adapter *ad);
+iavf_hash_uninit_parser(struct iavf_adapter *ad);
 static void
 iavf_hash_free(struct rte_flow *flow);
 static int
@@ -680,7 +680,7 @@ static struct iavf_flow_engine iavf_hash_engine = {
 	.init = iavf_hash_init,
 	.create = iavf_hash_create,
 	.destroy = iavf_hash_destroy,
-	.uninit = iavf_hash_uninit,
+	.uninit = iavf_hash_uninit_parser,
 	.free = iavf_hash_free,
 	.type = IAVF_FLOW_ENGINE_HASH,
 };
@@ -1639,6 +1639,12 @@ iavf_hash_destroy(__rte_unused struct iavf_adapter *ad,
 }
 
 static void
+iavf_hash_uninit_parser(struct iavf_adapter *ad)
+{
+	iavf_unregister_parser(&iavf_hash_parser, ad);
+}
+
+void
 iavf_hash_uninit(struct iavf_adapter *ad)
 {
 	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
@@ -1656,8 +1662,6 @@ iavf_hash_uninit(struct iavf_adapter *ad)
 	rss_conf = &ad->dev_data->dev_conf.rx_adv_conf.rss_conf;
 	if (iavf_rss_hash_set(ad, rss_conf->rss_hf, false))
 		PMD_DRV_LOG(ERR, "fail to delete default RSS");
-
-	iavf_unregister_parser(&iavf_hash_parser, ad);
 }
 
 static void
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-11-05 16:42:46.982255193 +0000
+++ 0052-net-iavf-skip-RSS-teardown-during-PF-initiated-reset.patch	2026-11-05 16:42:44.961061982 +0000
@@ -1 +1 @@
-From 580cdc8921e1402b96752f130c8d779b8cb6ce9e Mon Sep 17 00:00:00 2001
+From 431ca727691aab2e01f1dfe2d00defdf54a14575 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 580cdc8921e1402b96752f130c8d779b8cb6ce9e ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -21,2 +22,4 @@
- drivers/net/intel/iavf/iavf_ethdev.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ drivers/net/iavf/iavf.h        |  1 +
+ drivers/net/iavf/iavf_ethdev.c |  5 ++++-
+ drivers/net/iavf/iavf_hash.c   | 12 ++++++++----
+ 3 files changed, 13 insertions(+), 5 deletions(-)
@@ -24,6 +27,17 @@
-diff --git a/drivers/net/intel/iavf/iavf_ethdev.c b/drivers/net/intel/iavf/iavf_ethdev.c
-index 5eec34e4a1..fd1067c252 100644
---- a/drivers/net/intel/iavf/iavf_ethdev.c
-+++ b/drivers/net/intel/iavf/iavf_ethdev.c
-@@ -3245,12 +3245,12 @@ iavf_dev_close(struct rte_eth_dev *dev)
- 	/* free iAVF security device context all related resources */
+diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
+index 5ebe06be101..549a69bb4c0 100644
+--- a/drivers/net/iavf/iavf.h
++++ b/drivers/net/iavf/iavf.h
+@@ -538,6 +538,7 @@ int iavf_add_del_rss_cfg(struct iavf_adapter *adapter,
+ int iavf_get_hena_caps(struct iavf_adapter *adapter, uint64_t *caps);
+ int iavf_set_hena(struct iavf_adapter *adapter, uint64_t hena);
+ int iavf_rss_hash_set(struct iavf_adapter *ad, uint64_t rss_hf, bool add);
++void iavf_hash_uninit(struct iavf_adapter *ad);
+ int iavf_add_del_mc_addr_list(struct iavf_adapter *adapter,
+ 			struct rte_ether_addr *mc_addrs,
+ 			uint32_t mc_addrs_num, bool add);
+diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
+index b1a56c0ee9a..c7a93a6a88c 100644
+--- a/drivers/net/iavf/iavf_ethdev.c
++++ b/drivers/net/iavf/iavf_ethdev.c
+@@ -3025,8 +3025,11 @@ iavf_dev_close(struct rte_eth_dev *dev)
@@ -32,3 +45,0 @@
--	/* remove RSS configuration */
--	iavf_hash_uninit(adapter);
--
@@ -44,0 +56,44 @@
+diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
+index 0e85cd26a50..35b68cc8a98 100644
+--- a/drivers/net/iavf/iavf_hash.c
++++ b/drivers/net/iavf/iavf_hash.c
+@@ -77,7 +77,7 @@ static int
+ iavf_hash_destroy(struct iavf_adapter *ad, struct rte_flow *flow,
+ 		  struct rte_flow_error *error);
+ static void
+-iavf_hash_uninit(struct iavf_adapter *ad);
++iavf_hash_uninit_parser(struct iavf_adapter *ad);
+ static void
+ iavf_hash_free(struct rte_flow *flow);
+ static int
+@@ -680,7 +680,7 @@ static struct iavf_flow_engine iavf_hash_engine = {
+ 	.init = iavf_hash_init,
+ 	.create = iavf_hash_create,
+ 	.destroy = iavf_hash_destroy,
+-	.uninit = iavf_hash_uninit,
++	.uninit = iavf_hash_uninit_parser,
+ 	.free = iavf_hash_free,
+ 	.type = IAVF_FLOW_ENGINE_HASH,
+ };
+@@ -1639,6 +1639,12 @@ iavf_hash_destroy(__rte_unused struct iavf_adapter *ad,
+ }
+ 
+ static void
++iavf_hash_uninit_parser(struct iavf_adapter *ad)
++{
++	iavf_unregister_parser(&iavf_hash_parser, ad);
++}
++
++void
+ iavf_hash_uninit(struct iavf_adapter *ad)
+ {
+ 	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);
+@@ -1656,8 +1662,6 @@ iavf_hash_uninit(struct iavf_adapter *ad)
+ 	rss_conf = &ad->dev_data->dev_conf.rx_adv_conf.rss_conf;
+ 	if (iavf_rss_hash_set(ad, rss_conf->rss_hf, false))
+ 		PMD_DRV_LOG(ERR, "fail to delete default RSS");
+-
+-	iavf_unregister_parser(&iavf_hash_parser, ad);
+ }
+ 
+ static void