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 1373848AEF for ; Wed, 12 Nov 2025 17:55:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0DFBA40BA6; Wed, 12 Nov 2025 17:55:14 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id E637240DD7 for ; Wed, 12 Nov 2025 17:55:12 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-42b3669ca3dso581177f8f.0 for ; Wed, 12 Nov 2025 08:55:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762966512; x=1763571312; 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=DkO9NCr5FKcmnC8qOpdB+A3YMsxvgeJ2nJuUTyOnpkY=; b=dW1DYfW/iyuWKKtzKuhKFCPkmbfimV4YrVuV9D0uKv13uKgI1C+JI73R3kEbihCfIL 3PflO/XUF3gXHfZa7rqRvGysyi5OkVnlqm9HB7/tsFCj2OJ7pVnLPN+KYlvlmOTW92GJ 38SNKo/yVjgty79CRyRKilM5nViz+/2G39lSqHuXHwX27dLSsyREq+U0JtIeOVKwwgvR 4Dt1L2wPJmtTFXL7om6rmBLQrEBSHyHxuWsXDh0fUC2KqCkWEv3dTjInw/0HwGqrUec5 ASt5e7Z7MXBb1JOXqQvfs/kAbPuvEqBz44ZaVZjlvNHYeSrH7YVrfHCqclGVP4KETxCa WKxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762966512; x=1763571312; 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=DkO9NCr5FKcmnC8qOpdB+A3YMsxvgeJ2nJuUTyOnpkY=; b=RHFvbwrnimfHeLIQyj+A/a9hGvr1/2AmTQfIAiJ1uNh2vohBEXNgXI/iOE2XEgqzOx CfSi/pBNw5au2xzNS4d5gpV9za8qYeKlyFUF+T3ewJ7L9bPmq3SQDpg9zcZJctkUC1tx RxEr5j+S4r2fKIvY0cbjWGQkLAvh4NRblA5+6ktBg352wn8ee2wprHyinulWjpDwoFMz E4ROITI6LH77VYB/tX1MATm7iqg6DUsed8Qlj2inlf+7ZXTkecJGKsW5F0kDcc6hUVak byhY7swPTo+1mBwF7Emfs/q3L803MQzrjVDkxdIP3A/qsbKQscCtFSD2oMTo0ltl4MEU 2szQ== X-Forwarded-Encrypted: i=1; AJvYcCXjqTK/3vaq5qYXi2iitnutXiQ+1PyHHuMjZusb0A8ke0oDdgeh8gzCw6S8E4KW8wZO9XOHoHk=@dpdk.org X-Gm-Message-State: AOJu0Yzzr5CrtGVc3DWAslItmwbbVW1FG8baDeGQvYIlkXm6S8uFA6m1 L2bzJO1THI24rA3moMhaEnt66rD7qUxp0eafrXxqJx8ftVEjvABWcAgDBsAbQg== X-Gm-Gg: ASbGncv5e9Z3DeYwMU/YtlHP4Rka0QMpedHUMIqrqt5YmGmZq3fr0e1XbPln/TlhTap pzcP21UEoL5stV98W6OAF1kvc5X4IIif3LCMaa4h9eATf8WXudn5JPnejHG5CppL8u1dIxzewc9 gBchis83s5WAnIw1lLZFwBO2QBHbstoz8F/y2mjlidaK9zMgDObla7vvl/I5OiWSL2469iE7Evu TT97rfoe0LI9ky0QNsm2G+q5Wpg6vviQZ8Zd6wtIwEunIywGKCmJAlLxLfiaJlSqRvW/lYMQPxl mwIqqGdDKirltJS+BJLIzSM6Gdvn+AKXQaBkbfKJVcWWRKm4n9wB2TC2bEfbkQHPuAuVZROxb+4 hZWBKzu88KFSTCFTEpghO97PZuAIrW2OOHGUSSd9DbBE0rA2/Y434rwqq0MUtBN9Bxmnr1IxSEI rVvr1QIA== X-Google-Smtp-Source: AGHT+IF1D3Xq8UuDylSW5+ldpI/3oM3GVO6GCIEvd6iQzFRwPJOsAxSyBtdfwS+6JgTbNfWa9FdC3g== X-Received: by 2002:a05:6000:420d:b0:42b:3b55:8908 with SMTP id ffacd0b85a97d-42b4bdb8d68mr3428743f8f.51.1762966512414; Wed, 12 Nov 2025 08:55:12 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:a397:14bc:5982:5745]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-42b2e96441dsm27469372f8f.23.2025.11.12.08.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 08:55:11 -0800 (PST) From: luca.boccassi@gmail.com To: Rongwei Liu Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix indirect meter index leak' has been queued to stable release 22.11.11 Date: Wed, 12 Nov 2025 16:52:54 +0000 Message-ID: <20251112165308.1618107-40-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251112165308.1618107-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-79-luca.boccassi@gmail.com> <20251112165308.1618107-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/14/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/9705d89465ffc4873ddf53988dc85395004e1c42 Thanks. Luca Boccassi --- >From 9705d89465ffc4873ddf53988dc85395004e1c42 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 d78520710b..b54df8f432 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -8270,13 +8270,16 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue, break; } /* Wait for ASO object completion. */ - if (queue == MLX5_HW_INV_QUEUE && - mlx5_aso_mtr_wait(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr)) { - 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->sh, MLX5_HW_INV_QUEUE, aso_mtr)) { + 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; } if (!job) mlx5_ipool_free(pool->idx_pool, idx); -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-12 16:20:42.498052534 +0000 +++ 0040-net-mlx5-fix-indirect-meter-index-leak.patch 2025-11-12 16:20:40.999718720 +0000 @@ -1 +1 @@ -From e56ebf25074280479141eac8050e1f40a69bdbf9 Mon Sep 17 00:00:00 2001 +From 9705d89465ffc4873ddf53988dc85395004e1c42 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 d78520710b..b54df8f432 100644 @@ -22 +23 @@ -@@ -13013,13 +13013,16 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue, +@@ -8270,13 +8270,16 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue, @@ -27 +28 @@ -- mlx5_aso_mtr_wait(priv, aso_mtr, true)) { +- mlx5_aso_mtr_wait(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr)) { @@ -34 +35 @@ -+ if (mlx5_aso_mtr_wait(priv, aso_mtr, true)) { ++ if (mlx5_aso_mtr_wait(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr)) { @@ -44,2 +45,2 @@ - aso = true; - break; + if (!job) + mlx5_ipool_free(pool->idx_pool, idx);