Skip to contentSkip to conversation

mlx5/net: fix release of SQ resources in error flow

PATCH In review Tal Shnaiderman 2 participants 2 messages Oct 28, 2020 – Nov 5, 2020 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mlx5/net: fix release of SQ resources in error flow

Fix in error flow in which the function mlx5_txq_release_devx_sq_resources is called twice by setting the release object to NULL after the first call

The incorrect flow was introduced in the work done on generic object creation.

Once an error flow inside mlx5_txq_create_devx_sq_resources occurs the function will call mlx5_txq_release_devx_sq_resources however the released pointers are not set to NULL after the release calls and undefined memory is released in the same call in mlx5_txq_release_devx_resources.

This results in calls to MLX5_FREE with
an already released memory addresses and assert in mlx5_release_dbr:

EAL: Error: Invalid memory
EAL: Error: Invalid memory

PANIC in mlx5_txq_release_devx_sq_resources():
assert "(mlx5_release_dbr(&txq_obj->txq_ctrl->priv->dbrpgs,
mlx5_os_get_umem_id (txq_obj->sq_dbrec_page->umem), txq_obj->sq_dbrec_offset)) == 0" failed

The fix is setting the released pointers to NULL after the first release calls.

Fixes 86d259cec852 ("net/mlx5: separate Tx queue object creations")
---
 drivers/net/mlx5/mlx5_devx.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/mlx5/mlx5_devx.c +12 -4
index 11bda32557..5f5f2f2444 100644
@@ -948,17 +948,25 @@ mlx5_txq_obj_hairpin_new(struct rte_eth_dev *dev, uint16_t idx)
 static void
 mlx5_txq_release_devx_sq_resources(struct mlx5_txq_obj *txq_obj)
 {
-	if (txq_obj->sq_devx)
+	if (txq_obj->sq_devx) {
 		claim_zero(mlx5_devx_cmd_destroy(txq_obj->sq_devx));
-	if (txq_obj->sq_umem)
+		txq_obj->sq_devx = NULL;
+	}
+	if (txq_obj->sq_umem) {
 		claim_zero(mlx5_glue->devx_umem_dereg(txq_obj->sq_umem));
-	if (txq_obj->sq_buf)
+		txq_obj->sq_umem = NULL;
+	}
+	if (txq_obj->sq_buf) {
 		mlx5_free(txq_obj->sq_buf);
-	if (txq_obj->sq_dbrec_page)
+		txq_obj->sq_buf = NULL;
+	}
+	if (txq_obj->sq_dbrec_page) {
 		claim_zero(mlx5_release_dbr(&txq_obj->txq_ctrl->priv->dbrpgs,
 					    mlx5_os_get_umem_id
 						 (txq_obj->sq_dbrec_page->umem),
 					    txq_obj->sq_dbrec_offset));
+		txq_obj->sq_dbrec_page = NULL;
+	}
 }
 
 /**
Signature · 1 line
2.16.1.windows.4
#1 lore raw

Hi,

Quoted 36 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Tal Shnaiderman
Sent: Wednesday, October 28, 2020 7:11 PM
To: [email protected]
Cc: NBU-Contact-Thomas Monjalon <[email protected]>; Matan Azrad <[email protected]>; Shahaf Shuler <[email protected]>; Slava Ovsiienko <[email protected]>; [email protected]
Subject: [dpdk-dev] [PATCH] mlx5/net: fix release of SQ resources in error flow

Fix in error flow in which the function mlx5_txq_release_devx_sq_resources is called twice by setting the release object to NULL after the first call

The incorrect flow was introduced in the work done on generic object creation.

Once an error flow inside mlx5_txq_create_devx_sq_resources occurs the function will call mlx5_txq_release_devx_sq_resources however the released pointers are not set to NULL after the release calls and undefined memory is released in the same call in mlx5_txq_release_devx_resources.

This results in calls to MLX5_FREE with
an already released memory addresses and assert in mlx5_release_dbr:

EAL: Error: Invalid memory
EAL: Error: Invalid memory

PANIC in mlx5_txq_release_devx_sq_resources():
assert "(mlx5_release_dbr(&txq_obj->txq_ctrl->priv->dbrpgs,
mlx5_os_get_umem_id (txq_obj->sq_dbrec_page->umem), txq_obj->sq_dbrec_offset)) == 0" failed

The fix is setting the released pointers to NULL after the first release calls.

Quoted 9 lines
Fixes 86d259cec852 ("net/mlx5: separate Tx queue object creations")
---
 drivers/net/mlx5/mlx5_devx.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh