[dpdk-stable] patch 'Revert "net/mlx5: fix layer validation with decapsulation"' has been queued to stable release 19.11.1

[Luca Boccassi]

Gah, sorry I forgot to rebase and remove the patches - the reverts
shouldn't have been in the list. The patches:

net/mlx5: fix layer type in header modify action
net/mlx5: fix layer validation with decapsulation

cause build failures and were skipped.

On Thu, 2020-02-27 at 09:33 +0000, luca.boccassi at gmail.com wrote:
> Hi,
> 
> FYI, your patch has been queued to stable release 19.11.1
> 
> Note it hasn't been pushed to 
> http://dpdk.org/browse/dpdk-stable
>  yet.
> It will be pushed if I get no objections before 02/29/20. So please
> shout if anyone has objections.
> 
> Also note that after the patch there's a diff of the upstream commit
> vs the
> patch applied to the branch. This will indicate if there was any
> rebasing
> needed to apply to the stable branch. If there were code changes for
> rebasing
> (ie: not only metadata diffs), please double check that the rebase
> was
> correctly done.
> 
> Thanks.
> 
> Luca Boccassi
> 
> ---
> From 14ecda7bce99cf45330ab89bda35d4b35342e987 Mon Sep 17 00:00:00
> 2001
> From: Luca Boccassi <
> luca.boccassi at microsoft.com
> >
> Date: Wed, 26 Feb 2020 20:05:15 +0000
> Subject: [PATCH] Revert "net/mlx5: fix layer validation with
> decapsulation"
> 
> This reverts commit f9cb01862aabf54ab0b88cd755602fe966a73c2a.
> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 36 ++++++-------------------------
> --
>  1 file changed, 6 insertions(+), 30 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> index aa65300d9c..e39d3c4299 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -3015,14 +3015,10 @@ flow_dv_validate_action_modify_ipv4(const
> uint64_t action_flags,
>  				    struct rte_flow_error *error)
>  {
>  	int ret = 0;
> -	uint64_t layer;
>  
>  	ret = flow_dv_validate_action_modify_hdr(action_flags, action,
> error);
>  	if (!ret) {
> -		layer = (action_flags & MLX5_FLOW_ACTION_DECAP) ?
> -				 MLX5_FLOW_LAYER_INNER_L3_IPV4 :
> -				 MLX5_FLOW_LAYER_OUTER_L3_IPV4;
> -		if (!(item_flags & layer))
> +		if (!(item_flags & MLX5_FLOW_LAYER_L3_IPV4))
>  			return rte_flow_error_set(error, EINVAL,
>  						  RTE_FLOW_ERROR_TYPE_A
> CTION,
>  						  NULL,
> @@ -3053,14 +3049,10 @@ flow_dv_validate_action_modify_ipv6(const
> uint64_t action_flags,
>  				    struct rte_flow_error *error)
>  {
>  	int ret = 0;
> -	uint64_t layer;
>  
>  	ret = flow_dv_validate_action_modify_hdr(action_flags, action,
> error);
>  	if (!ret) {
> -		layer = (action_flags & MLX5_FLOW_ACTION_DECAP) ?
> -				 MLX5_FLOW_LAYER_INNER_L3_IPV6 :
> -				 MLX5_FLOW_LAYER_OUTER_L3_IPV6;
> -		if (!(item_flags & layer))
> +		if (!(item_flags & MLX5_FLOW_LAYER_L3_IPV6))
>  			return rte_flow_error_set(error, EINVAL,
>  						  RTE_FLOW_ERROR_TYPE_A
> CTION,
>  						  NULL,
> @@ -3091,14 +3083,10 @@ flow_dv_validate_action_modify_tp(const
> uint64_t action_flags,
>  				  struct rte_flow_error *error)
>  {
>  	int ret = 0;
> -	uint64_t layer;
>  
>  	ret = flow_dv_validate_action_modify_hdr(action_flags, action,
> error);
>  	if (!ret) {
> -		layer = (action_flags & MLX5_FLOW_ACTION_DECAP) ?
> -				 MLX5_FLOW_LAYER_INNER_L4 :
> -				 MLX5_FLOW_LAYER_OUTER_L4;
> -		if (!(item_flags & layer))
> +		if (!(item_flags & MLX5_FLOW_LAYER_L4))
>  			return rte_flow_error_set(error, EINVAL,
>  						  RTE_FLOW_ERROR_TYPE_A
> CTION,
>  						  NULL, "no transport
> layer "
> @@ -3130,14 +3118,10 @@ flow_dv_validate_action_modify_tcp_seq(const
> uint64_t action_flags,
>  				       struct rte_flow_error *error)
>  {
>  	int ret = 0;
> -	uint64_t layer;
>  
>  	ret = flow_dv_validate_action_modify_hdr(action_flags, action,
> error);
>  	if (!ret) {
> -		layer = (action_flags & MLX5_FLOW_ACTION_DECAP) ?
> -				 MLX5_FLOW_LAYER_INNER_L4_TCP :
> -				 MLX5_FLOW_LAYER_OUTER_L4_TCP;
> -		if (!(item_flags & layer))
> +		if (!(item_flags & MLX5_FLOW_LAYER_OUTER_L4_TCP))
>  			return rte_flow_error_set(error, EINVAL,
>  						  RTE_FLOW_ERROR_TYPE_A
> CTION,
>  						  NULL, "no TCP item
> in"
> @@ -3179,14 +3163,10 @@ flow_dv_validate_action_modify_tcp_ack(const
> uint64_t action_flags,
>  				       struct rte_flow_error *error)
>  {
>  	int ret = 0;
> -	uint64_t layer;
>  
>  	ret = flow_dv_validate_action_modify_hdr(action_flags, action,
> error);
>  	if (!ret) {
> -		layer = (action_flags & MLX5_FLOW_ACTION_DECAP) ?
> -				 MLX5_FLOW_LAYER_INNER_L4_TCP :
> -				 MLX5_FLOW_LAYER_OUTER_L4_TCP;
> -		if (!(item_flags & layer))
> +		if (!(item_flags & MLX5_FLOW_LAYER_OUTER_L4_TCP))
>  			return rte_flow_error_set(error, EINVAL,
>  						  RTE_FLOW_ERROR_TYPE_A
> CTION,
>  						  NULL, "no TCP item
> in"
> @@ -3227,14 +3207,10 @@ flow_dv_validate_action_modify_ttl(const
> uint64_t action_flags,
>  				   struct rte_flow_error *error)
>  {
>  	int ret = 0;
> -	uint64_t layer;
>  
>  	ret = flow_dv_validate_action_modify_hdr(action_flags, action,
> error);
>  	if (!ret) {
> -		layer = (action_flags & MLX5_FLOW_ACTION_DECAP) ?
> -				 MLX5_FLOW_LAYER_INNER_L3 :
> -				 MLX5_FLOW_LAYER_OUTER_L3;
> -		if (!(item_flags & layer))
> +		if (!(item_flags & MLX5_FLOW_LAYER_L3))
>  			return rte_flow_error_set(error, EINVAL,
>  						  RTE_FLOW_ERROR_TYPE_A
> CTION,
>  						  NULL,
> 
-- 
Kind regards,
Luca Boccassi