net/mlx5/hws: fix VLAN item handling on non relaxed mode
PATCH 1/1 net/mlx5/hws: fix VLAN item handling on non relaxed mode
From: Hamdan Igbaria <[email protected]>
If a VLAN item was passed with null mask, the item handler would return immediately and thus won't set default values for non relax mode.
Also change the non relax default set to single-tagged (CVLAN).
Fixes c55c2bf35333 ("net/mlx5/hws: add definer layer")
Signed-off-by Hamdan Igbaria <[email protected]>
Acked-by Suanming Mou <[email protected]>
--- drivers/net/mlx5/hws/mlx5dr_definer.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/mlx5/hws/mlx5dr_definer.c +11 -2
@@ -196,6 +196,7 @@ struct mlx5dr_definer_conv_data { X(SET, ib_l4_opcode, v->hdr.opcode, rte_flow_item_ib_bth) \ X(SET, random_number, v->value, rte_flow_item_random) \ X(SET, ib_l4_bth_a, v->hdr.a, rte_flow_item_ib_bth) \ +X (SET , cvlan,STE_CVLAN , rte_flow_item_vlan) \ /* Item set function format */#define X (set_type, func_name, value, item_type) \
@@ -837,6 +838,15 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd,struct mlx5dr_definer_fc *fc;bool inner = cd->tunnel; +if (!cd->relaxed) { +/* Mark packet as tagged (CVLAN) */ + fc = &cd->fc[DR_CALC_FNAME (VLAN_TYPE , inner)]; + fc->item_idx = item_idx; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->tag_set = &mlx5dr_definer_cvlan_set; +DR_CALC_SET (fc, eth_l2, first_vlan_qualifier, inner); + } +if (!m)return 0 ;
@@ -845,8 +855,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd,return rte_errno; } -if (!cd->relaxed || m->has_more_vlan) { -/* Mark packet as tagged (CVLAN or SVLAN) even if TCI is not specified.*/ +if (m->has_more_vlan) { fc = &cd->fc[DR_CALC_FNAME (VLAN_TYPE , inner)]; fc->item_idx = item_idx; fc->tag_mask_set = &mlx5dr_definer_ones_set;
Signature · 1 line
2.34.1
PATCH v2 1/1 net/mlx5/hws: fix VLAN item handling on non relaxed mode
From: Hamdan Igbaria <[email protected]>
If a VLAN item was passed with null mask, the item handler would return immediately and thus won't set default values for non relax mode.
Also change the non relax default set to single-tagged (CVLAN).
Fixes c55c2bf35333 ("net/mlx5/hws: add definer layer")
Signed-off-by Hamdan Igbaria <[email protected]>
Reviewed-by Erez Shitrit <[email protected]>
Acked-by Suanming Mou <[email protected]>
---
v2: add "reviewed" field
--- drivers/net/mlx5/hws/mlx5dr_definer.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/mlx5/hws/mlx5dr_definer.c +11 -2
@@ -196,6 +196,7 @@ struct mlx5dr_definer_conv_data { X(SET, ib_l4_opcode, v->hdr.opcode, rte_flow_item_ib_bth) \ X(SET, random_number, v->value, rte_flow_item_random) \ X(SET, ib_l4_bth_a, v->hdr.a, rte_flow_item_ib_bth) \ +X (SET , cvlan,STE_CVLAN , rte_flow_item_vlan) \ /* Item set function format */#define X (set_type, func_name, value, item_type) \
@@ -837,6 +838,15 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd,struct mlx5dr_definer_fc *fc;bool inner = cd->tunnel; +if (!cd->relaxed) { +/* Mark packet as tagged (CVLAN) */ + fc = &cd->fc[DR_CALC_FNAME (VLAN_TYPE , inner)]; + fc->item_idx = item_idx; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->tag_set = &mlx5dr_definer_cvlan_set; +DR_CALC_SET (fc, eth_l2, first_vlan_qualifier, inner); + } +if (!m)return 0 ;
@@ -845,8 +855,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd,return rte_errno; } -if (!cd->relaxed || m->has_more_vlan) { -/* Mark packet as tagged (CVLAN or SVLAN) even if TCI is not specified.*/ +if (m->has_more_vlan) { fc = &cd->fc[DR_CALC_FNAME (VLAN_TYPE , inner)]; fc->item_idx = item_idx; fc->tag_mask_set = &mlx5dr_definer_ones_set;
Signature · 1 line
2.34.1