[dpdk-stable] patch 'net/i40e: fix forward outer IPv6 VXLAN' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

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/12/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/137c9ce9929eef28f83e50650ee8b0ff4a49e3f4

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 137c9ce9929eef28f83e50650ee8b0ff4a49e3f4 Mon Sep 17 00:00:00 2001
From: Jie Wang <jie1x.wang at intel.com>
Date: Fri, 5 Nov 2021 11:37:05 +0800
Subject: [PATCH] net/i40e: fix forward outer IPv6 VXLAN
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 8cc79a1636cda2e9d6ba4cfd1cf16cf2a782ae1b ]

Testpmd forwards packets in checksum mode that it need to calculate
the checksum of each layer's protocol. Then it will fill flags and
header length into mbuf.

In process_outer_cksums, HW calculates the outer checksum if
tx_offloads contains outer UDP checksum otherwise SW calculates
the outer checksum.

When tx_offloads contains outer UDP checksum or outer IPv4 checksum,
mbuf will be filled with correct header length.

This patch added outer UDP checksum in tx_offload_capa and
I40E_TX_OFFLOAD_MASK, when we set csum hw outer-udp on that the
engine can forward outer IPv6 VXLAN packets.

Fixes: 7497d3e2f777 ("net/i40e: convert to new Tx offloads API")

Signed-off-by: Jie Wang <jie1x.wang at intel.com>
Acked-by: Beilei Xing <beilei.xing at intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 1 +
 drivers/net/i40e/i40e_rxtx.c   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index d2116910a0..a195281795 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -3842,6 +3842,7 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 		DEV_TX_OFFLOAD_IPIP_TNL_TSO |
 		DEV_TX_OFFLOAD_GENEVE_TNL_TSO |
 		DEV_TX_OFFLOAD_MULTI_SEGS |
+		DEV_TX_OFFLOAD_OUTER_UDP_CKSUM |
 		dev_info->tx_queue_offload_capa;
 	dev_info->dev_capa =
 		RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index d1659ef060..02389905ce 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -67,6 +67,7 @@
 		PKT_TX_QINQ_PKT |       \
 		PKT_TX_VLAN_PKT |	\
 		PKT_TX_TUNNEL_MASK |	\
+		PKT_TX_OUTER_UDP_CKSUM |	\
 		I40E_TX_IEEE1588_TMST)
 
 #define I40E_TX_OFFLOAD_NOTSUP_MASK \
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:12.372690449 +0800
+++ 0238-net-i40e-fix-forward-outer-IPv6-VXLAN.patch	2021-11-10 14:17:02.077411067 +0800
@@ -1 +1 @@
-From 8cc79a1636cda2e9d6ba4cfd1cf16cf2a782ae1b Mon Sep 17 00:00:00 2001
+From 137c9ce9929eef28f83e50650ee8b0ff4a49e3f4 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 8cc79a1636cda2e9d6ba4cfd1cf16cf2a782ae1b ]
@@ -22 +24,0 @@
-Cc: stable at dpdk.org
@@ -32 +34 @@
-index 9ea5f303ff..344cbd25d3 100644
+index d2116910a0..a195281795 100644
@@ -35,5 +37,5 @@
-@@ -3746,6 +3746,7 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
- 		RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO |
- 		RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO |
- 		RTE_ETH_TX_OFFLOAD_MULTI_SEGS |
-+		RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM |
+@@ -3842,6 +3842,7 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
+ 		DEV_TX_OFFLOAD_IPIP_TNL_TSO |
+ 		DEV_TX_OFFLOAD_GENEVE_TNL_TSO |
+ 		DEV_TX_OFFLOAD_MULTI_SEGS |
++		DEV_TX_OFFLOAD_OUTER_UDP_CKSUM |
@@ -44 +46 @@
-index 6ccb598677..41fe3bf481 100644
+index d1659ef060..02389905ce 100644
@@ -47,5 +49,5 @@
-@@ -65,6 +65,7 @@
- 		RTE_MBUF_F_TX_QINQ |       \
- 		RTE_MBUF_F_TX_VLAN |	\
- 		RTE_MBUF_F_TX_TUNNEL_MASK |	\
-+		RTE_MBUF_F_TX_OUTER_UDP_CKSUM |	\
+@@ -67,6 +67,7 @@
+ 		PKT_TX_QINQ_PKT |       \
+ 		PKT_TX_VLAN_PKT |	\
+ 		PKT_TX_TUNNEL_MASK |	\
++		PKT_TX_OUTER_UDP_CKSUM |	\