Skip to contentSkip to conversation

net/mlx5: fix queue leaking in hairpin auto bind checking

PATCH In review Bing Zhao 2 participants 2 messages Jul 24, 2021 – Jul 28, 2021 Network drivers

lore
Share & tools
lore

Bing Zhao

author
#0 lore raw

PATCH 1/1 net/mlx5: fix queue leaking in hairpin auto bind checking

During the start up stage, the hairpin auto bind was executed for each port. All the Tx and Rx queues configured for this port should be checked to confirm if the auto bind of hairpin is needed.
1. The queue is hairpin queue.
2. The peer port is the same one and the peer queue should also be with hairpin type.
3. The manual bind attribute is not set for this queue.

If the queue is not a hairpin queue or it doesn't need to be bound automatically, the reference count should be decreased by 1 since the count was increased when calling the mlx5_*xq_get(). When the peer port is not the same, it means that no auto bind is supported and the mlx5_*xq_release() was missed in the current implementation.

By calling the release function before continue, the count is correct when calling the device close.

Fixes aa8bea0e3455 ("net/mlx5: add conditional hairpin auto bind")
---
 drivers/net/mlx5/mlx5_trigger.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/net/mlx5/mlx5_trigger.c +5 -7
index a9d5d58fd9..54173bfacb 100644
@@ -228,12 +228,11 @@ mlx5_hairpin_auto_bind(struct rte_eth_dev *dev)
 		txq_ctrl = mlx5_txq_get(dev, i);
 		if (!txq_ctrl)
 			continue;
-		if (txq_ctrl->type != MLX5_TXQ_TYPE_HAIRPIN) {
+		if (txq_ctrl->type != MLX5_TXQ_TYPE_HAIRPIN ||
+		    txq_ctrl->hairpin_conf.peers[0].port != self_port) {
 			mlx5_txq_release(dev, i);
 			continue;
 		}
-		if (txq_ctrl->hairpin_conf.peers[0].port != self_port)
-			continue;
 		if (txq_ctrl->hairpin_conf.manual_bind) {
 			mlx5_txq_release(dev, i);
 			return 0;
@@ -247,13 +246,12 @@ mlx5_hairpin_auto_bind(struct rte_eth_dev *dev)
 		txq_ctrl = mlx5_txq_get(dev, i);
 		if (!txq_ctrl)
 			continue;
-		if (txq_ctrl->type != MLX5_TXQ_TYPE_HAIRPIN) {
+		/* Skip hairpin queues with other peer ports. */
+		if (txq_ctrl->type != MLX5_TXQ_TYPE_HAIRPIN ||
+		    txq_ctrl->hairpin_conf.peers[0].port != self_port) {
 			mlx5_txq_release(dev, i);
 			continue;
 		}
-		/* Skip hairpin queues with other peer ports. */
-		if (txq_ctrl->hairpin_conf.peers[0].port != self_port)
-			continue;
 		if (!txq_ctrl->obj) {
 			rte_errno = ENOMEM;
 			DRV_LOG(ERR, "port %u no txq object found: %d",
Signature · 1 line
2.27.0
#1 lore raw

Hi,

Quoted 24 lines

-----Original Message-----
From: Bing Zhao <[email protected]>
Sent: Saturday, July 24, 2021 4:27 PM
To: Slava Ovsiienko <[email protected]>; Matan Azrad <[email protected]>
Cc: [email protected]; Ori Kam <[email protected]>; Raslan Darawsheh <[email protected]>; [email protected]
Subject: [PATCH] net/mlx5: fix queue leaking in hairpin auto bind checking

During the start up stage, the hairpin auto bind was executed for each port. All the Tx and Rx queues configured for this port should be checked to confirm if the auto bind of hairpin is needed.
1. The queue is hairpin queue.
2. The peer port is the same one and the peer queue should also be with hairpin type.
3. The manual bind attribute is not set for this queue.

If the queue is not a hairpin queue or it doesn't need to be bound automatically, the reference count should be decreased by 1 since the count was increased when calling the mlx5_*xq_get(). When the peer port is not the same, it means that no auto bind is supported and the mlx5_*xq_release() was missed in the current implementation.

Quoted 8 lines

By calling the release function before continue, the count is correct when calling the device close.

Fixes aa8bea0e3455 ("net/mlx5: add conditional hairpin auto bind")

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh