patch 'net/hns3: fix secondary process reference count' 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/98389f055c357c035fdcbb8f409a99bbfd824328

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 98389f055c357c035fdcbb8f409a99bbfd824328 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Sat, 25 Dec 2021 18:53:42 +0800
Subject: [PATCH] net/hns3: fix secondary process reference count

[ upstream commit 323263717774df318d8a6e64ac8bfe546e03b8f6 ]

The "secondary_cnt" will be increased when a secondary process
initialized. But the value of this variable is not decreased when the
secondary process exits, which causes the primary process senses that
the secondary process still exists. As a result, the primary process
fails to send messages to the secondary process after the secondary
process exits.

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    | 5 +++--
 drivers/net/hns3/hns3_ethdev_vf.c | 6 ++++--
 drivers/net/hns3/hns3_mp.c        | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index a2676f84b0..d245c5db8b 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4749,6 +4749,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
 		rte_free(eth_dev->process_private);
 		eth_dev->process_private = NULL;
+		__atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
 		return;
 	}
 
@@ -5437,8 +5438,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
 				     "process, ret = %d", ret);
 			goto err_mp_init_secondary;
 		}
-
-		hw->secondary_cnt++;
+		__atomic_fetch_add(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
 		return 0;
 	}
 
@@ -5551,6 +5551,7 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
 		rte_free(eth_dev->process_private);
 		eth_dev->process_private = NULL;
+		__atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
 		return 0;
 	}
 
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 790e76a0db..972a6f00e4 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1653,6 +1653,8 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
 
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
 		rte_free(eth_dev->process_private);
+		eth_dev->process_private = NULL;
+		__atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
 		return;
     }
 
@@ -2291,8 +2293,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev)
 					  "process, ret = %d", ret);
 			goto err_mp_init_secondary;
 		}
-
-		hw->secondary_cnt++;
+		__atomic_fetch_add(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
 		return 0;
 	}
 
@@ -2386,6 +2387,7 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
 		rte_free(eth_dev->process_private);
 		eth_dev->process_private = NULL;
+		__atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
 		return 0;
 	}
 
diff --git a/drivers/net/hns3/hns3_mp.c b/drivers/net/hns3/hns3_mp.c
index a03f2cf13c..9b5ff475a9 100644
--- a/drivers/net/hns3/hns3_mp.c
+++ b/drivers/net/hns3/hns3_mp.c
@@ -132,7 +132,8 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum hns3_mp_req_type type)
 	int ret;
 	int i;
 
