[dpdk-stable] patch 'net/hns3: fix secondary process reference count' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.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/12/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/0718b6168476e30ebccc8ed73c1984b0615043ef

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 0718b6168476e30ebccc8ed73c1984b0615043ef Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Tue, 2 Nov 2021 09:38:26 +0800
Subject: [PATCH] net/hns3: fix secondary process reference count
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 at huawei.com>
Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
---
 drivers/net/hns3/hns3_ethdev.c    | 11 +++++++----
 drivers/net/hns3/hns3_ethdev_vf.c | 11 +++++++----
 drivers/net/hns3/hns3_mp.c        |  4 +++-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index d318b9b7f7..8049573444 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -5199,8 +5199,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) {
+		__atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
 		return 0;
+	}
 
 	if (hw->adapter_state == HNS3_NIC_STARTED)
 		ret = hns3_dev_stop(eth_dev);
@@ -6287,8 +6289,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;
 	}
 
@@ -6387,8 +6388,10 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
 
 	PMD_INIT_FUNC_TRACE();
 
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+		__atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
 		return 0;
+	}
 
 	if (hw->adapter_state < HNS3_NIC_CLOSING)
 		hns3_dev_close(eth_dev);
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 086828180b..0f8ffe0c32 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1991,8 +1991,10 @@ hns3vf_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) {
+		__atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
 		return 0;
+	}
 
 	if (hw->adapter_state == HNS3_NIC_STARTED)
 		ret = hns3vf_dev_stop(eth_dev);
@@ -2764,8 +2766,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;
 	}
 
@@ -2863,8 +2864,10 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
 
 	PMD_INIT_FUNC_TRACE();
 
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+		__atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
 		return 0;
+	}
 
 	if (hw->adapter_state < HNS3_NIC_CLOSING)
 		hns3vf_dev_close(eth_dev);
diff --git a/drivers/net/hns3/hns3_mp.c b/drivers/net/hns3/hns3_mp.c
index 2a7654d272..32046b7612 100644
--- a/drivers/net/hns3/hns3_mp.c
+++ b/drivers/net/hns3/hns3_mp.c
@@ -130,9 +130,11 @@ 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)",
 			 dev->data->port_id, type);
 		return;
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:11.781254694 +0800
+++ 0224-net-hns3-fix-secondary-process-reference-count.patch	2021-11-10 14:17:02.044078006 +0800
@@ -1 +1 @@
-From 323263717774df318d8a6e64ac8bfe546e03b8f6 Mon Sep 17 00:00:00 2001
+From 0718b6168476e30ebccc8ed73c1984b0615043ef Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 323263717774df318d8a6e64ac8bfe546e03b8f6 ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
@@ -19,2 +21,2 @@
- drivers/net/hns3/hns3_ethdev.c    | 10 +++++++---
- drivers/net/hns3/hns3_ethdev_vf.c | 10 +++++++---
+ drivers/net/hns3/hns3_ethdev.c    | 11 +++++++----
+ drivers/net/hns3/hns3_ethdev_vf.c | 11 +++++++----
@@ -22 +24 @@
- 3 files changed, 17 insertions(+), 7 deletions(-)
+ 3 files changed, 17 insertions(+), 9 deletions(-)
@@ -25 +27 @@
-index 03447c8d4a..dafaf31f65 100644
+index d318b9b7f7..8049573444 100644
@@ -28 +30 @@
-@@ -5850,8 +5850,10 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
+@@ -5199,8 +5199,10 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
@@ -40 +42 @@
-@@ -7377,7 +7379,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
+@@ -6287,8 +6289,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
@@ -43,0 +46 @@
+-
@@ -46 +48,0 @@
- 		hns3_tx_push_init(eth_dev);
@@ -49 +51,2 @@
-@@ -7480,8 +7482,10 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
+ 
+@@ -6387,8 +6388,10 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
@@ -62 +65 @@
-index 4a0d73fc29..41d61a8160 100644
+index 086828180b..0f8ffe0c32 100644
@@ -65 +68 @@
-@@ -1893,8 +1893,10 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
+@@ -1991,8 +1991,10 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
@@ -77 +80 @@
-@@ -2685,7 +2687,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev)
+@@ -2764,8 +2766,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev)
@@ -80,0 +84 @@
+-
@@ -83 +86,0 @@
- 		hns3_tx_push_init(eth_dev);
@@ -86 +89,2 @@
-@@ -2787,8 +2789,10 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
+ 
+@@ -2863,8 +2864,10 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
@@ -99 +103 @@
-index cd514ac29c..c28598a53a 100644
+index 2a7654d272..32046b7612 100644
@@ -102 +106 @@
-@@ -150,8 +150,10 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum hns3_mp_req_type type)
+@@ -130,9 +130,11 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum hns3_mp_req_type type)
@@ -109,0 +114 @@
+ 	if (type != HNS3_MP_REQ_START_RXTX && type != HNS3_MP_REQ_STOP_RXTX) {
@@ -111 +115,0 @@
- 	if (!mp_req_type_is_valid(type)) {
@@ -113,0 +118 @@
+ 		return;