Skip to contentSkip to conversation

net/mlx5: fix push VLAN action mask iteration

PATCH In review Dariusz Sosnowski 2 participants 2 messages Nov 17, 2022 – Nov 20, 2022 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/mlx5: fix push VLAN action mask iteration

Before this patch, during translation of OF_PUSH_VLAN actions iterator was moved forward to the position of OF_SET_VLAN_VID or OF_SET_VLAN_PCP, but masks iterator was not updated.
As a result, the following actions were incorrectly translated, because iterators were not aligned.

This patch fixes this behavior by properly adjusting masks iterator alognside actions iterator.

Fixes 773ca0e91ba1 ("net/mlx5: support VLAN push/pop/modify with HWS")
---
 drivers/net/mlx5/mlx5_flow_hw.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/mlx5/mlx5_flow_hw.c +4 -1
index f4493ad556..ff0c3064c1 100644
@@ -1346,6 +1346,7 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,
 	bool actions_end = false;
 	uint32_t type;
 	bool reformat_used = false;
+	unsigned int of_vlan_offset;
 	uint16_t action_pos;
 	uint16_t jump_pos;
 	uint32_t ct_idx;
@@ -1413,9 +1414,11 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,
 					(priv, acts, actions->type,
 					 actions - action_start, action_pos))
 				goto err;
-			actions += is_of_vlan_pcp_present(actions) ?
+			of_vlan_offset = is_of_vlan_pcp_present(actions) ?
 					MLX5_HW_VLAN_PUSH_PCP_IDX :
 					MLX5_HW_VLAN_PUSH_VID_IDX;
+			actions += of_vlan_offset;
+			masks += of_vlan_offset;
 			break;
 		case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN:
 			action_pos = at->actions_off[actions - at->actions];
Signature · 1 line
2.25.1
#1 lore raw

Hi,

Quoted 14 lines

-----Original Message-----
From: Dariusz Sosnowski <[email protected]>
Sent: Thursday, November 17, 2022 12:07 PM
To: Matan Azrad <[email protected]>; Slava Ovsiienko <[email protected]>; Gregory Etelson <[email protected]>
Cc: [email protected]; Raslan Darawsheh <[email protected]>
Subject: [PATCH] net/mlx5: fix push VLAN action mask iteration

Before this patch, during translation of OF_PUSH_VLAN actions iterator was moved forward to the position of OF_SET_VLAN_VID or OF_SET_VLAN_PCP, but masks iterator was not updated.
As a result, the following actions were incorrectly translated, because iterators were not aligned.

Quoted 8 lines

This patch fixes this behavior by properly adjusting masks iterator alognside actions iterator.

Fixes 773ca0e91ba1 ("net/mlx5: support VLAN push/pop/modify with HWS")

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh