patch 'common/mlx5: release unused mempool entries' has been queued to stable release 22.11.11

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/22/25. So please
shout if anyone has objections.

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.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/28415a267415867bdbc7a6ef8c19024183823062

Thanks.

Luca Boccassi

---
>From 28415a267415867bdbc7a6ef8c19024183823062 Mon Sep 17 00:00:00 2001
From: Roi Dayan <roid at nvidia.com>
Date: Wed, 12 Nov 2025 09:41:31 +0200
Subject: [PATCH] common/mlx5: release unused mempool entries

[ upstream commit aef94343d3d0b7e11071747f0d2fd66546d7b724 ]

When creating a new mempool but assigning a shared entries
from a different mempool need to release the newly unused
allocated entries. Fix it.

Fixes: 8947eebc999e ("common/mlx5: fix shared memory region ranges allocation")

Signed-off-by: Roi Dayan <roid at nvidia.com>
Signed-off-by: Gregory Etelson <getelson at nvidia.com>
Acked-by: Suanming Mou <suanmingm at nvidia.com>
---
 drivers/common/mlx5/mlx5_common_mr.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c
index 1fdd8b4c80..a36dd6e834 100644
--- a/drivers/common/mlx5/mlx5_common_mr.c
+++ b/drivers/common/mlx5/mlx5_common_mr.c
@@ -1710,18 +1710,24 @@ mlx5_mr_mempool_register_primary(struct mlx5_mr_share_cache *share_cache,
 	 * hugepage can be shared across mempools that also fit in it.
 	 */
 	if (share_hugepage) {
+		struct mlx5_mempool_mr *gc_mrs = NULL;
+
 		rte_rwlock_write_lock(&share_cache->rwlock);
 		LIST_FOREACH(mpr, &share_cache->mempool_reg_list, next) {
 			if (mpr->mrs[0].pmd_mr.addr == (void *)ranges[0].start)
 				break;
 		}
 		if (mpr != NULL) {
+			/* Releasing MRs here can create a dead-lock on share_cache->rwlock */
+			gc_mrs = new_mpr->mrs;
 			new_mpr->mrs = mpr->mrs;
 			mlx5_mempool_reg_attach(new_mpr);
 			LIST_INSERT_HEAD(&share_cache->mempool_reg_list,
 					 new_mpr, next);
 		}
 		rte_rwlock_write_unlock(&share_cache->rwlock);
+		if (gc_mrs != NULL)
+			mlx5_free(gc_mrs);
 		if (mpr != NULL) {
 			DRV_LOG(DEBUG, "Shared MR %#x in PD %p for mempool %s with mempool %s",
 				mpr->mrs[0].pmd_mr.lkey, pd, mp->name,
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-11-20 12:44:13.290158022 +0000
+++ 0014-common-mlx5-release-unused-mempool-entries.patch	2025-11-20 12:44:12.790088272 +0000
@@ -1 +1 @@
-From aef94343d3d0b7e11071747f0d2fd66546d7b724 Mon Sep 17 00:00:00 2001
+From 28415a267415867bdbc7a6ef8c19024183823062 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit aef94343d3d0b7e11071747f0d2fd66546d7b724 ]
+
@@ -20 +22 @@
-index c41ffff2d5..8ed988dec9 100644
+index 1fdd8b4c80..a36dd6e834 100644
@@ -23 +25 @@
-@@ -1717,18 +1717,24 @@ mlx5_mr_mempool_register_primary(struct mlx5_mr_share_cache *share_cache,
+@@ -1710,18 +1710,24 @@ mlx5_mr_mempool_register_primary(struct mlx5_mr_share_cache *share_cache,