[dpdk-stable] patch 'net/e1000: fix max Rx packet size' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/19/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/9b54e27c7fe23d8a4755b4bff6bc58fad00b152c

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 9b54e27c7fe23d8a4755b4bff6bc58fad00b152c Mon Sep 17 00:00:00 2001
From: Alvin Zhang <alvinx.zhang at intel.com>
Date: Thu, 8 Apr 2021 15:41:02 +0800
Subject: [PATCH] net/e1000: fix max Rx packet size

[ upstream commit ddbc8c16a97fd6662ecccf7e8431a9a3c7f43366 ]

According to E1000_ETH_OVERHEAD definition, max_rx_pkt_len contains
one VLAN tag size. Therefore when config RLPML register, if dual VLAN
not enabled there is no need to add VLAN tag size to max_rx_pkt_len,
otherwise only one another VLAN tag size should be added to.

Fixes: e51abef39382 ("igb: fix max RX packet size and support dual VLAN")

Signed-off-by: Alvin Zhang <alvinx.zhang at intel.com>
Tested-by: Lingli Chen <linglix.chen at intel.com>
Acked-by: Haiyue Wang <haiyue.wang at intel.com>
---
 drivers/net/e1000/igb_ethdev.c | 5 ++---
 drivers/net/e1000/igb_rxtx.c   | 9 ++++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 06ba55b875..96a1d42999 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -2710,8 +2710,7 @@ igb_vlan_hw_extend_disable(struct rte_eth_dev *dev)
 	/* Update maximum packet length */
 	if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME)
 		E1000_WRITE_REG(hw, E1000_RLPML,
-			dev->data->dev_conf.rxmode.max_rx_pkt_len +
-						VLAN_TAG_SIZE);
+				dev->data->dev_conf.rxmode.max_rx_pkt_len);
 }
 
 static void
@@ -2730,7 +2729,7 @@ igb_vlan_hw_extend_enable(struct rte_eth_dev *dev)
 	if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME)
 		E1000_WRITE_REG(hw, E1000_RLPML,
 			dev->data->dev_conf.rxmode.max_rx_pkt_len +
-						2 * VLAN_TAG_SIZE);
+						VLAN_TAG_SIZE);
 }
 
 static int
diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index 5260bbe341..cd70624c7f 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -2341,15 +2341,18 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
 	 * Configure support of jumbo frames, if any.
 	 */
 	if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
+		uint32_t max_len = dev->data->dev_conf.rxmode.max_rx_pkt_len;
+
 		rctl |= E1000_RCTL_LPE;
 
 		/*
 		 * Set maximum packet length by default, and might be updated
 		 * together with enabling/disabling dual VLAN.
 		 */
-		E1000_WRITE_REG(hw, E1000_RLPML,
-			dev->data->dev_conf.rxmode.max_rx_pkt_len +
-						VLAN_TAG_SIZE);
+		if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)
+			max_len += VLAN_TAG_SIZE;
+
+		E1000_WRITE_REG(hw, E1000_RLPML, max_len);
 	} else
 		rctl &= ~E1000_RCTL_LPE;
 
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:33.695181216 +0200
+++ 0109-net-e1000-fix-max-Rx-packet-size.patch	2021-05-17 17:40:29.315810609 +0200
@@ -1 +1 @@
-From ddbc8c16a97fd6662ecccf7e8431a9a3c7f43366 Mon Sep 17 00:00:00 2001
+From 9b54e27c7fe23d8a4755b4bff6bc58fad00b152c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ddbc8c16a97fd6662ecccf7e8431a9a3c7f43366 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 7d6d04abcb..3fdffe3294 100644
+index 06ba55b875..96a1d42999 100644
@@ -26 +27 @@
-@@ -2686,8 +2686,7 @@ igb_vlan_hw_extend_disable(struct rte_eth_dev *dev)
+@@ -2710,8 +2710,7 @@ igb_vlan_hw_extend_disable(struct rte_eth_dev *dev)
@@ -36 +37 @@
-@@ -2706,7 +2705,7 @@ igb_vlan_hw_extend_enable(struct rte_eth_dev *dev)
+@@ -2730,7 +2729,7 @@ igb_vlan_hw_extend_enable(struct rte_eth_dev *dev)
@@ -46 +47 @@
-index 45da4ed9d2..278d5d2712 100644
+index 5260bbe341..cd70624c7f 100644
@@ -49 +50 @@
-@@ -2343,15 +2343,18 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
+@@ -2341,15 +2341,18 @@ eth_igb_rx_init(struct rte_eth_dev *dev)