patch 'net/hns3: unregister MP action on close for secondary' has been queued to stable release 19.11.12

[christian.ehrhardt@canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.12

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/27/22. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/48d18f507a1ee6d64d7f46c37292cd5404a0aee7

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 48d18f507a1ee6d64d7f46c37292cd5404a0aee7 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Sat, 25 Dec 2021 18:53:44 +0800
Subject: [PATCH] net/hns3: unregister MP action on close for secondary

[ upstream commit 443242212baeb67d298c54cc927553c92aa29bec ]

This patch fixes lack of unregistering MP action for secondary process
when PMD is closed.

Fixes: 9570b1fdbdad ("net/hns3: check multi-process action register result")
Fixes: 23d4b61fee5d ("net/hns3: support multiple process")

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
---
 drivers/net/hns3/hns3_ethdev.c    | 6 ++++--
 drivers/net/hns3/hns3_ethdev_vf.c | 6 ++++--
 drivers/net/hns3/hns3_mp.c        | 5 +----
 drivers/net/hns3/hns3_mp.h        | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 122a2bc66c..df76dfce7f 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4750,6 +4750,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
 		rte_free(eth_dev->process_private);
 		eth_dev->process_private = NULL;
 		__atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
+		hns3_mp_uninit();
 		return;
 	}
 
@@ -4768,7 +4769,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
 	rte_free(hw->reset.wait_data);
 	rte_free(eth_dev->process_private);
 	eth_dev->process_private = NULL;
-	hns3_mp_uninit_primary();
+	hns3_mp_uninit();
 	hns3_warn(hw, "Close port %d finished", hw->data->port_id);
 }
 
@@ -5529,7 +5530,7 @@ err_init_pf:
 	rte_free(hw->reset.wait_data);
 
 err_init_reset:
-	hns3_mp_uninit_primary();
+	hns3_mp_uninit();
 
 err_mp_init_primary:
 err_mp_init_secondary:
@@ -5554,6 +5555,7 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
 		rte_free(eth_dev->process_private);
 		eth_dev->process_private = NULL;
 		__atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
+		hns3_mp_uninit();
 		return 0;
 	}
 
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 562f6f7662..dbd46cd278 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1655,6 +1655,7 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
 		rte_free(eth_dev->process_private);
 		eth_dev->process_private = NULL;
 		__atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
+		hns3_mp_uninit();
 		return;
     }
 
@@ -1672,7 +1673,7 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
 	rte_free(hw->reset.wait_data);
 	rte_free(eth_dev->process_private);
 	eth_dev->process_private = NULL;
-	hns3_mp_uninit_primary();
+	hns3_mp_uninit();
 	hns3_warn(hw, "Close port %d finished", hw->data->port_id);
 }
 
@@ -2364,7 +2365,7 @@ err_init_vf:
 	rte_free(hw->reset.wait_data);
 
 err_init_reset:
-	hns3_mp_uninit_primary();
+	hns3_mp_uninit();
 
 err_mp_init_primary:
 err_mp_init_secondary:
@@ -2390,6 +2391,7 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
 		rte_free(eth_dev->process_private);
 		eth_dev->process_private = NULL;
 		__atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
+		hns3_mp_uninit();
 		return 0;
 	}
 
diff --git a/drivers/net/hns3/hns3_mp.c b/drivers/net/hns3/hns3_mp.c
index c7e49a798a..b017387efd 100644
--- a/drivers/net/hns3/hns3_mp.c
+++ b/drivers/net/hns3/hns3_mp.c
@@ -213,10 +213,7 @@ int hns3_mp_init_primary(void)
 	return 0;
 }
 
