[dpdk-stable] patch 'net/ice: fix outer UDP Tx checksum offload' 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/5319ac800171dcb06cec001973e1ad23fa32ae0c

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 5319ac800171dcb06cec001973e1ad23fa32ae0c Mon Sep 17 00:00:00 2001
From: Murphy Yang <murphyx.yang at intel.com>
Date: Mon, 23 Nov 2020 07:05:23 +0000
Subject: [PATCH] net/ice: fix outer UDP Tx checksum offload

[ upstream commit 2ed011776334a742296f2495e2e0c76a7354e7af ]

If hardware outer UDP Tx checksum offload enabled, it doesn't take
effect when 'IPv6/UDP/VXLAN' packet sent with wrong outer UDP checksum.

In order to take effect, set the 'L4T_CS' flag valid only when 'L4TUNT'
equals one and 'EIPT' is not zero. If 'L4T_CS' flag marked, the hardware
can calculate the outer tunneling UDP checksum.

Fixes: bd70c451532c ("net/ice: support Tx checksum offload for tunnel")

Signed-off-by: Murphy Yang <murphyx.yang at intel.com>
Tested-by: Wei Xie <weix.xie at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_rxtx.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 3030550bdc..42c6b82d23 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -2215,8 +2215,11 @@ ice_parse_tunneling_params(uint64_t ol_flags,
 	*cd_tunneling |= (tx_offload.l2_len >> 1) <<
 		ICE_TXD_CTX_QW0_NATLEN_S;
 
-	if ((ol_flags & PKT_TX_OUTER_UDP_CKSUM) &&
-	    (ol_flags & PKT_TX_OUTER_IP_CKSUM) &&
+	/**
+	 * Calculate the tunneling UDP checksum.
+	 * Shall be set only if L4TUNT = 01b and EIPT is not zero
+	 */
+	if (!(*cd_tunneling & ICE_TX_CTX_EIPT_NONE) &&
 	    (*cd_tunneling & ICE_TXD_CTX_UDP_TUNNELING))
 		*cd_tunneling |= ICE_TXD_CTX_QW0_L4T_CS_M;
 }
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:28.785900174 +0100
+++ 0014-net-ice-fix-outer-UDP-Tx-checksum-offload.patch	2021-02-04 12:04:27.830789535 +0100
@@ -1 +1 @@
-From 2ed011776334a742296f2495e2e0c76a7354e7af Mon Sep 17 00:00:00 2001
+From 5319ac800171dcb06cec001973e1ad23fa32ae0c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2ed011776334a742296f2495e2e0c76a7354e7af ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 5fbd68eafc..9769e216bf 100644
+index 3030550bdc..42c6b82d23 100644
@@ -27 +28 @@
-@@ -2319,8 +2319,11 @@ ice_parse_tunneling_params(uint64_t ol_flags,
+@@ -2215,8 +2215,11 @@ ice_parse_tunneling_params(uint64_t ol_flags,