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 C347448B59 for ; Thu, 20 Nov 2025 13:45:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BE3DB40262; Thu, 20 Nov 2025 13:45:56 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id DE5B3402E7 for ; Thu, 20 Nov 2025 13:45:53 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4779ce2a624so7583385e9.2 for ; Thu, 20 Nov 2025 04:45:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763642753; x=1764247553; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=feHEOXsFfe2P7tD0qieDfQqMaNgvPxvm0lSO48jrHwQ=; b=AkMqWnuoHpHNM8zwu7NXqg0gF5Isljrhuo9bimTH+qf1YvmgwKRD304T6n3lWKFSMT LxHUqpsbukicewID0LuSFI8SfDGlmCjk7l3m9XwZywdlfZJiMl+nQqOTzymAtBFQi4az 0K9FScXQWczafD8MfKoo2+FCy1VfW27adrFgBx8SwY3pPPRWqAYdlvbIYYF8tT6mgTwU TT96ffQYKBVoss3v9kIKeIBdbiaunYiEUqeuwBh8y/z3aJ+ta4q8PX8FP0zLms+WCoDV sEMK05yNtVBC09jMs14Qa7BxRsHd2nY9qgfHKl41MteG1g0QH2cn8/nq/rhBr7m4rDHX Ffxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763642753; x=1764247553; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=feHEOXsFfe2P7tD0qieDfQqMaNgvPxvm0lSO48jrHwQ=; b=i5nKXqGrawFTdNffHzRuGLTD+ThYkyd5/+wrbo5Rc0TGmpwCor5wG3BLObCBbVem7z LDIjcAzAR4kpZ5MhuoB5xMyCSg2OFwJ+RC3jHa10G2SZ8x4swoNRmf8jusoxsfl2ap3o bBAYcYOWFRMvg0Si29vWPt2RnjxSxfyK1ZAoLCYAIw0IJNEO3vG46qXqRpajHTCSfVjW VEs0gL5mO12yGV4ZvhOGoUyu5UNaekmeH/zMa7MRYJAkpesfDKUs5pVa3reNsfArwwXW hkLGyrPb5VHW5m1A5GwaNUDBRdvFxYsEhPoScreFNJWjjiEK5CQT2wA7E6kqC66wynO9 rwbA== X-Forwarded-Encrypted: i=1; AJvYcCXJDl+7b4kAsMVzc7SRSDuLxoUPem6+zDFn/zZBAENU/XH2kVDWa5HlJsWnrWvq/I5xzis3xuQ=@dpdk.org X-Gm-Message-State: AOJu0YxuL3yxFyeIviMKhkTQVsGaWbDMQKi0TX+xCL4sfCiNwEmoIml9 HqX6DzGpNJ34g0RzPHcrXb0M711o3Y3/uAHbzAaVtIf8h0fPNGyUOOT/ X-Gm-Gg: ASbGncubUQxKpnTzq/u885WkoReqCjJoJIN1K3P85ALfdEpYUM8LeEzS4ZL7GkFx3Ut WCSBf4HgnlRwGRWy6jRY7EyWFyBiw7tU8jqLYYXAg8uLackdewNKTkI2vzV9h5DXsgDCzS6H5r1 /5jpGkzxynm3JIT4K2SuM+YL+00WtBXW4az972OqwW7VVGCKl5SVLbTbnn8CEyHXco8eEhAHd52 gZQ5IkumIWFdquVHJdSaieTbLzPJtwVr0Vp5F6TJSJ5WNXf3aeY4KANXi2RXW2Qn38oiAfhdBeq KBoYC8XGT0955KdCclEvKgljmemCjMxfX7gYhccINHg7fyXszyJrUPOu6tCAWI2wPjAu3Ye+Al5 8VHobi1s7/0Tm3GS3mG0fL6zwHbuqi0jeBhLaJbIwbrj1R3Nxlw1WIguVSoUwZeM889SPQ2ox38 kNoyzYBQjUW3LZJnGy X-Google-Smtp-Source: AGHT+IFq7WK5NBTZIfygx+wGujwd2mVvvX+6VJIW8cOHdI0iNLFzIo4AdPzsDr5WGFDGxAHUIZQP+g== X-Received: by 2002:a05:600c:5248:b0:477:6374:6347 with SMTP id 5b1f17b1804b1-477b8a8ed68mr28386325e9.22.1763642753347; Thu, 20 Nov 2025 04:45:53 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f372:8d1a:399f:e8a2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-477b10763a9sm106647005e9.12.2025.11.20.04.45.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 04:45:52 -0800 (PST) From: luca.boccassi@gmail.com To: Roi Dayan Cc: Gregory Etelson , Suanming Mou , dpdk stable Subject: patch 'common/mlx5: release unused mempool entries' has been queued to stable release 22.11.11 Date: Thu, 20 Nov 2025 12:44:46 +0000 Message-ID: <20251120124514.757933-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251120124514.757933-1-luca.boccassi@gmail.com> References: <20251112165308.1618107-49-luca.boccassi@gmail.com> <20251120124514.757933-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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 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 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,