diff mbox series

[v2] gro: fix an error when packet is IPv6

Message ID 20201105025444.140140-1-yang_y_yi@163.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series [v2] gro: fix an error when packet is IPv6 |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/travis-robot success Travis build: passed
ci/Intel-compilation success Compilation OK
ci/iol-broadcom-Functional fail Functional Testing issues
ci/iol-testing success Testing PASS
ci/iol-intel-Functional fail Functional Testing issues
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS

Commit Message

yang_y_yi Nov. 5, 2020, 2:54 a.m. UTC 
  From: Yi Yang <yangyi01@inspur.com>

For VxLAN packets,  GRO will mistakenly reassemble them
if inner L3 is IPv6, inner L4 is TCP or UDP, and outer L3
is IPv4 because the value of IS_IPV4_VXLAN_TCP4/UDP4_PKT
is true for them.

This fix makes sure IS_IPV4_TCP_PKT, IS_IPV4_UDP_PKT,
IS_IPV4_VXLAN_TCP4_PKT and IS_IPV4_VXLAN_UDP4_PKT can make
decision precisely.

Fixes: e2d811063673 ("gro: support VXLAN UDP/IPv4")
Fixes: 1ca5e6740852 ("gro: support UDP/IPv4")
Fixes: 9e0b9d2ec0f4 ("gro: support VxLAN GRO")
Fixes: 0d2cbe59b719 ("lib/gro: support TCP/IPv4")
Signed-off-by: Yi Yang <yangyi01@inspur.com>
---
 lib/librte_gro/rte_gro.c | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

Comments

Hu, Jiayu Nov. 5, 2020, 6:08 a.m. UTC | #1 
Acked-by: Jiayu Hu <jiayu.hu@intel.com>

