[dpdk-stable] patch 'app/testpmd: revert max Rx packet length adjustment' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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/11/20. 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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/93be79055bd21dc8909186107db7d2e4ccaba8bd

Thanks.

Luca Boccassi

---
>From 93be79055bd21dc8909186107db7d2e4ccaba8bd Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Thu, 5 Nov 2020 18:05:41 +0100
Subject: [PATCH] app/testpmd: revert max Rx packet length adjustment

[ upstream commit 13e0b599acfd7ec7d92a48c827be03bdc491429b ]

The fix of max_rx_pkt_len for allowing VLAN packets in all cases
was breaking configuration of some drivers. Example with virtio:

	Ethdev port_id=0 max_rx_pkt_len 11229 > max valid value 9728
	Fail to configure port 0

Trying to fix the logic was revealing other issues in some drivers.
That's why it is decided to revert.

The workaround for the original issue would be
to set the MTU explicitly from the application
with rte_eth_dev_set_mtu().
See RFC: https://patches.dpdk.org/patch/83756/

Fixes: f6870a7ed6b3 ("app/testpmd: fix max Rx packet length for VLAN packet")

Reported-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Lance Richardson <lance.richardson at broadcom.com>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 app/test-pmd/testpmd.c | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index cb4c365cb1..7f59cb02d1 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1301,7 +1301,6 @@ init_config(void)
 	struct rte_gro_param gro_param;
 	uint32_t gso_types;
 	uint16_t data_size;
-	uint16_t overhead_len;
 	bool warning = 0;
 	int k;
 	int ret;
@@ -1338,28 +1337,6 @@ init_config(void)
 			rte_exit(EXIT_FAILURE,
 				 "rte_eth_dev_info_get() failed\n");
 
-		/* Update the max_rx_pkt_len to have MTU as RTE_ETHER_MTU */
-		if (port->dev_info.max_rx_pktlen && port->dev_info.max_mtu)
-			overhead_len = port->dev_info.max_rx_pktlen -
-				port->dev_info.max_mtu;
-		else
-			overhead_len = RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
-
-		port->dev_conf.rxmode.max_rx_pkt_len =
-						RTE_ETHER_MTU + overhead_len;
-
-		/*
-		 * This is workaround to avoid resize max rx packet len.
-		 * Ethdev assumes jumbo frame size must be greater than
-		 * RTE_ETHER_MAX_LEN, and will resize 'max_rx_pkt_len' to
-		 * default value when it is greater than RTE_ETHER_MAX_LEN
-		 * for normal frame.
-		 */
-		if (port->dev_conf.rxmode.max_rx_pkt_len > RTE_ETHER_MAX_LEN) {
-			port->dev_conf.rxmode.offloads |=
-						DEV_RX_OFFLOAD_JUMBO_FRAME;
-		}
-
 		if (!(port->dev_info.tx_offload_capa &
 		      DEV_TX_OFFLOAD_MBUF_FAST_FREE))
 			port->dev_conf.txmode.offloads &=
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-09 18:49:40.643685401 +0000
+++ 0002-app-testpmd-revert-max-Rx-packet-length-adjustment.patch	2020-11-09 18:49:40.576079407 +0000
@@ -1 +1 @@
-From 13e0b599acfd7ec7d92a48c827be03bdc491429b Mon Sep 17 00:00:00 2001
+From 93be79055bd21dc8909186107db7d2e4ccaba8bd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 13e0b599acfd7ec7d92a48c827be03bdc491429b ]
+
@@ -21 +22,0 @@
-Cc: stable at dpdk.org
@@ -32 +33 @@
-index c263121a9a..33fc0fddf5 100644
+index cb4c365cb1..7f59cb02d1 100644
@@ -35 +36 @@
-@@ -1421,7 +1421,6 @@ init_config(void)
+@@ -1301,7 +1301,6 @@ init_config(void)
@@ -43 +44 @@
-@@ -1458,28 +1457,6 @@ init_config(void)
+@@ -1338,28 +1337,6 @@ init_config(void)