patch 'app/testpmd: fix GENEVE parsing in checksum mode' has been queued to stable release 20.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.5

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

Thanks.

Luca Boccassi

---
>From a274e8922f707146793b9c17fc27355f3f1bcaff Mon Sep 17 00:00:00 2001
From: Raja Zidane <rzidane at nvidia.com>
Date: Mon, 21 Feb 2022 15:24:23 +0200
Subject: [PATCH] app/testpmd: fix GENEVE parsing in checksum mode

[ upstream commit 993677affe391be8bb390c2625bc3d8bb857f0a5 ]

The csum FWD mode parses any received packet to set mbuf offloads for
the transmitting burst, mainly in the checksum/TSO areas.
In the case of a tunnel header, the csum FWD tries to detect known
tunnels by the standard definition using the header's data and fallback
to check the packet type in the mbuf to see if the Rx port driver
already sign the packet as a tunnel.
In the fallback case, the csum assumes the tunnel is VXLAN and parses
the tunnel as VXLAN.
When the GENEVE tunnel was added to the known tunnels in csum, its
parsing trial was wrongly located after the pkt type detection, causing
the csum to parse the GENEVE header as VXLAN when the Rx port set the
tunnel packet type.

Remove the fall back case to VXLAN.
Log error of unrecognized tunnel if no tunnel was parsed successfully.

Fixes: c10a026c3b03 ("app/testpmd: introduce vxlan parsing function in csum fwd engine")

Signed-off-by: Raja Zidane <rzidane at nvidia.com>
Acked-by: Aman Singh <aman.deep.singh at intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 app/test-pmd/csumonly.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index f06441d987..243ef3e47a 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -252,8 +252,7 @@ parse_gtp(struct rte_udp_hdr *udp_hdr,
 /* Parse a vxlan header */
 static void
 parse_vxlan(struct rte_udp_hdr *udp_hdr,
-	    struct testpmd_offload_info *info,
-	    uint32_t pkt_type)
+	    struct testpmd_offload_info *info)
 {
 	struct rte_ether_hdr *eth_hdr;
 
@@ -261,8 +260,7 @@ parse_vxlan(struct rte_udp_hdr *udp_hdr,
 	 * default vxlan port (rfc7348) or that the rx offload flag is set
 	 * (i40e only currently)
 	 */
-	if (udp_hdr->dst_port != _htons(RTE_VXLAN_DEFAULT_PORT) &&
-		RTE_ETH_IS_TUNNEL_PKT(pkt_type) == 0)
+	if (udp_hdr->dst_port != _htons(RTE_VXLAN_DEFAULT_PORT))
 		return;
 
 	update_tunnel_outer(info);
@@ -893,8 +891,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
 						PKT_TX_TUNNEL_VXLAN_GPE;
 					goto tunnel_update;
 				}
-				parse_vxlan(udp_hdr, &info,
-					    m->packet_type);
+				parse_vxlan(udp_hdr, &info);
 				if (info.is_tunnel) {
 					tx_ol_flags |=
 						PKT_TX_TUNNEL_VXLAN;
@@ -906,6 +903,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
 						PKT_TX_TUNNEL_GENEVE;
 					goto tunnel_update;
 				}
+				/* Always keep last. */
+				if (unlikely(RTE_ETH_IS_TUNNEL_PKT(
+							m->packet_type) != 0)) {
+					TESTPMD_LOG(DEBUG, "Unknown tunnel packet. UDP dst port: %hu",
+						udp_hdr->dst_port);
+				}
 			} else if (info.l4_proto == IPPROTO_GRE) {
 				struct simple_gre_hdr *gre_hdr;
 
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-28 21:17:56.539387001 +0000
+++ 0032-app-testpmd-fix-GENEVE-parsing-in-checksum-mode.patch	2022-02-28 21:17:53.956931773 +0000
@@ -1 +1 @@
-From 993677affe391be8bb390c2625bc3d8bb857f0a5 Mon Sep 17 00:00:00 2001
+From a274e8922f707146793b9c17fc27355f3f1bcaff Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 993677affe391be8bb390c2625bc3d8bb857f0a5 ]
+
@@ -23 +24,0 @@
-Cc: stable at dpdk.org
@@ -33 +34 @@
-index 02bc3929c7..5274d498ee 100644
+index f06441d987..243ef3e47a 100644
@@ -36 +37 @@
-@@ -258,8 +258,7 @@ parse_gtp(struct rte_udp_hdr *udp_hdr,
+@@ -252,8 +252,7 @@ parse_gtp(struct rte_udp_hdr *udp_hdr,
@@ -46 +47 @@
-@@ -267,8 +266,7 @@ parse_vxlan(struct rte_udp_hdr *udp_hdr,
+@@ -261,8 +260,7 @@ parse_vxlan(struct rte_udp_hdr *udp_hdr,
@@ -56,2 +57,2 @@
-@@ -922,8 +920,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
- 						RTE_MBUF_F_TX_TUNNEL_VXLAN_GPE;
+@@ -893,8 +891,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
+ 						PKT_TX_TUNNEL_VXLAN_GPE;
@@ -65,3 +66,3 @@
- 						RTE_MBUF_F_TX_TUNNEL_VXLAN;
-@@ -935,6 +932,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
- 						RTE_MBUF_F_TX_TUNNEL_GENEVE;
+ 						PKT_TX_TUNNEL_VXLAN;
+@@ -906,6 +903,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
+ 						PKT_TX_TUNNEL_GENEVE;