[dpdk-stable] patch 'net/mlx5: fix release of Rx queue object' has been queued to LTS release 17.11.7

Yongseok Koh yskoh at mellanox.com
Tue Jul 23 03:01:13 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/19. So please
shout if anyone has objection.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Yongseok

---
>From 676e14b867f4a8254e3a3a88f1cf8db283520eca Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Tue, 7 May 2019 10:26:02 +0300
Subject: [PATCH] net/mlx5: fix release of Rx queue object

[ backported from upstream commit 10cfa5f2d4affef0561e5245aad4bc69b29cd671 ]

Function mlx5_rx_intr_disable() calls mlx5_rxq_ibv_get() and performs
some actions on the returned rxq_ibv.
It doesn't release the rxq_ibv when all is completed with success.

This patch adds call to mlx5_rxq_ibv_release() where it's missing.

Fixes: 09cb5b581762 ("net/mlx5: separate DPDK from verbs Rx queue objects")

Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Shahaf Shuler <shahafs at mellanox.com>
---
 drivers/net/mlx5/mlx5_rxq.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 3048da985d..c742d7fdf7 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -535,6 +535,7 @@ mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 	}
 	rxq_data->cq_arm_sn++;
 	ibv_ack_cq_events(rxq_ibv->cq, 1);
+	mlx5_rxq_ibv_release(rxq_ibv);
 	return 0;
 exit:
 	ret = rte_errno; /* Save rte_errno before cleanup. */
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:12.188010277 -0700
+++ 0106-net-mlx5-fix-release-of-Rx-queue-object.patch	2019-07-22 17:55:06.550476000 -0700
@@ -1,8 +1,10 @@
-From 10cfa5f2d4affef0561e5245aad4bc69b29cd671 Mon Sep 17 00:00:00 2001
+From 676e14b867f4a8254e3a3a88f1cf8db283520eca Mon Sep 17 00:00:00 2001
 From: Dekel Peled <dekelp at mellanox.com>
 Date: Tue, 7 May 2019 10:26:02 +0300
 Subject: [PATCH] net/mlx5: fix release of Rx queue object
 
+[ backported from upstream commit 10cfa5f2d4affef0561e5245aad4bc69b29cd671 ]
+
 Function mlx5_rx_intr_disable() calls mlx5_rxq_ibv_get() and performs
 some actions on the returned rxq_ibv.
 It doesn't release the rxq_ibv when all is completed with success.
@@ -10,7 +12,6 @@
 This patch adds call to mlx5_rxq_ibv_release() where it's missing.
 
 Fixes: 09cb5b581762 ("net/mlx5: separate DPDK from verbs Rx queue objects")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dekel Peled <dekelp at mellanox.com>
 Acked-by: Shahaf Shuler <shahafs at mellanox.com>
@@ -19,13 +20,13 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
-index 85e6f29188..a00cb12980 100644
+index 3048da985d..c742d7fdf7 100644
 --- a/drivers/net/mlx5/mlx5_rxq.c
 +++ b/drivers/net/mlx5/mlx5_rxq.c
-@@ -730,6 +730,7 @@ mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+@@ -535,6 +535,7 @@ mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id)
  	}
  	rxq_data->cq_arm_sn++;
- 	mlx5_glue->ack_cq_events(rxq_ibv->cq, 1);
+ 	ibv_ack_cq_events(rxq_ibv->cq, 1);
 +	mlx5_rxq_ibv_release(rxq_ibv);
  	return 0;
  exit:


More information about the stable mailing list