patch 'net/nfp: fix internal buffer size and MTU check' has been queued to stable release 21.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.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 11/14/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/a38a7de14d3ba2745f78f7685f60fc10f5af5c91

Thanks.

Kevin

---
From a38a7de14d3ba2745f78f7685f60fc10f5af5c91 Mon Sep 17 00:00:00 2001
From: Peng Zhang <peng.zhang@corigine.com>
Date: Fri, 21 Oct 2022 14:27:46 +0800
Subject: [PATCH] net/nfp: fix internal buffer size and MTU check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit dbad6f64f9210afc50566a87f0e25f925c3b0f90 ]

When MTU is bigger than hw->flbufsz, it can't work. hw->flbufsz is set
in the nfp_net_rx_queue_setup().

At first, in the nfp_net_configure(), the hw->flbufsz isn't set the
value, it just judge the initialized value and MTU, it is unreasonable.

Now, it just check the MTU can't be more than the NFP_FRAME_SIZE_MAX in
the nfp_net_configure(), when hw->flbufsz is set the value, in the
nfp_net_start(), judge the hw->flbufsz and MTU.

Fixes: 5c305e218f15 ("net/nfp: fix initialization")

Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
 drivers/net/nfp/nfp_common.c    | 6 +++---
 drivers/net/nfp/nfp_ethdev.c    | 8 +++++++-
 drivers/net/nfp/nfp_ethdev_vf.c | 1 -
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
index 34e3a03edd..b81eec58d3 100644
--- a/drivers/net/nfp/nfp_common.c
+++ b/drivers/net/nfp/nfp_common.c
@@ -178,7 +178,7 @@ nfp_net_configure(struct rte_eth_dev *dev)
 
 	/* Checking MTU set */
-	if (rxmode->mtu > hw->flbufsz) {
-		PMD_INIT_LOG(INFO, "MTU (%u) larger then current mbufsize (%u) not supported",
-				    rxmode->mtu, hw->flbufsz);
+	if (rxmode->mtu > NFP_FRAME_SIZE_MAX) {
+		PMD_INIT_LOG(ERR, "MTU (%u) larger than NFP_FRAME_SIZE_MAX (%u) not supported",
+				    rxmode->mtu, NFP_FRAME_SIZE_MAX);
 		return -ERANGE;
 	}
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 67a77f0567..74f4c1edeb 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -133,4 +133,11 @@ nfp_net_start(struct rte_eth_dev *dev)
 	}
 
+	/* Checking MTU set */
+	if (dev->data->mtu > hw->flbufsz) {
+		PMD_INIT_LOG(ERR, "MTU (%u) can't be larger than the current NFP_FRAME_SIZE (%u)",
+				dev->data->mtu, hw->flbufsz);
+		return -ERANGE;
+	}
+
 	rte_intr_enable(intr_handle);
 
@@ -503,5 +510,4 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
 	hw->max_mtu = nn_cfg_readl(hw, NFP_NET_CFG_MAX_MTU);
 	hw->mtu = RTE_ETHER_MTU;
-	hw->flbufsz = RTE_ETHER_MTU;
 
 	/* VLAN insertion is incompatible with LSOv2 */
diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c
index 0781f34764..0034d68ea6 100644
--- a/drivers/net/nfp/nfp_ethdev_vf.c
+++ b/drivers/net/nfp/nfp_ethdev_vf.c
@@ -370,5 +370,4 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)
 	hw->max_mtu = nn_cfg_readl(hw, NFP_NET_CFG_MAX_MTU);
 	hw->mtu = RTE_ETHER_MTU;
-	hw->flbufsz = RTE_ETHER_MTU;
 
 	/* VLAN insertion is incompatible with LSOv2 */
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-11 10:32:17.449832653 +0000
+++ 0015-net-nfp-fix-internal-buffer-size-and-MTU-check.patch	2022-11-11 10:32:17.035300611 +0000
@@ -1 +1 @@
-From dbad6f64f9210afc50566a87f0e25f925c3b0f90 Mon Sep 17 00:00:00 2001
+From a38a7de14d3ba2745f78f7685f60fc10f5af5c91 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit dbad6f64f9210afc50566a87f0e25f925c3b0f90 ]
+
@@ -20 +21,0 @@
-Cc: stable@dpdk.org
@@ -32 +33 @@
-index 9be2e215d5..277ea2381b 100644
+index 34e3a03edd..b81eec58d3 100644
@@ -47 +48 @@
-index f11a1b6eb2..fc36c4d1b6 100644
+index 67a77f0567..74f4c1edeb 100644
@@ -50 +51 @@
-@@ -115,4 +115,11 @@ nfp_net_start(struct rte_eth_dev *dev)
+@@ -133,4 +133,11 @@ nfp_net_start(struct rte_eth_dev *dev)
@@ -62 +63 @@
-@@ -603,5 +610,4 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
+@@ -503,5 +510,4 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
@@ -69 +70 @@
-index 6c6caefcb7..d1427b63bc 100644
+index 0781f34764..0034d68ea6 100644
@@ -72 +73 @@
-@@ -367,5 +367,4 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)
+@@ -370,5 +370,4 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)