diff mbox series

gso: fix VxLAN/GRE tunnel checks

Message ID 1547818111-21817-1-git-send-email-arybchenko@solarflare.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series gso: fix VxLAN/GRE tunnel checks |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS

Commit Message

Andrew Rybchenko Jan. 18, 2019, 1:28 p.m. UTC 
  Tunnel type is an enum in PKT_TX_TUNNEL_MASK bits.

Fixes: b058d92ea95d ("gso: support VxLAN GSO")
Fixes: 70e737e448c7 ("gso: support GRE GSO")
Cc: stable@dpdk.org

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 lib/librte_gso/gso_common.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Hu, Jiayu Jan. 19, 2019, 1:31 p.m. UTC | #1 
Hi Andrew,

Would you please give more explanation about the problem that
the patch wants to fix?

Thanks,
Jiayu
> -----Original Message-----
> From: Andrew Rybchenko [mailto:arybchenko@solarflare.com]
> Sent: Friday, January 18, 2019 9:29 PM
> To: Hu, Jiayu <jiayu.hu@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: [PATCH] gso: fix VxLAN/GRE tunnel checks
> 
> Tunnel type is an enum in PKT_TX_TUNNEL_MASK bits.
> 
> Fixes: b058d92ea95d ("gso: support VxLAN GSO")
> Fixes: 70e737e448c7 ("gso: support GRE GSO")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.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 6cd764ff5..b6ff1b886 100644
> --- a/lib/librte_gso/gso_common.h
> +++ b/lib/librte_gso/gso_common.h
> @@ -22,12 +22,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.17.1
Andrew Rybchenko Jan. 20, 2019, 9:58 a.m. UTC | #2 
On 1/19/19 4:31 PM, Hu, Jiayu wrote:
> Hi Andrew,
>
> Would you please give more explanation about the problem that
> the patch wants to fix?

Let's consider if tunnel is IPIP (0x3ULL << 45) or MPLSINUDP (0x5ULL << 45).
If so flags & VXLAN (0x1ULL << 45), still makes (0x1ULL << 45)==VXLAN,
but it is not a VXLAN tunnel packet.

Andrew.

>
> Thanks,
> Jiayu
>> -----Original Message-----
>> From: Andrew Rybchenko [mailto:arybchenko@solarflare.com]
>> Sent: Friday, January 18, 2019 9:29 PM
>> To: Hu, Jiayu <jiayu.hu@intel.com>
>> Cc: dev@dpdk.org; stable@dpdk.org
>> Subject: [PATCH] gso: fix VxLAN/GRE tunnel checks
>>
>> Tunnel type is an enum in PKT_TX_TUNNEL_MASK bits.
>>
>> Fixes: b058d92ea95d ("gso: support VxLAN GSO")
>> Fixes: 70e737e448c7 ("gso: support GRE GSO")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.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 6cd764ff5..b6ff1b886 100644
>> --- a/lib/librte_gso/gso_common.h
>> +++ b/lib/librte_gso/gso_common.h
>> @@ -22,12 +22,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.17.1
Hu, Jiayu Jan. 20, 2019, 1:27 p.m. UTC | #3 
Yes, this is a bug. Thanks for catching it.

But the commit log doesn’t tell what issue the patch fixes. Can you
add it in the commit log?

Thanks,
Jiayu
From: Andrew Rybchenko [mailto:arybchenko@solarflare.com]
Sent: Sunday, January 20, 2019 5:59 PM
To: Hu, Jiayu <jiayu.hu@intel.com>
Cc: dev@dpdk.org; stable@dpdk.org
Subject: Re: [PATCH] gso: fix VxLAN/GRE tunnel checks

On 1/19/19 4:31 PM, Hu, Jiayu wrote:

Hi Andrew,



Would you please give more explanation about the problem that

the patch wants to fix?

Let's consider if tunnel is IPIP (0x3ULL << 45) or MPLSINUDP (0x5ULL << 45).
If so flags & VXLAN (0x1ULL << 45), still makes (0x1ULL << 45)==VXLAN,
but it is not a VXLAN tunnel packet.

Andrew.







Thanks,

Jiayu

-----Original Message-----

From: Andrew Rybchenko [mailto:arybchenko@solarflare.com]

Sent: Friday, January 18, 2019 9:29 PM

To: Hu, Jiayu <jiayu.hu@intel.com><mailto:jiayu.hu@intel.com>

Cc: dev@dpdk.org<mailto:dev@dpdk.org>; stable@dpdk.org<mailto:stable@dpdk.org>

Subject: [PATCH] gso: fix VxLAN/GRE tunnel checks



Tunnel type is an enum in PKT_TX_TUNNEL_MASK bits.



Fixes: b058d92ea95d ("gso: support VxLAN GSO")

Fixes: 70e737e448c7 ("gso: support GRE GSO")

Cc: stable@dpdk.org<mailto:stable@dpdk.org>



Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com><mailto:arybchenko@solarflare.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 6cd764ff5..b6ff1b886 100644

--- a/lib/librte_gso/gso_common.h

+++ b/lib/librte_gso/gso_common.h

@@ -22,12 +22,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.17.1
diff mbox series

Patch

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
@@ -22,12 +22,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))