Skip to contentSkip to conversation

net/mlx5: fix assert when creating meter policy

PATCH In review Shun Hao 2 participants 2 messages Nov 9, 2022 Network drivers

lore
Share & tools
lore

Shun Hao

author
#0 lore raw

PATCH 1/1 net/mlx5: fix assert when creating meter policy

When creating meter policy rules, it's possible to use flow items translation to add src port match criteria. Currently the items translation process needs to get thread workspace to store vport metadata tag, but in policy creation, the thread workspace was not initialized so it will cause assert failure.

This patch adds initialization of thread-local workspace when creating meter policy rules to avoid that assert.

Fixes 65c86202 ("net/mlx5: fix flow source port checking in sample flow rule")
---
 drivers/net/mlx5/mlx5_flow_dv.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/mlx5/mlx5_flow_dv.c +8 -2
index 57af95b8a9..e9da59320a 100644
@@ -17425,8 +17425,11 @@ flow_dv_create_policy_rules(struct rte_eth_dev *dev,
 			     struct mlx5_flow_meter_policy *mtr_policy)
 {
 	int i;
+	int ret = 0;
 	uint16_t sub_policy_num;
+	struct mlx5_flow_workspace *wks = mlx5_flow_push_thread_workspace();
 
+	RTE_SET_USED(wks);
 	for (i = 0; i < MLX5_MTR_DOMAIN_MAX; i++) {
 		sub_policy_num = (mtr_policy->sub_policy_num >>
 			(MLX5_MTR_SUB_POLICY_NUM_SHIFT * i)) &
@@ -17438,10 +17441,13 @@ flow_dv_create_policy_rules(struct rte_eth_dev *dev,
 			mtr_policy->sub_policys[i][0], i)) {
 			DRV_LOG(ERR, "Failed to create policy action "
 				"list per domain.");
-			return -1;
+			ret = -1;
+			goto exit;
 		}
 	}
-	return 0;
+exit:
+	mlx5_flow_pop_thread_workspace();
+	return ret;
 }
 
 static int
Signature · 1 line
2.20.0
#1 lore raw

Hi,

Quoted 19 lines

-----Original Message-----
From: Shun Hao <[email protected]>
Sent: Wednesday, November 9, 2022 9:53 AM
To: Slava Ovsiienko <[email protected]>; Matan Azrad <[email protected]>; Ori Kam <[email protected]>; Jiawei(Jonny) Wang <[email protected]>
Cc: [email protected]; Raslan Darawsheh <[email protected]>; [email protected]
Subject: [PATCH] net/mlx5: fix assert when creating meter policy

When creating meter policy rules, it's possible to use flow items translation to add src port match criteria. Currently the items translation process needs to get thread workspace to store vport metadata tag, but in policy creation, the thread workspace was not initialized so it will cause assert failure.

This patch adds initialization of thread-local workspace when creating meter policy rules to avoid that assert.

Quoted 6 lines
Fixes 65c86202 ("net/mlx5: fix flow source port checking in sample flow

rule")
CC: [email protected]

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh