From: Xiaoyu Min Date: Mon, 13 Apr 2020 03:29:03 +0000 (+0300) Subject: net/mlx5: fix push VLAN action to use item info X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=7162c02d7bf700312f644ca3e598ab6e034e180c;hp=45a40f98b345e3f83d50f293974f1cd106ca02b3;p=dpdk.git net/mlx5: fix push VLAN action to use item info Currently when PMD create push VLAN action it need to provide VID to HW and PMD get VID value from item VLAN in pattern if there is no of_set_vlan_vid action following. When user create rule like [1], which has of_set_vlan_vid action before of_push_vlan, the intention is to modify VID on existing VLAN header and push a new VLAN header with VID _inherit_ from the previous of_set_vlan_vid. Currently the above is not covered by PMD, PMD always fetch the VLAN information from item for of_push_vlan action. Fix it by only fetch VLAN information from item when there is no previous of_set_vlan_vid action. [1]: testpmd> flow create 2 ingress transfer group 1 priority 3 pattern eth / vlan vid is 2731 / ipv4 / end actions of_set_vlan_vid vlan_vid 3209 / of_push_vlan ethertype 0x88A8 / port_id id 1 / end Fixes: b8c0372bc5ac ("net/mlx5: fix set VLAN ID/PCP in new header") Cc: stable@dpdk.org Signed-off-by: Xiaoyu Min Reviewed-by: Dekel Peled Acked-by: Viacheslav Ovsiienko --- diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index e87e30f65f..5f093bedd3 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7517,7 +7517,9 @@ cnt_err: action_flags |= MLX5_FLOW_ACTION_OF_POP_VLAN; break; case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: - flow_dev_get_vlan_info_from_items(items, &vlan); + if (!(action_flags & + MLX5_FLOW_ACTION_OF_SET_VLAN_VID)) + flow_dev_get_vlan_info_from_items(items, &vlan); vlan.eth_proto = rte_be_to_cpu_16 ((((const struct rte_flow_action_of_push_vlan *) actions->conf)->ethertype));