patch 'net/hns3: fix VLAN resources freeing' has been queued to stable release 24.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.4

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/05/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/bf519edbd90f036dd720444b2c1539abbfaa7524

Thanks.

Kevin

---
>From bf519edbd90f036dd720444b2c1539abbfaa7524 Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui at huawei.com>
Date: Fri, 22 Aug 2025 14:04:28 +0800
Subject: [PATCH] net/hns3: fix VLAN resources freeing

[ upstream commit 4816b1005bd650b4a1e10af913c497bec860bec5 ]

In the initialization process, it is necessary to release VLAN resources
on the failure branch.

Additionally, encapsulate a function hns3_uninit_hardware() to release
the resources allocated by the hns3_init_hardware() function.

Fixes: 411d23b9eafb ("net/hns3: support VLAN")

Signed-off-by: Dengdui Huang <huangdengdui at huawei.com>
---
 drivers/net/hns3/hns3_ethdev.c | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 50c6ed0744..0c9a83eca4 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4433,5 +4433,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
 	if (ret) {
 		PMD_INIT_LOG(ERR, "Failed to init dcb: %d", ret);
-		goto err_mac_init;
+		goto rm_vlan_table;
 	}
 
@@ -4439,5 +4439,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
 	if (ret) {
 		PMD_INIT_LOG(ERR, "Failed to init flow director: %d", ret);
-		goto err_mac_init;
+		goto rm_vlan_table;
 	}
 
@@ -4445,5 +4445,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
 	if (ret) {
 		PMD_INIT_LOG(ERR, "Failed to config tso: %d", ret);
-		goto err_mac_init;
+		goto rm_vlan_table;
 	}
 
@@ -4451,5 +4451,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
 	if (ret) {
 		PMD_INIT_LOG(ERR, "Failed to config gro: %d", ret);
-		goto err_mac_init;
+		goto rm_vlan_table;
 	}
 
@@ -4463,5 +4463,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
 	if (ret) {
 		PMD_INIT_LOG(ERR, "Failed to init ring intr vector: %d", ret);
-		goto err_mac_init;
+		goto rm_vlan_table;
 	}
 
@@ -4469,9 +4469,10 @@ hns3_init_hardware(struct hns3_adapter *hns)
 	if (ret) {
 		PMD_INIT_LOG(ERR, "Failed to init PTP, ret = %d", ret);
-		goto err_mac_init;
+		goto rm_vlan_table;
 	}
 
 	return 0;
-
+rm_vlan_table:
+	hns3_rm_all_vlan_table(hns, true);
 err_mac_init:
 	hns3_uninit_umv_space(hw);
@@ -4479,4 +4480,14 @@ err_mac_init:
 }
 
+static void
+hns3_uninit_hardware(struct hns3_hw *hw)
+{
+	struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
+
+	(void)hns3_uninit_umv_space(hw);
+	hns3_ptp_uninit(hw);
+	hns3_rm_all_vlan_table(hns, true);
+}
+
 static int
 hns3_clear_hw(struct hns3_hw *hw)
@@ -4690,6 +4701,5 @@ err_enable_intr:
 	hns3_fdir_filter_uninit(hns);
 err_fdir:
-	hns3_uninit_umv_space(hw);
-	hns3_ptp_uninit(hw);
+	hns3_uninit_hardware(hw);
 err_init_hw:
 	hns3_stats_uninit(hw);
@@ -4726,6 +4736,5 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev)
 	hns3_flow_uninit(eth_dev);
 	hns3_fdir_filter_uninit(hns);
-	hns3_uninit_umv_space(hw);
-	hns3_ptp_uninit(hw);
+	hns3_uninit_hardware(hw);
 	hns3_stats_uninit(hw);
 	hns3_config_mac_tnl_int(hw, false);
-- 
2.51.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-10-31 13:53:55.081230233 +0000
+++ 0093-net-hns3-fix-VLAN-resources-freeing.patch	2025-10-31 13:53:52.269524095 +0000
@@ -1 +1 @@
-From 4816b1005bd650b4a1e10af913c497bec860bec5 Mon Sep 17 00:00:00 2001
+From bf519edbd90f036dd720444b2c1539abbfaa7524 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4816b1005bd650b4a1e10af913c497bec860bec5 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index a809a47423..b2eab7e1c5 100644
+index 50c6ed0744..0c9a83eca4 100644
@@ -24 +25 @@
-@@ -4367,5 +4367,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
+@@ -4433,5 +4433,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
@@ -31 +32 @@
-@@ -4373,5 +4373,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
+@@ -4439,5 +4439,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
@@ -38 +39 @@
-@@ -4379,5 +4379,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
+@@ -4445,5 +4445,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
@@ -45 +46 @@
-@@ -4385,5 +4385,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
+@@ -4451,5 +4451,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
@@ -52 +53 @@
-@@ -4397,5 +4397,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
+@@ -4463,5 +4463,5 @@ hns3_init_hardware(struct hns3_adapter *hns)
@@ -59 +60 @@
-@@ -4403,9 +4403,10 @@ hns3_init_hardware(struct hns3_adapter *hns)
+@@ -4469,9 +4469,10 @@ hns3_init_hardware(struct hns3_adapter *hns)
@@ -72 +73 @@
-@@ -4413,4 +4414,14 @@ err_mac_init:
+@@ -4479,4 +4480,14 @@ err_mac_init:
@@ -87 +88 @@
-@@ -4624,6 +4635,5 @@ err_enable_intr:
+@@ -4690,6 +4701,5 @@ err_enable_intr:
@@ -95 +96 @@
-@@ -4660,6 +4670,5 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev)
+@@ -4726,6 +4736,5 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev)