net/mlx5: fix missing ptype for IP-in-IP

Message ID 8b07ad6d289e6b604bfc95f70ded7f78e0cb4489.1565264176.git.jackmin@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Raslan Darawsheh
Headers
Series net/mlx5: fix missing ptype for IP-in-IP |

Checks

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

Commit Message

Xiaoyu Min Aug. 8, 2019, 11:38 a.m. UTC
  The hw ptype information is missed for IP-in-IP tunnel.
It should be RTE_PTYPE_TUNNEL_IP ptype.

Fixes: 5e33bebdd8d3 ("net/mlx5: support IP-in-IP tunnel")

Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 8 ++++++++
 drivers/net/mlx5/mlx5_rxtx.h | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
  

Comments

Slava Ovsiienko Sept. 4, 2019, 1:38 p.m. UTC | #1
> -----Original Message-----
> From: Xiaoyu Min <jackmin@mellanox.com>
> Sent: Thursday, August 8, 2019 14:39
> To: Shahaf Shuler <shahafs@mellanox.com>; Yongseok Koh
> <yskoh@mellanox.com>; Slava Ovsiienko <viacheslavo@mellanox.com>
> Cc: dev@dpdk.org
> Subject: [PATCH] net/mlx5: fix missing ptype for IP-in-IP
> 
> The hw ptype information is missed for IP-in-IP tunnel.
> It should be RTE_PTYPE_TUNNEL_IP ptype.
> 
> Fixes: 5e33bebdd8d3 ("net/mlx5: support IP-in-IP tunnel")
> 
> Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>

> ---
>  drivers/net/mlx5/mlx5_flow.c | 8 ++++++++  drivers/net/mlx5/mlx5_rxtx.h |
> 2 +-
>  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
> index 9d2c8c9ec5..67a31473d8 100644
> --- a/drivers/net/mlx5/mlx5_flow.c
> +++ b/drivers/net/mlx5/mlx5_flow.c
> @@ -306,6 +306,14 @@ static struct mlx5_flow_tunnel_info tunnels_info[]
> = {
>  		.tunnel = MLX5_FLOW_LAYER_NVGRE,
>  		.ptype = RTE_PTYPE_TUNNEL_NVGRE,
>  	},
> +	{
> +		.tunnel = MLX5_FLOW_LAYER_IPIP,
> +		.ptype = RTE_PTYPE_TUNNEL_IP,
> +	},
> +	{
> +		.tunnel = MLX5_FLOW_LAYER_IPV6_ENCAP,
> +		.ptype = RTE_PTYPE_TUNNEL_IP,
> +	},
>  };
> 
>  /**
> diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
> index bad9e9c1f7..4f73d91311 100644
> --- a/drivers/net/mlx5/mlx5_rxtx.h
> +++ b/drivers/net/mlx5/mlx5_rxtx.h
> @@ -40,7 +40,7 @@
>  #include "mlx5_glue.h"
> 
>  /* Support tunnel matching. */
> -#define MLX5_FLOW_TUNNEL 6
> +#define MLX5_FLOW_TUNNEL 8
> 
>  struct mlx5_rxq_stats {
>  #ifdef MLX5_PMD_SOFT_COUNTERS
> --
> 2.21.0
  
Raslan Darawsheh Sept. 5, 2019, 7:52 a.m. UTC | #2
Hi,

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Xiaoyu Min
> Sent: Thursday, August 8, 2019 2:39 PM
> To: Shahaf Shuler <shahafs@mellanox.com>; Yongseok Koh
> <yskoh@mellanox.com>; Slava Ovsiienko <viacheslavo@mellanox.com>
> Cc: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/mlx5: fix missing ptype for IP-in-IP
> 
> The hw ptype information is missed for IP-in-IP tunnel.
> It should be RTE_PTYPE_TUNNEL_IP ptype.
> 
> Fixes: 5e33bebdd8d3 ("net/mlx5: support IP-in-IP tunnel")
> 
> Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh
  

Patch

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 9d2c8c9ec5..67a31473d8 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -306,6 +306,14 @@  static struct mlx5_flow_tunnel_info tunnels_info[] = {
 		.tunnel = MLX5_FLOW_LAYER_NVGRE,
 		.ptype = RTE_PTYPE_TUNNEL_NVGRE,
 	},
+	{
+		.tunnel = MLX5_FLOW_LAYER_IPIP,
+		.ptype = RTE_PTYPE_TUNNEL_IP,
+	},
+	{
+		.tunnel = MLX5_FLOW_LAYER_IPV6_ENCAP,
+		.ptype = RTE_PTYPE_TUNNEL_IP,
+	},
 };
 
 /**
diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
index bad9e9c1f7..4f73d91311 100644
--- a/drivers/net/mlx5/mlx5_rxtx.h
+++ b/drivers/net/mlx5/mlx5_rxtx.h
@@ -40,7 +40,7 @@ 
 #include "mlx5_glue.h"
 
 /* Support tunnel matching. */
-#define MLX5_FLOW_TUNNEL 6
+#define MLX5_FLOW_TUNNEL 8
 
 struct mlx5_rxq_stats {
 #ifdef MLX5_PMD_SOFT_COUNTERS