[dpdk-stable] patch 'net/mlx5: fix IPv6 header fields' has been queued to LTS release 17.11.1

[Yuanhan Liu]

FYI, this one has been reverted, for it breaks the MLX5 build:

drivers/net/mlx5/mlx5_flow.c:1487:37: error: 'IPV6_HDR_FL_MASK' undeclared (first use in this function)

If you think it's a must to have for 17.11.1 release, please do backport.

Thanks.

	--yliu

On Wed, Jan 24, 2018 at 11:33:39PM +0800, Yuanhan Liu wrote:
> Hi,
> 
> FYI, your patch has been queued to LTS release 17.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 01/26/18. So please
> shout if anyone has objections.
> 
> Thanks.
> 
> 	--yliu
> 
> ---
> >From ec606da5366e96d020817dc0fb52811204662595 Mon Sep 17 00:00:00 2001
> From: Shachar Beiser <shacharbe at mellanox.com>
> Date: Tue, 16 Jan 2018 11:17:52 +0200
> Subject: [PATCH] net/mlx5: fix IPv6 header fields
> 
> [ upstream commit e8aafd9405b9f1da345abd2d5ff0d7aabc1ce6f3 ]
> 
> There are parameters that are not copy from
> spec to verbs structure in the vtc_label
> 
> Fixes: 43e9d9794cde ("net/mlx5: support upstream rdma-core")
> 
> Signed-off-by: Shachar Beiser <shacharbe at mellanox.com>
> Acked-by: Yongseok Koh <yskoh at mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_flow.c | 19 ++++++++++++++++++-
>  1 file changed, 18 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
> index 00f4bec..654fb1d 100644
> --- a/drivers/net/mlx5/mlx5_flow.c
> +++ b/drivers/net/mlx5/mlx5_flow.c
> @@ -48,6 +48,7 @@
>  #include <rte_flow.h>
>  #include <rte_flow_driver.h>
>  #include <rte_malloc.h>
> +#include <rte_ip.h>
>  
>  #include "mlx5.h"
>  #include "mlx5_defs.h"
> @@ -1467,6 +1468,8 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item,
>  		parser->layer = HASH_RXQ_IPV6;
>  	if (spec) {
>  		unsigned int i;
> +		uint32_t vtc_flow_val;
> +		uint32_t vtc_flow_mask;
>  
>  		if (!mask)
>  			mask = default_mask;
> @@ -1478,7 +1481,20 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item,
>  		       RTE_DIM(ipv6.mask.src_ip));
>  		memcpy(&ipv6.mask.dst_ip, mask->hdr.dst_addr,
>  		       RTE_DIM(ipv6.mask.dst_ip));
> -		ipv6.mask.flow_label = mask->hdr.vtc_flow;
> +		vtc_flow_val = rte_be_to_cpu_32(spec->hdr.vtc_flow);
> +		vtc_flow_mask = rte_be_to_cpu_32(mask->hdr.vtc_flow);
> +		ipv6.val.flow_label =
> +			rte_cpu_to_be_32((vtc_flow_val & IPV6_HDR_FL_MASK) >>
> +					 IPV6_HDR_FL_SHIFT);
> +		ipv6.val.traffic_class = (vtc_flow_val & IPV6_HDR_TC_MASK) >>
> +					 IPV6_HDR_TC_SHIFT;
> +		ipv6.val.next_hdr = spec->hdr.proto;
> +		ipv6.val.hop_limit = spec->hdr.hop_limits;
> +		ipv6.mask.flow_label =
> +			rte_cpu_to_be_32((vtc_flow_mask & IPV6_HDR_FL_MASK) >>
> +					 IPV6_HDR_FL_SHIFT);
> +		ipv6.mask.traffic_class = (vtc_flow_mask & IPV6_HDR_TC_MASK) >>
> +					  IPV6_HDR_TC_SHIFT;
>  		ipv6.mask.next_hdr = mask->hdr.proto;
>  		ipv6.mask.hop_limit = mask->hdr.hop_limits;
>  		/* Remove unwanted bits from values. */
> @@ -1487,6 +1503,7 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item,
>  			ipv6.val.dst_ip[i] &= ipv6.mask.dst_ip[i];
>  		}
>  		ipv6.val.flow_label &= ipv6.mask.flow_label;
> +		ipv6.val.traffic_class &= ipv6.mask.traffic_class;
>  		ipv6.val.next_hdr &= ipv6.mask.next_hdr;
>  		ipv6.val.hop_limit &= ipv6.mask.hop_limit;
>  	}
> -- 
> 2.7.4