-	if (rte_eal_process_type() == RTE_PROC_SECONDARY || !hw->secondary_cnt)
+	if (rte_eal_process_type() == RTE_PROC_SECONDARY ||
+		__atomic_load_n(&hw->secondary_cnt, __ATOMIC_RELAXED) == 0)
 		return;
 	if (type != HNS3_MP_REQ_START_RXTX && type != HNS3_MP_REQ_STOP_RXTX) {
 		hns3_err(hw, "port %u unknown request (req_type %d)",
-- 
2.35.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-25 16:58:44.379511481 +0100
+++ 0002-net-hns3-fix-secondary-process-reference-count.patch	2022-02-25 16:58:44.176990357 +0100
@@ -1 +1 @@
-From 323263717774df318d8a6e64ac8bfe546e03b8f6 Mon Sep 17 00:00:00 2001
+From 98389f055c357c035fdcbb8f409a99bbfd824328 Mon Sep 17 00:00:00 2001
@@ -3 +3 @@
-Date: Tue, 2 Nov 2021 09:38:26 +0800
+Date: Sat, 25 Dec 2021 18:53:42 +0800
@@ -5,0 +6,2 @@
+[ upstream commit 323263717774df318d8a6e64ac8bfe546e03b8f6 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -19,4 +20,4 @@
- drivers/net/hns3/hns3_ethdev.c    | 10 +++++++---
- drivers/net/hns3/hns3_ethdev_vf.c | 10 +++++++---
- drivers/net/hns3/hns3_mp.c        |  4 +++-
- 3 files changed, 17 insertions(+), 7 deletions(-)
+ drivers/net/hns3/hns3_ethdev.c    | 5 +++--
+ drivers/net/hns3/hns3_ethdev_vf.c | 6 ++++--
+ drivers/net/hns3/hns3_mp.c        | 3 ++-
+ 3 files changed, 9 insertions(+), 5 deletions(-)
@@ -25 +26 @@
-index 03447c8d4a..dafaf31f65 100644
+index a2676f84b0..d245c5db8b 100644
@@ -28,6 +29,4 @@
-@@ -5850,8 +5850,10 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
- 	struct hns3_hw *hw = &hns->hw;
- 	int ret = 0;
- 
--	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-+	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+@@ -4749,6 +4749,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
+ 	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+ 		rte_free(eth_dev->process_private);
+ 		eth_dev->process_private = NULL;
@@ -35,2 +34,2 @@
- 		return 0;
-+	}
+ 		return;
+ 	}
@@ -38,3 +37 @@
- 	if (hw->adapter_state == HNS3_NIC_STARTED)
- 		ret = hns3_dev_stop(eth_dev);
-@@ -7377,7 +7379,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
+@@ -5437,8 +5438,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
@@ -43,0 +41 @@
+-
@@ -46 +43,0 @@
- 		hns3_tx_push_init(eth_dev);
@@ -49,3 +45,0 @@
-@@ -7480,8 +7482,10 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
- 
- 	PMD_INIT_FUNC_TRACE();
@@ -53,2 +47,4 @@
--	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-+	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+@@ -5551,6 +5551,7 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
+ 	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+ 		rte_free(eth_dev->process_private);
+ 		eth_dev->process_private = NULL;
@@ -57 +53 @@
-+	}
+ 	}
@@ -59,2 +54,0 @@
- 	if (hw->adapter_state < HNS3_NIC_CLOSING)
- 		hns3_dev_close(eth_dev);
@@ -62 +56 @@
-index 4a0d73fc29..41d61a8160 100644
+index 790e76a0db..972a6f00e4 100644
@@ -65,3 +59 @@
-@@ -1893,8 +1893,10 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
- 	struct hns3_hw *hw = &hns->hw;
- 	int ret = 0;
+@@ -1653,6 +1653,8 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
@@ -69,2 +61,3 @@
--	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-+	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+ 	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+ 		rte_free(eth_dev->process_private);
++		eth_dev->process_private = NULL;
@@ -72,2 +65,2 @@
- 		return 0;
-+	}
+ 		return;
+     }
@@ -75,3 +68 @@
- 	if (hw->adapter_state == HNS3_NIC_STARTED)
- 		ret = hns3vf_dev_stop(eth_dev);
-@@ -2685,7 +2687,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev)
+@@ -2291,8 +2293,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev)
@@ -80,0 +72 @@
+-
@@ -83 +74,0 @@
- 		hns3_tx_push_init(eth_dev);
@@ -86 +76,0 @@
-@@ -2787,8 +2789,10 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
@@ -88,4 +78,4 @@
- 	PMD_INIT_FUNC_TRACE();
- 
--	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-+	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+@@ -2386,6 +2387,7 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
+ 	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+ 		rte_free(eth_dev->process_private);
+ 		eth_dev->process_private = NULL;
@@ -94 +84 @@
-+	}
+ 	}
@@ -96,2 +85,0 @@
- 	if (hw->adapter_state < HNS3_NIC_CLOSING)
- 		hns3vf_dev_close(eth_dev);
@@ -99 +87 @@
-index cd514ac29c..c28598a53a 100644
+index a03f2cf13c..9b5ff475a9 100644
@@ -102 +90 @@
-@@ -150,8 +150,10 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum hns3_mp_req_type type)
+@@ -132,7 +132,8 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum hns3_mp_req_type type)
@@ -110,2 +98 @@
-+
- 	if (!mp_req_type_is_valid(type)) {
+ 	if (type != HNS3_MP_REQ_START_RXTX && type != HNS3_MP_REQ_STOP_RXTX) {
@@ -113 +99,0 @@
- 			 dev->data->port_id, type);