[dpdk-stable] [PATCH 01/11] net/mlx5: fix masks of encap and decap actions

[Slava Ovsiienko]

> -----Original Message-----
> From: Dekel Peled <dekelp at mellanox.com>
> Sent: Wednesday, January 22, 2020 16:27
> To: Matan Azrad <matan at mellanox.com>; Slava Ovsiienko
> <viacheslavo at mellanox.com>
> Cc: Raslan Darawsheh <rasland at mellanox.com>; Ori Kam
> <orika at mellanox.com>; dev at dpdk.org; stable at dpdk.org
> Subject: [PATCH 01/11] net/mlx5: fix masks of encap and decap actions
> 
> PUSH_VLAN and POP_VLAN actions flags were added to ENCAP_ACTIONS and
> DECAP_ACTIONS bit masks, respectively.
> This is incorrect, because VLAN actions are considered as 'modify header'
> actions, not as 'packet reformat' actions.
> 
> This patch removes the PUSH_VLAN and POP_VLAN actions flags from
> ENCAP_ACTIONS and DECAP_ACTIONS bit masks.
> 
> Fixes: 9aee7a8418d4 ("net/mlx5: support push flow action on VLAN header")
> Fixes: b41e47da2592 ("net/mlx5: support pop flow action on VLAN header")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Dekel Peled <dekelp at mellanox.com>
> Acked-by: Ori Kam <orika at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>

> ---
>  drivers/net/mlx5/mlx5_flow.h | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
> index 9832542..f771cac 100644
> --- a/drivers/net/mlx5/mlx5_flow.h
> +++ b/drivers/net/mlx5/mlx5_flow.h
> @@ -212,13 +212,11 @@ enum mlx5_feature_name {
> 
>  #define MLX5_FLOW_ENCAP_ACTIONS	(MLX5_FLOW_ACTION_VXLAN_ENCAP
> | \
>  				 MLX5_FLOW_ACTION_NVGRE_ENCAP | \
> -				 MLX5_FLOW_ACTION_RAW_ENCAP | \
> -				 MLX5_FLOW_ACTION_OF_PUSH_VLAN)
> +				 MLX5_FLOW_ACTION_RAW_ENCAP)
> 
>  #define MLX5_FLOW_DECAP_ACTIONS	(MLX5_FLOW_ACTION_VXLAN_DECAP
> | \
>  				 MLX5_FLOW_ACTION_NVGRE_DECAP | \
> -				 MLX5_FLOW_ACTION_RAW_DECAP | \
> -				 MLX5_FLOW_ACTION_OF_POP_VLAN)
> +				 MLX5_FLOW_ACTION_RAW_DECAP)
> 
>  #define MLX5_FLOW_MODIFY_HDR_ACTIONS
> (MLX5_FLOW_ACTION_SET_IPV4_SRC | \
>  				      MLX5_FLOW_ACTION_SET_IPV4_DST | \
> --
> 1.8.3.1