diff mbox series

net/mlx5: fix push VLAN action mask iteration

Message ID 20221117100648.1531155-1-dsosnowski@nvidia.com (mailing list archive)
State Accepted, archived
Delegated to: Raslan Darawsheh
Headers
Series net/mlx5: fix push VLAN action mask iteration |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/intel-Testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/github-robot: build success github build: passed
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS

Commit Message

Dariusz Sosnowski Nov. 17, 2022, 10:06 a.m. UTC 
  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")
Cc: getelson@nvidia.com

Signed-off-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_hw.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Raslan Darawsheh Nov. 20, 2022, 3:31 p.m. UTC | #1 
Hi,
> -----Original Message-----
> From: Dariusz Sosnowski <dsosnowski@nvidia.com>
> Sent: Thursday, November 17, 2022 12:07 PM
> To: Matan Azrad <matan@nvidia.com>; Slava Ovsiienko
> <viacheslavo@nvidia.com>; Gregory Etelson <getelson@nvidia.com>
> Cc: dev@dpdk.org; Raslan Darawsheh <rasland@nvidia.com>
> 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.
> 
> This patch fixes this behavior by properly adjusting masks iterator
> alognside actions iterator.
> 
> Fixes: 773ca0e91ba1 ("net/mlx5: support VLAN push/pop/modify with HWS")
> Cc: getelson@nvidia.com
> 
> Signed-off-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
> Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index f4493ad556..ff0c3064c1 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -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];