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 A738E48B69 for ; Fri, 21 Nov 2025 12:23:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A0DB1402D7; Fri, 21 Nov 2025 12:23:32 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 5EFA4402D7 for ; Fri, 21 Nov 2025 12:23:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763724211; 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=0nWhX6MlQVUUEV0mYuDPwSKUMQk1ez5ixBJK/fXvDw4=; b=TK7NXEEoyroa02/hqbhQKjZa2HIOkQdA3xUnzew6+hZaL5Scoc+dscIqZ5YlN4GqN52ioZ uCJWc2ax3di4MzboeDZKhl3MLWT+i2E9Xf+5SkjDw6W0WeeUqmCzhWrcTGeYivEff2brwz RE65j0pkkMXDt0LsOYdTcufVZ7sm2kM= 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-130-zysObs2GOsevBC_3XvzUOA-1; Fri, 21 Nov 2025 06:23:29 -0500 X-MC-Unique: zysObs2GOsevBC_3XvzUOA-1 X-Mimecast-MFC-AGG-ID: zysObs2GOsevBC_3XvzUOA_1763724208 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 C7DCF1956058; Fri, 21 Nov 2025 11:23:28 +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 3B4FE30044DB; Fri, 21 Nov 2025 11:23:27 +0000 (UTC) From: Kevin Traynor To: Rongwei Liu Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix indirect meter index leak' has been queued to stable release 24.11.4 Date: Fri, 21 Nov 2025 11:20:36 +0000 Message-ID: <20251121112128.485623-52-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: Vp1jTL6i2TF1-EHA2TRu5DpflWQM07x8z1aCf4cT4lQ_1763724208 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/388e0fe6f838573d8deae2c7a4e7a817e7d0b7f3 Thanks. Kevin --- >From 388e0fe6f838573d8deae2c7a4e7a817e7d0b7f3 Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Wed, 5 Nov 2025 14:54:33 +0200 Subject: [PATCH] net/mlx5: fix indirect meter index leak [ upstream commit e56ebf25074280479141eac8050e1f40a69bdbf9 ] When destroying the meter_mark indirect action, PMD didn't recycle the ipool resources. Fixes: 48fbb0e93d06 ("net/mlx5: support flow meter mark indirect action with HWS") Signed-off-by: Rongwei Liu Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index fcbf8df2c0..25cd973a57 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -12695,11 +12695,14 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue, } /* Wait for ASO object completion. */ - if (queue == MLX5_HW_INV_QUEUE && - mlx5_aso_mtr_wait(priv, aso_mtr, true)) { - ret = -EINVAL; - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, - NULL, "Unable to wait for ASO meter CQE"); - break; + if (queue == MLX5_HW_INV_QUEUE) { + if (mlx5_aso_mtr_wait(priv, aso_mtr, true)) { + ret = -EINVAL; + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "Unable to wait for ASO meter CQE"); + } + mlx5_ipool_free(pool->idx_pool, idx); + if (ret < 0) + break; } aso = true; -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-21 11:05:11.246251949 +0000 +++ 0052-net-mlx5-fix-indirect-meter-index-leak.patch 2025-11-21 11:05:09.511201374 +0000 @@ -1 +1 @@ -From e56ebf25074280479141eac8050e1f40a69bdbf9 Mon Sep 17 00:00:00 2001 +From 388e0fe6f838573d8deae2c7a4e7a817e7d0b7f3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e56ebf25074280479141eac8050e1f40a69bdbf9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index cd11619b26..1755f2cffc 100644 +index fcbf8df2c0..25cd973a57 100644 @@ -22 +23 @@ -@@ -13014,11 +13014,14 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue, +@@ -12695,11 +12695,14 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue,