From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 49F60A034F for ; Tue, 1 Mar 2022 11:45:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3EA27426DF; Tue, 1 Mar 2022 11:45:32 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 30FCD40DF6 for ; Tue, 1 Mar 2022 11:45:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fMQ4hwrIhQLmLOxaVJSe6/Tsz0+9gO06zy03Lz/Kx/M=; b=J32C+bHGgcItQUpON3t1ndhFckyExjb4wWeT6vTyhtaUvUDJYdV6cbjL5F3grKxxsxhjau +2sNrfllrys9a3wsCWQB96xZzdQXJ6C/7P48dCB7oQv1BhZPV3oGBoCNjX6Txt34zL2Rak /kBg7rHhGZ8tLm8jHND3kuqpbbZocFI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-519-dXmbu270OkOXTlgLEb1qzA-1; Tue, 01 Mar 2022 05:45:26 -0500 X-MC-Unique: dXmbu270OkOXTlgLEb1qzA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B079801AB2; Tue, 1 Mar 2022 10:45:25 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE60B6FB08; Tue, 1 Mar 2022 10:45:23 +0000 (UTC) From: Kevin Traynor To: Raja Zidane Cc: Aman Singh , Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix GENEVE parsing in checksum mode' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:25 +0000 Message-Id: <20220301104300.334382-69-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.1 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/06/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c1cf1a97351afb85863187a7439dda4dc5938a65 Thanks. Kevin --- >From c1cf1a97351afb85863187a7439dda4dc5938a65 Mon Sep 17 00:00:00 2001 From: Raja Zidane 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 Acked-by: Aman Singh Acked-by: Ferruh Yigit --- 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 0177284d9c..fb559e4ac2 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -258,6 +258,5 @@ parse_gtp(struct rte_udp_hdr *udp_hdr, 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; @@ -267,6 +266,5 @@ parse_vxlan(struct rte_udp_hdr *udp_hdr, * (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; @@ -913,6 +911,5 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) goto tunnel_update; } - parse_vxlan(udp_hdr, &info, - m->packet_type); + parse_vxlan(udp_hdr, &info); if (info.is_tunnel) { tx_ol_flags |= @@ -926,4 +923,10 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.296998993 +0000 +++ 0069-app-testpmd-fix-GENEVE-parsing-in-checksum-mode.patch 2022-03-01 10:41:01.373244112 +0000 @@ -1 +1 @@ -From 993677affe391be8bb390c2625bc3d8bb857f0a5 Mon Sep 17 00:00:00 2001 +From c1cf1a97351afb85863187a7439dda4dc5938a65 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 993677affe391be8bb390c2625bc3d8bb857f0a5 ] + @@ -23 +24,0 @@ -Cc: stable@dpdk.org @@ -33 +34 @@ -index 02bc3929c7..5274d498ee 100644 +index 0177284d9c..fb559e4ac2 100644 @@ -36 +37 @@ -@@ -259,6 +259,5 @@ parse_gtp(struct rte_udp_hdr *udp_hdr, +@@ -258,6 +258,5 @@ parse_gtp(struct rte_udp_hdr *udp_hdr, @@ -44 +45 @@ -@@ -268,6 +267,5 @@ parse_vxlan(struct rte_udp_hdr *udp_hdr, +@@ -267,6 +266,5 @@ parse_vxlan(struct rte_udp_hdr *udp_hdr, @@ -52 +53 @@ -@@ -923,6 +921,5 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) +@@ -913,6 +911,5 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) @@ -60 +61 @@ -@@ -936,4 +933,10 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) +@@ -926,4 +923,10 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)