[dpdk-stable] patch 'net/hns3: fix maximum queues on configuration failure' has been queued to stable release 20.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.3

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

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/1fa5c27d2d45e71e78b192ae3b022ecaf680765e
the

Thanks.

Luca Boccassi

---
>From 1fa5c27d2d45e71e78b192ae3b022ecaf680765e Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Sun, 13 Jun 2021 10:31:55 +0800
Subject: [PATCH] net/hns3: fix maximum queues on configuration failure

[ upstream commit 5b96963f9d121cee0eaaa19c19eca0ddbeee73b7 ]

The "cfg_max_queues" maintains configured max queue numbers from user,
and is equal to the maximum of "nb_rx_queues" and "nb_tx_queues" in
"dev->data".

>From the ethdev layer framework, "nb_rx/tx_queues" in "dev->data" were set
to zero in rte_eth_dev_configure() if ops.dev_configure in PMD fails to be
executed, In addition, if ops.dev_configure in HNS3 PMD failed, the fake
queues are also cleared on a device that does not support independent Rx/Tx
queues.

Therefore, the "cfg_max_queues" should be also set to zero when
dev_configure fails.

Fixes: fa29fe45a7b4 ("net/hns3: support queue start and stop")

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    | 2 ++
 drivers/net/hns3/hns3_ethdev_vf.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 0079b56367..089c94b8e9 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2380,6 +2380,7 @@ hns3_dev_configure(struct rte_eth_dev *dev)
 	ret = hns3_set_fake_rx_or_tx_queues(dev, nb_rx_q, nb_tx_q);
 	if (ret) {
 		hns3_err(hw, "fail to set Rx/Tx fake queues, ret = %d.", ret);
+		hw->cfg_max_queues = 0;
 		return ret;
 	}
 
@@ -2439,6 +2440,7 @@ hns3_dev_configure(struct rte_eth_dev *dev)
 	return 0;
 
 cfg_err:
+	hw->cfg_max_queues = 0;
 	(void)hns3_set_fake_rx_or_tx_queues(dev, 0, 0);
 	hw->adapter_state = HNS3_NIC_INITIALIZED;
 
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 04b28a3a21..913484d2e3 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -802,6 +802,7 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
 	ret = hns3_set_fake_rx_or_tx_queues(dev, nb_rx_q, nb_tx_q);
 	if (ret) {
 		hns3_err(hw, "fail to set Rx/Tx fake queues, ret = %d.", ret);
+		hw->cfg_max_queues = 0;
 		return ret;
 	}
 
@@ -871,6 +872,7 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
 	return 0;
 
 cfg_err:
+	hw->cfg_max_queues = 0;
 	(void)hns3_set_fake_rx_or_tx_queues(dev, 0, 0);
 	hw->adapter_state = HNS3_NIC_INITIALIZED;
 
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-07-12 13:41:40.009596888 +0100
+++ 0064-net-hns3-fix-maximum-queues-on-configuration-failure.patch	2021-07-12 13:41:36.554123944 +0100
@@ -1 +1 @@
-From 5b96963f9d121cee0eaaa19c19eca0ddbeee73b7 Mon Sep 17 00:00:00 2001
+From 1fa5c27d2d45e71e78b192ae3b022ecaf680765e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5b96963f9d121cee0eaaa19c19eca0ddbeee73b7 ]
+
@@ -20 +21,0 @@
-Cc: stable at dpdk.org
@@ -30 +31 @@
-index ff219b8b52..d4561ffd90 100644
+index 0079b56367..089c94b8e9 100644
@@ -33 +34 @@
-@@ -2501,6 +2501,7 @@ hns3_dev_configure(struct rte_eth_dev *dev)
+@@ -2380,6 +2380,7 @@ hns3_dev_configure(struct rte_eth_dev *dev)
@@ -41 +42 @@
-@@ -2549,6 +2550,7 @@ hns3_dev_configure(struct rte_eth_dev *dev)
+@@ -2439,6 +2440,7 @@ hns3_dev_configure(struct rte_eth_dev *dev)
@@ -50 +51 @@
-index c5f320fc5b..e387cd6177 100644
+index 04b28a3a21..913484d2e3 100644
@@ -53 +54 @@
-@@ -804,6 +804,7 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
+@@ -802,6 +802,7 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
@@ -61 +62 @@
-@@ -863,6 +864,7 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
+@@ -871,6 +872,7 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)