[dpdk-stable] [PATCH] net/mlx5: fix flow match on GRE key

[dpdk-stable] [PATCH] net/mlx5: fix flow match on GRE key

[Matan Azrad]

The RTE_FLOW_ITEM_TYPE_GRE_KEY means that GRE key should
be present on the flow and in addition can explicitly match on the GRE
key field itself.

When no value is set in this item any GRE key should match the flow.

The match on GRE key wrongly was not added if the item fields are NULL
while at least the GRE key should be present in the flow.

Add the GRE key present match when RTE_FLOW_ITEM_TYPE_GRE_KEY is in
the flow item list.

Fixes: a7a0365565a4 ("net/mlx5: match GRE key and present bits")
Cc: stable@dpdk.org

Signed-off-by: Matan Azrad <matan@mellanox.com>
Acked-by: Ori Kam <orika@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index a8c8a58..402250e 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -5593,13 +5593,13 @@ struct field_modify_info modify_tcp[] = {
 	void *misc_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters);
 	rte_be32_t gre_key_default_mask = RTE_BE32(UINT32_MAX);
 
+	/* GRE K bit must be on and should already be validated */
+	MLX5_SET(fte_match_set_misc, misc_m, gre_k_present, 1);
+	MLX5_SET(fte_match_set_misc, misc_v, gre_k_present, 1);
 	if (!key_v)
 		return;
 	if (!key_m)
 		key_m = &gre_key_default_mask;
-	/* GRE K bit must be on and should already be validated */
-	MLX5_SET(fte_match_set_misc, misc_m, gre_k_present, 1);
-	MLX5_SET(fte_match_set_misc, misc_v, gre_k_present, 1);
 	MLX5_SET(fte_match_set_misc, misc_m, gre_key_h,
 		 rte_be_to_cpu_32(*key_m) >> 8);
 	MLX5_SET(fte_match_set_misc, misc_v, gre_key_h,
-- 
1.8.3.1

Re: [dpdk-stable] [dpdk-dev] [PATCH] net/mlx5: fix flow match on GRE key

[Raslan Darawsheh]

Hi,

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Matan Azrad
> Sent: Tuesday, February 18, 2020 4:45 PM
> To: dev@dpdk.org
> Cc: Slava Ovsiienko <viacheslavo@mellanox.com>; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/mlx5: fix flow match on GRE key
> 
> The RTE_FLOW_ITEM_TYPE_GRE_KEY means that GRE key should
> be present on the flow and in addition can explicitly match on the GRE
> key field itself.
> 
> When no value is set in this item any GRE key should match the flow.
> 
> The match on GRE key wrongly was not added if the item fields are NULL
> while at least the GRE key should be present in the flow.
> 
> Add the GRE key present match when RTE_FLOW_ITEM_TYPE_GRE_KEY is in
> the flow item list.
> 
> Fixes: a7a0365565a4 ("net/mlx5: match GRE key and present bits")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Matan Azrad <matan@mellanox.com>
> Acked-by: Ori Kam <orika@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> index a8c8a58..402250e 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -5593,13 +5593,13 @@ struct field_modify_info modify_tcp[] = {
>  	void *misc_v = MLX5_ADDR_OF(fte_match_param, key,
> misc_parameters);
>  	rte_be32_t gre_key_default_mask = RTE_BE32(UINT32_MAX);
> 
> +	/* GRE K bit must be on and should already be validated */
> +	MLX5_SET(fte_match_set_misc, misc_m, gre_k_present, 1);
> +	MLX5_SET(fte_match_set_misc, misc_v, gre_k_present, 1);
>  	if (!key_v)
>  		return;
>  	if (!key_m)
>  		key_m = &gre_key_default_mask;
> -	/* GRE K bit must be on and should already be validated */
> -	MLX5_SET(fte_match_set_misc, misc_m, gre_k_present, 1);
> -	MLX5_SET(fte_match_set_misc, misc_v, gre_k_present, 1);
>  	MLX5_SET(fte_match_set_misc, misc_m, gre_key_h,
>  		 rte_be_to_cpu_32(*key_m) >> 8);
>  	MLX5_SET(fte_match_set_misc, misc_v, gre_key_h,
> --
> 1.8.3.1


Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh