From: Ophir Munk Date: Wed, 26 Feb 2020 08:27:48 +0000 (+0000) Subject: net/mlx5: fix VLAN PCP item calculation X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=commitdiff_plain;h=3c3f27e905792670933fabe577f9653336780688 net/mlx5: fix VLAN PCP item calculation The VLAN 16 bits tci field contains both values of PCP and VID. When extracting any one of them - it is required not to affect the other one. Previous to this commit in routine flow_dev_get_vlan_info_from_items() we calculated the PCP as follows: (1) vlan->vlan_tci &= MLX5DV_FLOW_VLAN_PCP_MASK; (2) vlan->vlan_tci |= <3 bits value of PCP> In line (1) we should have used the negated mask ('~' operator) such that only the PCP bits will be nullified before ORing them with the updated PCP value. Fixes: 9aee7a8418d4 ("net/mlx5: support push flow action on VLAN header") Cc: stable@dpdk.org Signed-off-by: Ophir Munk Acked-by: Viacheslav Ovsiienko --- diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 06592b5340..2414a97716 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1771,7 +1771,7 @@ flow_dev_get_vlan_info_from_items(const struct rte_flow_item *items, /* Only full match values are accepted */ if ((vlan_m->tci & MLX5DV_FLOW_VLAN_PCP_MASK_BE) == MLX5DV_FLOW_VLAN_PCP_MASK_BE) { - vlan->vlan_tci &= MLX5DV_FLOW_VLAN_PCP_MASK; + vlan->vlan_tci &= ~MLX5DV_FLOW_VLAN_PCP_MASK; vlan->vlan_tci |= rte_be_to_cpu_16(vlan_v->tci & MLX5DV_FLOW_VLAN_PCP_MASK_BE);