patch 'net/hns3: fix max packet size rollback in PF' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

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/26/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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/d7033074e07b4bdf22ecf82a42ccde6a13f93f49

Thanks.

Kevin

---
>From d7033074e07b4bdf22ecf82a42ccde6a13f93f49 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Fri, 28 Jan 2022 10:07:03 +0800
Subject: [PATCH] net/hns3: fix max packet size rollback in PF

[ upstream commit e8f1f783d1cd61faf12658df64726bca88b7ff63 ]

HNS3 PF driver use the hns->pf.mps to restore the MTU when a reset
occurs.
If user fails to configure the MTU, the MPS of PF may not be restored to
the original value.

Fixes: 25fb790f7868 ("net/hns3: fix HW buffer size on MTU update")
Fixes: 1f5ca0b460cd ("net/hns3: support some device operations")
Fixes: d51867db65c1 ("net/hns3: add initialization")

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 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index ef13d31d19..ac0c1fb5ec 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2088,5 +2088,4 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps)
 {
 	struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
-	uint16_t original_mps = hns->pf.mps;
 	int err;
 	int ret;
@@ -2098,5 +2097,4 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps)
 	}
 
-	hns->pf.mps = mps;
 	ret = hns3_buffer_alloc(hw);
 	if (ret) {
@@ -2105,13 +2103,12 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps)
 	}
 
+	hns->pf.mps = mps;
+
 	return 0;
 
 rollback:
-	err = hns3_set_mac_mtu(hw, original_mps);
-	if (err) {
+	err = hns3_set_mac_mtu(hw, hns->pf.mps);
+	if (err)
 		hns3_err(hw, "fail to rollback MTU, err = %d", err);
-		return ret;
-	}
-	hns->pf.mps = original_mps;
 
 	return ret;
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:47.389918256 +0000
+++ 0129-net-hns3-fix-max-packet-size-rollback-in-PF.patch	2022-02-21 15:22:44.259704504 +0000
@@ -1 +1 @@
-From e8f1f783d1cd61faf12658df64726bca88b7ff63 Mon Sep 17 00:00:00 2001
+From d7033074e07b4bdf22ecf82a42ccde6a13f93f49 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e8f1f783d1cd61faf12658df64726bca88b7ff63 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index a5114662d2..73bf209717 100644
+index ef13d31d19..ac0c1fb5ec 100644
@@ -26 +27 @@
-@@ -2076,5 +2076,4 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps)
+@@ -2088,5 +2088,4 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps)
@@ -32 +33 @@
-@@ -2086,5 +2085,4 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps)
+@@ -2098,5 +2097,4 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps)
@@ -38 +39 @@
-@@ -2093,13 +2091,12 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps)
+@@ -2105,13 +2103,12 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps)