[dpdk-stable] patch 'net/dpaa: fix jumbo frame flag condition for MTU set' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

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/06/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/c9c7c11bb66d84b41844c6bae95c6f1585b61be6

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From c9c7c11bb66d84b41844c6bae95c6f1585b61be6 Mon Sep 17 00:00:00 2001
From: Steve Yang <stevex.yang at intel.com>
Date: Mon, 18 Jan 2021 07:04:09 +0000
Subject: [PATCH] net/dpaa: fix jumbo frame flag condition for MTU set

[ upstream commit 1d57225d0e6992d3671843cdfc3efe10cf5b068c ]

The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition,
but the Ether overhead is larger than 18 when it supports VLAN tag.
That will cause the jumbo flag rx offload is wrong when MTU size is
'RTE_ETHER_MTU'.

This fix will change the boundary condition with 'RTE_ETHER_MTU' and
overhead, that perhaps impacts the cases of the jumbo frame related.

Fixes: 25f854197abc ("net/dpaa: support jumbo frames")

Signed-off-by: Steve Yang <stevex.yang at intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
 drivers/net/dpaa/dpaa_ethdev.c | 2 +-
 drivers/net/dpaa/dpaa_ethdev.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index a54ec0deb6..4d5946103a 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -173,7 +173,7 @@ dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 		return -EINVAL;
 	}
 
-	if (frame_size > RTE_ETHER_MAX_LEN)
+	if (frame_size > DPAA_ETH_MAX_LEN)
 		dev->data->dev_conf.rxmode.offloads |=
 						DEV_RX_OFFLOAD_JUMBO_FRAME;
 	else
diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h
index da06f1faa1..9d27aa34bf 100644
--- a/drivers/net/dpaa/dpaa_ethdev.h
+++ b/drivers/net/dpaa/dpaa_ethdev.h
@@ -57,6 +57,10 @@
 #define VLAN_TAG_SIZE   4 /** < Vlan Header Length */
 #endif
 
+#define DPAA_ETH_MAX_LEN (RTE_ETHER_MTU + \
+			  RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + \
+			  VLAN_TAG_SIZE)
+
 /* PCD frame queues */
 #define DPAA_PCD_FQID_START		0x400
 #define DPAA_PCD_FQID_MULTIPLIER	0x100
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:30.459720462 +0100
+++ 0057-net-dpaa-fix-jumbo-frame-flag-condition-for-MTU-set.patch	2021-02-04 12:04:28.010789709 +0100
@@ -1 +1 @@
-From 1d57225d0e6992d3671843cdfc3efe10cf5b068c Mon Sep 17 00:00:00 2001
+From c9c7c11bb66d84b41844c6bae95c6f1585b61be6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1d57225d0e6992d3671843cdfc3efe10cf5b068c ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index f00279e004..0c87c136d7 100644
+index a54ec0deb6..4d5946103a 100644
@@ -28 +29 @@
-@@ -184,7 +184,7 @@ dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+@@ -173,7 +173,7 @@ dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
@@ -38 +39 @@
-index 659bceb467..a858b1372c 100644
+index da06f1faa1..9d27aa34bf 100644
@@ -41 +42 @@
-@@ -51,6 +51,10 @@
+@@ -57,6 +57,10 @@
@@ -50,2 +51,2 @@
- #define DPAA_DEFAULT_NUM_PCD_QUEUES	1
- #define DPAA_VSP_PROFILE_MAX_NUM	8
+ #define DPAA_PCD_FQID_START		0x400
+ #define DPAA_PCD_FQID_MULTIPLIER	0x100