[dpdk-stable] patch 'net/mvpp2: fix frame size checking' 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/6b5aae6fbf648e26e3316f68260339ab516cf3e6

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 6b5aae6fbf648e26e3316f68260339ab516cf3e6 Mon Sep 17 00:00:00 2001
From: Liron Himi <lironh at marvell.com>
Date: Wed, 27 Jan 2021 18:09:19 +0200
Subject: [PATCH] net/mvpp2: fix frame size checking

[ upstream commit 1c9a958a8bfb7cb4e2082b97d01849d4ba91c13b ]

Need to add CRC len to the frame-size to compare against
max_rx_pkt_len which includes it.

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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 93e340679c..fe4cadda04 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -1696,7 +1696,8 @@ mrvl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
 		return -EFAULT;
 	}
 
-	frame_size = buf_size - RTE_PKTMBUF_HEADROOM - MRVL_PKT_EFFEC_OFFS;
+	frame_size = buf_size - RTE_PKTMBUF_HEADROOM -
+		     MRVL_PKT_EFFEC_OFFS + RTE_ETHER_CRC_LEN;
 	if (frame_size < max_rx_pkt_len) {
 		MRVL_LOG(WARNING,
 			"Mbuf size must be increased to %u bytes to hold up "
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:32.780724928 +0100
+++ 0116-net-mvpp2-fix-frame-size-checking.patch	2021-02-04 12:04:28.154789849 +0100
@@ -1 +1 @@
-From 1c9a958a8bfb7cb4e2082b97d01849d4ba91c13b Mon Sep 17 00:00:00 2001
+From 6b5aae6fbf648e26e3316f68260339ab516cf3e6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1c9a958a8bfb7cb4e2082b97d01849d4ba91c13b ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 476227b9a1..db81135f1b 100644
+index 93e340679c..fe4cadda04 100644
@@ -22 +23 @@
-@@ -1699,7 +1699,8 @@ mrvl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
+@@ -1696,7 +1696,8 @@ mrvl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,