[dpdk-stable] patch 'net/mvpp2: remove CRC length from MRU validation' 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/0595f2abf5c6eea34ce1aacb7240ed675efb15e3

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 0595f2abf5c6eea34ce1aacb7240ed675efb15e3 Mon Sep 17 00:00:00 2001
From: Liron Himi <lironh at marvell.com>
Date: Wed, 27 Jan 2021 18:09:18 +0200
Subject: [PATCH] net/mvpp2: remove CRC length from MRU validation

[ upstream commit 31536a6892ef9dfe98be26b65d9235d82ea9f9f1 ]

CRC is being removed by HW before packet get
write to the buffer, so CRC len should not be
included in MRU validation

Fixes: 79ec62028b9a ("net/mvpp2: update MTU and MRU related calculations")

Signed-off-by: Liron Himi <lironh at marvell.com>
Reviewed-by: Yuri Chipchev <yuric at marvell.com>
---
 drivers/net/mvpp2/mrvl_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 974a0fd142..93e340679c 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -443,8 +443,8 @@ mrvl_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 	 * when this feature has not been enabled/supported so far
 	 * (TODO check scattered_rx flag here once scattered RX is supported).
 	 */
-	if (mru + MRVL_PKT_OFFS > mbuf_data_size) {
-		mru = mbuf_data_size - MRVL_PKT_OFFS;
+	if (mru - RTE_ETHER_CRC_LEN + MRVL_PKT_OFFS > mbuf_data_size) {
+		mru = mbuf_data_size + RTE_ETHER_CRC_LEN - MRVL_PKT_OFFS;
 		mtu = MRVL_PP2_MRU_TO_MTU(mru);
 		MRVL_LOG(WARNING, "MTU too big, max MTU possible limitted "
 			"by current mbuf size: %u. Set MTU to %u, MRU to %u",
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:32.738958887 +0100
+++ 0115-net-mvpp2-remove-CRC-length-from-MRU-validation.patch	2021-02-04 12:04:28.150789845 +0100
@@ -1 +1 @@
-From 31536a6892ef9dfe98be26b65d9235d82ea9f9f1 Mon Sep 17 00:00:00 2001
+From 0595f2abf5c6eea34ce1aacb7240ed675efb15e3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 31536a6892ef9dfe98be26b65d9235d82ea9f9f1 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index e95c6e5992..476227b9a1 100644
+index 974a0fd142..93e340679c 100644
@@ -23 +24 @@
-@@ -441,8 +441,8 @@ mrvl_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+@@ -443,8 +443,8 @@ mrvl_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)