> -----Original Message-----
> From: Dekel Peled <dek...@mellanox.com>
> Sent: Thursday, July 18, 2019 22:42
> To: Yongseok Koh <ys...@mellanox.com>; Slava Ovsiienko
> <viachesl...@mellanox.com>; Shahaf Shuler <shah...@mellanox.com>
> Cc: Jack Min <jack...@mellanox.com>; Ori Kam <or...@mellanox.com>;
> dev@dpdk.org
> Subject: [PATCH] net/mlx5: fix setting of item flags bitmap
>
> In functions flow_dv_translate() and flow_dv_validate(), the flow items are
> scanned and each item is marked in item_flags bitmap.
> The code handling some of the items was ported from another project,
> where items are marked in a slightley different manner.
>
> This patch fixes the setting of items in bitmap, adapting it to the required
> manner.
>
> Fixes: d53aa89aea91 ("net/mlx5: support matching on ICMP/ICMP6")
> Fixes: 1242041c5601 ("net/mlx5: match GRE key and present bits")
> Fixes: 2e4c987aad91 ("net/mlx5: validate Direct Rule E-Switch")
>
> Signed-off-by: Dekel Peled <dek...@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viachesl...@mellanox.com>
> ---
> drivers/net/mlx5/mlx5_flow_dv.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c index 45cd140..7240d3b 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -2883,7 +2883,7 @@ struct field_modify_info modify_tcp[] = {
> (dev, items, attr, item_flags, error);
> if (ret < 0)
> return ret;
> - last_item |= MLX5_FLOW_ITEM_PORT_ID;
> + last_item = MLX5_FLOW_ITEM_PORT_ID;
> break;
> case RTE_FLOW_ITEM_TYPE_ETH:
> ret = mlx5_flow_validate_item_eth(items,
> item_flags, @@ -2979,7 +2979,7 @@ struct field_modify_info modify_tcp[]
> = {
> (items, item_flags, gre_item, error);
> if (ret < 0)
> return ret;
> - item_flags |= MLX5_FLOW_LAYER_GRE_KEY;
> + last_item = MLX5_FLOW_LAYER_GRE_KEY;
> break;
> case RTE_FLOW_ITEM_TYPE_VXLAN:
> ret = mlx5_flow_validate_item_vxlan(items,
> item_flags, @@ -3017,7 +3017,7 @@ struct field_modify_info modify_tcp[]
> = {
> error);
> if (ret < 0)
> return ret;
> - item_flags |= MLX5_FLOW_LAYER_ICMP;
> + last_item = MLX5_FLOW_LAYER_ICMP;
> break;
> case RTE_FLOW_ITEM_TYPE_ICMP6:
> ret = mlx5_flow_validate_item_icmp6(items,
> item_flags, @@ -3025,7 +3025,7 @@ struct field_modify_info modify_tcp[]
> = {
> error);
> if (ret < 0)
> return ret;
> - item_flags |= MLX5_FLOW_LAYER_ICMP6;
> + last_item = MLX5_FLOW_LAYER_ICMP6;
> break;
> default:
> return rte_flow_error_set(error, ENOTSUP, @@ -
> 5043,7 +5043,7 @@ struct field_modify_info modify_tcp[] = {
> case RTE_FLOW_ITEM_TYPE_GRE_KEY:
> flow_dv_translate_item_gre_key(match_mask,
> match_value, items);
> - item_flags |= MLX5_FLOW_LAYER_GRE_KEY;
> + last_item = MLX5_FLOW_LAYER_GRE_KEY;
> break;
> case RTE_FLOW_ITEM_TYPE_NVGRE:
> flow_dv_translate_item_nvgre(match_mask,
> match_value, @@ -5073,12 +5073,12 @@ struct field_modify_info
> modify_tcp[] = {
> case RTE_FLOW_ITEM_TYPE_ICMP:
> flow_dv_translate_item_icmp(match_mask,
> match_value,
> items, tunnel);
> - item_flags |= MLX5_FLOW_LAYER_ICMP;
> + last_item = MLX5_FLOW_LAYER_ICMP;
> break;
> case RTE_FLOW_ITEM_TYPE_ICMP6:
> flow_dv_translate_item_icmp6(match_mask,
> match_value,
> items, tunnel);
> - item_flags |= MLX5_FLOW_LAYER_ICMP6;
> + last_item = MLX5_FLOW_LAYER_ICMP6;
> break;
> default:
> break;
> --
> 1.8.3.1
