From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 315F048B69 for ; Fri, 21 Nov 2025 12:24:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2AB11402E0; Fri, 21 Nov 2025 12:24:44 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 1B5C44026F for ; Fri, 21 Nov 2025 12:24:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763724282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yM1S2Cw6Rc3f0yY+tHhCkdieXT7uQh3yMCow4jy6WP8=; b=bI7LCVvIJFWtH/mgT4yFqdvMIbyaAXhaTXvyaXpOMsNWRnhGAVkHPaB2WjB7bbRvqs8f33 LBjwokpXR5/hfj3DCTZskb8/9HfyKDb2aeUC0gVQltenzr90eVEBHN68tIaPeG73lEXDZE n/bAdfsosPT74kMOdj88y5Dj5ap8g3M= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-13-qiM0l9XbNu2pHhSJLRKiQw-1; Fri, 21 Nov 2025 06:24:37 -0500 X-MC-Unique: qiM0l9XbNu2pHhSJLRKiQw-1 X-Mimecast-MFC-AGG-ID: qiM0l9XbNu2pHhSJLRKiQw_1763724275 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 593BB1956054; Fri, 21 Nov 2025 11:24:35 +0000 (UTC) Received: from rh.redhat.com (unknown [10.42.28.165]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C2F0930044DB; Fri, 21 Nov 2025 11:24:33 +0000 (UTC) From: Kevin Traynor To: Roi Dayan Cc: Gregory Etelson , Suanming Mou , dpdk stable Subject: patch 'common/mlx5: release unused mempool entries' has been queued to stable release 24.11.4 Date: Fri, 21 Nov 2025 11:21:12 +0000 Message-ID: <20251121112128.485623-88-ktraynor@redhat.com> In-Reply-To: <20251121112128.485623-1-ktraynor@redhat.com> References: <20251121112128.485623-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: udWHJb8jFD0QAYemjD_3EBevCXr9w979CfY-3AyBJbQ_1763724275 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.4 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/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/94afc380af73f6b0f05f430dd07a06be6cfedb10 Thanks. Kevin --- >From 94afc380af73f6b0f05f430dd07a06be6cfedb10 Mon Sep 17 00:00:00 2001 From: Roi Dayan 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 Signed-off-by: Gregory Etelson Acked-by: Suanming Mou --- 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 50922ad398..177255f308 100644 --- a/drivers/common/mlx5/mlx5_common_mr.c +++ b/drivers/common/mlx5/mlx5_common_mr.c @@ -1711,4 +1711,6 @@ mlx5_mr_mempool_register_primary(struct mlx5_mr_share_cache *share_cache, */ 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) { @@ -1717,4 +1719,6 @@ mlx5_mr_mempool_register_primary(struct mlx5_mr_share_cache *share_cache, } 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); @@ -1723,4 +1727,6 @@ mlx5_mr_mempool_register_primary(struct mlx5_mr_share_cache *share_cache, } 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", -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-21 11:05:12.289339217 +0000 +++ 0088-common-mlx5-release-unused-mempool-entries.patch 2025-11-21 11:05:09.591201715 +0000 @@ -1 +1 @@ -From aef94343d3d0b7e11071747f0d2fd66546d7b724 Mon Sep 17 00:00:00 2001 +From 94afc380af73f6b0f05f430dd07a06be6cfedb10 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit aef94343d3d0b7e11071747f0d2fd66546d7b724 ] + @@ -20 +22 @@ -index c41ffff2d5..8ed988dec9 100644 +index 50922ad398..177255f308 100644 @@ -23 +25 @@ -@@ -1718,4 +1718,6 @@ mlx5_mr_mempool_register_primary(struct mlx5_mr_share_cache *share_cache, +@@ -1711,4 +1711,6 @@ mlx5_mr_mempool_register_primary(struct mlx5_mr_share_cache *share_cache, @@ -30 +32 @@ -@@ -1724,4 +1726,6 @@ mlx5_mr_mempool_register_primary(struct mlx5_mr_share_cache *share_cache, +@@ -1717,4 +1719,6 @@ mlx5_mr_mempool_register_primary(struct mlx5_mr_share_cache *share_cache, @@ -37 +39 @@ -@@ -1730,4 +1734,6 @@ mlx5_mr_mempool_register_primary(struct mlx5_mr_share_cache *share_cache, +@@ -1723,4 +1727,6 @@ mlx5_mr_mempool_register_primary(struct mlx5_mr_share_cache *share_cache,