-/*
- * Un-initialize by primary process.
- */
-void hns3_mp_uninit_primary(void)
+void hns3_mp_uninit(void)
 {
 	process_data.eth_dev_cnt--;
 
diff --git a/drivers/net/hns3/hns3_mp.h b/drivers/net/hns3/hns3_mp.h
index 8ef432e763..ef334648ff 100644
--- a/drivers/net/hns3/hns3_mp.h
+++ b/drivers/net/hns3/hns3_mp.h
@@ -15,7 +15,7 @@ extern struct hns3_process_local_data process_data;
 void hns3_mp_req_start_rxtx(struct rte_eth_dev *dev);
 void hns3_mp_req_stop_rxtx(struct rte_eth_dev *dev);
 int hns3_mp_init_primary(void);
-void hns3_mp_uninit_primary(void);
+void hns3_mp_uninit(void);
 int hns3_mp_init_secondary(void);
 
 #endif /* _HNS3_MP_H_ */
-- 
2.35.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-25 16:58:44.465601605 +0100
+++ 0004-net-hns3-unregister-MP-action-on-close-for-secondary.patch	2022-02-25 16:58:44.192990370 +0100
@@ -1 +1 @@
-From 443242212baeb67d298c54cc927553c92aa29bec Mon Sep 17 00:00:00 2001
+From 48d18f507a1ee6d64d7f46c37292cd5404a0aee7 Mon Sep 17 00:00:00 2001
@@ -3 +3 @@
-Date: Tue, 2 Nov 2021 09:38:28 +0800
+Date: Sat, 25 Dec 2021 18:53:44 +0800
@@ -5,0 +6,2 @@
+[ upstream commit 443242212baeb67d298c54cc927553c92aa29bec ]
+
@@ -22 +24 @@
-index 874854da61..88abbb84ea 100644
+index 122a2bc66c..df76dfce7f 100644
@@ -25,3 +27,3 @@
-@@ -5852,6 +5852,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
- 
- 	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+@@ -4750,6 +4750,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
+ 		rte_free(eth_dev->process_private);
+ 		eth_dev->process_private = NULL;
@@ -30 +32 @@
- 		return 0;
+ 		return;
@@ -33,3 +35 @@
-@@ -5868,7 +5869,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
- 	hns3_uninit_pf(eth_dev);
- 	hns3_free_all_queues(eth_dev);
+@@ -4768,7 +4769,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
@@ -36,0 +37,2 @@
+ 	rte_free(eth_dev->process_private);
+ 	eth_dev->process_private = NULL;
@@ -39 +41,2 @@
- 	hns3_warn(hw, "Close port %u finished", hw->data->port_id);
+ 	hns3_warn(hw, "Close port %d finished", hw->data->port_id);
+ }
@@ -41,2 +44 @@
- 	return ret;
-@@ -7463,7 +7464,7 @@ err_init_pf:
+@@ -5529,7 +5530,7 @@ err_init_pf:
@@ -51,3 +53,3 @@
-@@ -7486,6 +7487,7 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
- 
- 	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+@@ -5554,6 +5555,7 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
+ 		rte_free(eth_dev->process_private);
+ 		eth_dev->process_private = NULL;
@@ -60 +62 @@
-index 91acd1f5dd..f7f615bf72 100644
+index 562f6f7662..dbd46cd278 100644
@@ -63,3 +65,3 @@
-@@ -1895,6 +1895,7 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
- 
- 	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+@@ -1655,6 +1655,7 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
+ 		rte_free(eth_dev->process_private);
+ 		eth_dev->process_private = NULL;
@@ -68,2 +70,2 @@
- 		return 0;
- 	}
+ 		return;
+     }
@@ -71,3 +73 @@
-@@ -1910,7 +1911,7 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
- 	hns3vf_uninit_vf(eth_dev);
- 	hns3_free_all_queues(eth_dev);
+@@ -1672,7 +1673,7 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
@@ -74,0 +75,2 @@
+ 	rte_free(eth_dev->process_private);
+ 	eth_dev->process_private = NULL;
@@ -77 +79,2 @@
- 	hns3_warn(hw, "Close port %u finished", hw->data->port_id);
+ 	hns3_warn(hw, "Close port %d finished", hw->data->port_id);
+ }
@@ -79,2 +82 @@
- 	return ret;
-@@ -2769,7 +2770,7 @@ err_init_vf:
+@@ -2364,7 +2365,7 @@ err_init_vf:
@@ -89,3 +91,3 @@
-@@ -2793,6 +2794,7 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
- 
- 	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+@@ -2390,6 +2391,7 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
+ 		rte_free(eth_dev->process_private);
+ 		eth_dev->process_private = NULL;
@@ -98 +100 @@
-index 1a79d249b8..6d33bf49cd 100644
+index c7e49a798a..b017387efd 100644
@@ -101 +103 @@
-@@ -244,10 +244,7 @@ int hns3_mp_init_primary(void)
+@@ -213,10 +213,7 @@ int hns3_mp_init_primary(void)
@@ -114 +116 @@
-index b49532f985..5738ab74a5 100644
+index 8ef432e763..ef334648ff 100644
@@ -117,3 +119,3 @@
-@@ -18,7 +18,7 @@ void hns3_mp_req_start_tx(struct rte_eth_dev *dev);
- void hns3_mp_req_stop_tx(struct rte_eth_dev *dev);
- 
+@@ -15,7 +15,7 @@ extern struct hns3_process_local_data process_data;
+ void hns3_mp_req_start_rxtx(struct rte_eth_dev *dev);
+ void hns3_mp_req_stop_rxtx(struct rte_eth_dev *dev);