> -----Original Message-----
> From: yang_y_yi@163.com <yang_y_yi@163.com>
> Sent: Thursday, November 5, 2020 10:55 AM
> To: dev@dpdk.org
> Cc: Hu, Jiayu <jiayu.hu@intel.com>; Ananyev, Konstantin
> <konstantin.ananyev@intel.com>; thomas@monjalon.net;
> yangyi01@inspur.com; yang_y_yi@163.com
> Subject: [PATCH v2] gro: fix an error when packet is IPv6
> 
> From: Yi Yang <yangyi01@inspur.com>
> 
> For VxLAN packets,  GRO will mistakenly reassemble them
> if inner L3 is IPv6, inner L4 is TCP or UDP, and outer L3
> is IPv4 because the value of IS_IPV4_VXLAN_TCP4/UDP4_PKT
> is true for them.
> 
> This fix makes sure IS_IPV4_TCP_PKT, IS_IPV4_UDP_PKT,
> IS_IPV4_VXLAN_TCP4_PKT and IS_IPV4_VXLAN_UDP4_PKT can make
> decision precisely.
> 
> Fixes: e2d811063673 ("gro: support VXLAN UDP/IPv4")
> Fixes: 1ca5e6740852 ("gro: support UDP/IPv4")
> Fixes: 9e0b9d2ec0f4 ("gro: support VxLAN GRO")
> Fixes: 0d2cbe59b719 ("lib/gro: support TCP/IPv4")
> Signed-off-by: Yi Yang <yangyi01@inspur.com>
> ---
>  lib/librte_gro/rte_gro.c | 34 ++++++++++++++++++++--------------
>  1 file changed, 20 insertions(+), 14 deletions(-)
> 
> diff --git a/lib/librte_gro/rte_gro.c b/lib/librte_gro/rte_gro.c
> index e56bd20..8ca4da6 100644
> --- a/lib/librte_gro/rte_gro.c
> +++ b/lib/librte_gro/rte_gro.c
> @@ -32,32 +32,38 @@
>  			NULL};
> 
>  #define IS_IPV4_TCP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
> -		((ptype & RTE_PTYPE_L4_TCP) == RTE_PTYPE_L4_TCP))
> +		((ptype & RTE_PTYPE_L4_TCP) == RTE_PTYPE_L4_TCP) && \
> +		(RTE_ETH_IS_TUNNEL_PKT(ptype) == 0))
> 
>  #define IS_IPV4_UDP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
> -		((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP))
> +		((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
> +		(RTE_ETH_IS_TUNNEL_PKT(ptype) == 0))
> 
>  #define IS_IPV4_VXLAN_TCP4_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype)
> && \
>  		((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
>  		((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \
>  		 RTE_PTYPE_TUNNEL_VXLAN) && \
> -		 ((ptype & RTE_PTYPE_INNER_L4_TCP) == \
> -		  RTE_PTYPE_INNER_L4_TCP) && \
> -		  (((ptype & RTE_PTYPE_INNER_L3_MASK) & \
> -		    (RTE_PTYPE_INNER_L3_IPV4 | \
> -		     RTE_PTYPE_INNER_L3_IPV4_EXT | \
> -		     RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN)) != 0))
> +		((ptype & RTE_PTYPE_INNER_L4_TCP) == \
> +		 RTE_PTYPE_INNER_L4_TCP) && \
> +		(((ptype & RTE_PTYPE_INNER_L3_MASK) == \
> +		  RTE_PTYPE_INNER_L3_IPV4) || \
> +		 ((ptype & RTE_PTYPE_INNER_L3_MASK) == \
> +		  RTE_PTYPE_INNER_L3_IPV4_EXT) || \
> +		 ((ptype & RTE_PTYPE_INNER_L3_MASK) == \
> +		  RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN)))
> 
>  #define IS_IPV4_VXLAN_UDP4_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype)
> && \
>  		((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
>  		((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \
>  		 RTE_PTYPE_TUNNEL_VXLAN) && \
> -		 ((ptype & RTE_PTYPE_INNER_L4_UDP) == \
> -		  RTE_PTYPE_INNER_L4_UDP) && \
> -		  (((ptype & RTE_PTYPE_INNER_L3_MASK) & \
> -		    (RTE_PTYPE_INNER_L3_IPV4 | \
> -		     RTE_PTYPE_INNER_L3_IPV4_EXT | \
> -		     RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN)) != 0))
> +		((ptype & RTE_PTYPE_INNER_L4_UDP) == \
> +		 RTE_PTYPE_INNER_L4_UDP) && \
> +		(((ptype & RTE_PTYPE_INNER_L3_MASK) == \
> +		  RTE_PTYPE_INNER_L3_IPV4) || \
> +		 ((ptype & RTE_PTYPE_INNER_L3_MASK) == \
> +		  RTE_PTYPE_INNER_L3_IPV4_EXT) || \
> +		 ((ptype & RTE_PTYPE_INNER_L3_MASK) == \
> +		  RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN)))
> 
>  /*
>   * GRO context structure. It keeps the table structures, which are
> --
> 1.8.3.1
Thomas Monjalon Nov. 14, 2020, 8:47 a.m. UTC | #2 
> > For VxLAN packets,  GRO will mistakenly reassemble them
> > if inner L3 is IPv6, inner L4 is TCP or UDP, and outer L3
> > is IPv4 because the value of IS_IPV4_VXLAN_TCP4/UDP4_PKT
> > is true for them.
> > 
> > This fix makes sure IS_IPV4_TCP_PKT, IS_IPV4_UDP_PKT,
> > IS_IPV4_VXLAN_TCP4_PKT and IS_IPV4_VXLAN_UDP4_PKT can make
> > decision precisely.
> > 
> > Fixes: e2d811063673 ("gro: support VXLAN UDP/IPv4")
> > Fixes: 1ca5e6740852 ("gro: support UDP/IPv4")
> > Fixes: 9e0b9d2ec0f4 ("gro: support VxLAN GRO")
> > Fixes: 0d2cbe59b719 ("lib/gro: support TCP/IPv4")
> > Signed-off-by: Yi Yang <yangyi01@inspur.com>
> Acked-by: Jiayu Hu <jiayu.hu@intel.com>

Added missing Cc: stable@dpdk.org

Tried to be more precise in the title:
"gro: fix packet type detection with IPv6 tunnel"

Applied, thanks
diff mbox series

Patch

diff --git a/lib/librte_gro/rte_gro.c b/lib/librte_gro/rte_gro.c
index e56bd20..8ca4da6 100644
--- a/lib/librte_gro/rte_gro.c
+++ b/lib/librte_gro/rte_gro.c
@@ -32,32 +32,38 @@ 
 			NULL};
 
 #define IS_IPV4_TCP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
-		((ptype & RTE_PTYPE_L4_TCP) == RTE_PTYPE_L4_TCP))
+		((ptype & RTE_PTYPE_L4_TCP) == RTE_PTYPE_L4_TCP) && \
+		(RTE_ETH_IS_TUNNEL_PKT(ptype) == 0))
 
 #define IS_IPV4_UDP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
-		((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP))
+		((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
+		(RTE_ETH_IS_TUNNEL_PKT(ptype) == 0))
 
 #define IS_IPV4_VXLAN_TCP4_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
 		((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
 		((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \
 		 RTE_PTYPE_TUNNEL_VXLAN) && \
-		 ((ptype & RTE_PTYPE_INNER_L4_TCP) == \
-		  RTE_PTYPE_INNER_L4_TCP) && \
-		  (((ptype & RTE_PTYPE_INNER_L3_MASK) & \
-		    (RTE_PTYPE_INNER_L3_IPV4 | \
-		     RTE_PTYPE_INNER_L3_IPV4_EXT | \
-		     RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN)) != 0))
+		((ptype & RTE_PTYPE_INNER_L4_TCP) == \
+		 RTE_PTYPE_INNER_L4_TCP) && \
+		(((ptype & RTE_PTYPE_INNER_L3_MASK) == \
+		  RTE_PTYPE_INNER_L3_IPV4) || \
+		 ((ptype & RTE_PTYPE_INNER_L3_MASK) == \
+		  RTE_PTYPE_INNER_L3_IPV4_EXT) || \
+		 ((ptype & RTE_PTYPE_INNER_L3_MASK) == \
+		  RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN)))
 
 #define IS_IPV4_VXLAN_UDP4_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
 		((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
 		((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \
 		 RTE_PTYPE_TUNNEL_VXLAN) && \
-		 ((ptype & RTE_PTYPE_INNER_L4_UDP) == \
-		  RTE_PTYPE_INNER_L4_UDP) && \
-		  (((ptype & RTE_PTYPE_INNER_L3_MASK) & \
-		    (RTE_PTYPE_INNER_L3_IPV4 | \
-		     RTE_PTYPE_INNER_L3_IPV4_EXT | \
-		     RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN)) != 0))
+		((ptype & RTE_PTYPE_INNER_L4_UDP) == \
+		 RTE_PTYPE_INNER_L4_UDP) && \
+		(((ptype & RTE_PTYPE_INNER_L3_MASK) == \
+		  RTE_PTYPE_INNER_L3_IPV4) || \
+		 ((ptype & RTE_PTYPE_INNER_L3_MASK) == \
+		  RTE_PTYPE_INNER_L3_IPV4_EXT) || \
+		 ((ptype & RTE_PTYPE_INNER_L3_MASK) == \
+		  RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN)))
 
 /*
  * GRO context structure. It keeps the table structures, which are