From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 479021B526 for ; Thu, 7 Feb 2019 14:28:18 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 70B52C0D1F80; Thu, 7 Feb 2019 13:28:17 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.33.36.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 840CD600D7; Thu, 7 Feb 2019 13:28:16 +0000 (UTC) From: Kevin Traynor To: Andrew Rybchenko Cc: Jiayu Hu , dpdk stable Date: Thu, 7 Feb 2019 13:25:51 +0000 Message-Id: <20190207132614.20538-45-ktraynor@redhat.com> In-Reply-To: <20190207132614.20538-1-ktraynor@redhat.com> References: <20190207132614.20538-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 07 Feb 2019 13:28:17 +0000 (UTC) Subject: [dpdk-stable] patch 'gso: fix VxLAN/GRE tunnel checks' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Feb 2019 13:28:18 -0000 Hi, FYI, your patch has been queued to LTS release 18.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 02/14/19. 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. Thanks. Kevin Traynor --- >>From 15bfefb4bb1509d2409b3164fef57f1929d9f423 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Mon, 21 Jan 2019 06:42:38 +0000 Subject: [PATCH] gso: fix VxLAN/GRE tunnel checks [ upstream commit 727663e88b3fbaa8183499a1b415f02b0a689319 ] Tunnel type is an enum in PKT_TX_TUNNEL_MASK bits. As the result, for example, IPIP or MPLSinUDP tunnel packets may be incorrectly treated internally as VXLAN. Fixes: b058d92ea95d ("gso: support VxLAN GSO") Fixes: 70e737e448c7 ("gso: support GRE GSO") Signed-off-by: Andrew Rybchenko Acked-by: Jiayu Hu --- lib/librte_gso/gso_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_gso/gso_common.h b/lib/librte_gso/gso_common.h index 6cd764ff5..b6ff1b886 100644 --- a/lib/librte_gso/gso_common.h +++ b/lib/librte_gso/gso_common.h @@ -23,10 +23,10 @@ #define IS_IPV4_VXLAN_TCP4(flag) (((flag) & (PKT_TX_TCP_SEG | PKT_TX_IPV4 | \ - PKT_TX_OUTER_IPV4 | PKT_TX_TUNNEL_VXLAN)) == \ + PKT_TX_OUTER_IPV4 | PKT_TX_TUNNEL_MASK)) == \ (PKT_TX_TCP_SEG | PKT_TX_IPV4 | PKT_TX_OUTER_IPV4 | \ PKT_TX_TUNNEL_VXLAN)) #define IS_IPV4_GRE_TCP4(flag) (((flag) & (PKT_TX_TCP_SEG | PKT_TX_IPV4 | \ - PKT_TX_OUTER_IPV4 | PKT_TX_TUNNEL_GRE)) == \ + PKT_TX_OUTER_IPV4 | PKT_TX_TUNNEL_MASK)) == \ (PKT_TX_TCP_SEG | PKT_TX_IPV4 | PKT_TX_OUTER_IPV4 | \ PKT_TX_TUNNEL_GRE)) -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-02-07 13:19:56.597820962 +0000 +++ 0045-gso-fix-VxLAN-GRE-tunnel-checks.patch 2019-02-07 13:19:55.000000000 +0000 @@ -1,15 +1,16 @@ -From 727663e88b3fbaa8183499a1b415f02b0a689319 Mon Sep 17 00:00:00 2001 +From 15bfefb4bb1509d2409b3164fef57f1929d9f423 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Mon, 21 Jan 2019 06:42:38 +0000 Subject: [PATCH] gso: fix VxLAN/GRE tunnel checks +[ upstream commit 727663e88b3fbaa8183499a1b415f02b0a689319 ] + Tunnel type is an enum in PKT_TX_TUNNEL_MASK bits. As the result, for example, IPIP or MPLSinUDP tunnel packets may be incorrectly treated internally as VXLAN. Fixes: b058d92ea95d ("gso: support VxLAN GSO") Fixes: 70e737e448c7 ("gso: support GRE GSO") -Cc: stable@dpdk.org Signed-off-by: Andrew Rybchenko Acked-by: Jiayu Hu