[dpdk-stable] patch 'gso: fix VxLAN/GRE tunnel checks' has been queued to LTS release 17.11.6

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 03/13/19. So please
shout if anyone has objection.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 8ea30870de7dd4de80c887eeabe5c1718a44f6fd Mon Sep 17 00:00:00 2001
From: Andrew Rybchenko <arybchenko at solarflare.com>
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 <arybchenko at solarflare.com>
Acked-by: Jiayu Hu <jiayu.hu at intel.com>
---
 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 145ea4953..25a015e47 100644
--- a/lib/librte_gso/gso_common.h
+++ b/lib/librte_gso/gso_common.h
@@ -51,12 +51,12 @@
 		(PKT_TX_TCP_SEG | PKT_TX_IPV4))
 
 #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.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-03-08 09:46:43.283304920 -0800
+++ 0063-gso-fix-VxLAN-GRE-tunnel-checks.patch	2019-03-08 09:46:40.336407000 -0800
@@ -1,15 +1,16 @@
-From 727663e88b3fbaa8183499a1b415f02b0a689319 Mon Sep 17 00:00:00 2001
+From 8ea30870de7dd4de80c887eeabe5c1718a44f6fd Mon Sep 17 00:00:00 2001
 From: Andrew Rybchenko <arybchenko at solarflare.com>
 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 at dpdk.org
 
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
 Acked-by: Jiayu Hu <jiayu.hu at intel.com>
@@ -18,10 +19,10 @@
  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
+index 145ea4953..25a015e47 100644
 --- a/lib/librte_gso/gso_common.h
 +++ b/lib/librte_gso/gso_common.h
-@@ -22,12 +22,12 @@
+@@ -51,12 +51,12 @@
  		(PKT_TX_TCP_SEG | PKT_TX_IPV4))
  
  #define IS_IPV4_VXLAN_TCP4(flag) (((flag) & (PKT_TX_TCP_SEG | PKT_TX_IPV4 | \