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 CB34A48B69 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 C07C2402E6; 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.129.124]) by mails.dpdk.org (Postfix) with ESMTP id D8B80402D7 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=ii/YksLOCiYyZKkVAQY8WpHtYQqm8PSEhWGnFXoESk8=; b=PtvZ3zD3yPohzMcaAwHph0yQkmuObZFOS3KIwSvRoyte6UUUA7Y41VgXAlTyS/P6Qw/NEE EtXQEuQYX9atVK4zp+BikcDj7MSBhCI052iXFxc1TmEroDZKo6eRTnWki3zlLicQXDFAGc jTD4Fa51/2/Op7QgDXQDRVaX+gKw7kA= Received: from mx-prod-mc-01.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-133-ExDREdm8NMiXAkr9uxfcEA-1; Fri, 21 Nov 2025 06:23:27 -0500 X-MC-Unique: ExDREdm8NMiXAkr9uxfcEA-1 X-Mimecast-MFC-AGG-ID: ExDREdm8NMiXAkr9uxfcEA_1763724206 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D08901954B11; Fri, 21 Nov 2025 11:23:26 +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 C462730044DB; Fri, 21 Nov 2025 11:23:25 +0000 (UTC) From: Kevin Traynor To: Rongwei Liu Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix meter mark allocation' has been queued to stable release 24.11.4 Date: Fri, 21 Nov 2025 11:20:35 +0000 Message-ID: <20251121112128.485623-51-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: NdyE50DeeuF1-W7Nu411ueAxeQ0bCgZdqBOlxNE8Llc_1763724206 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/49fdd94e3a56314980642b370818075c03956a4c Thanks. Kevin --- >From 49fdd94e3a56314980642b370818075c03956a4c Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Wed, 5 Nov 2025 14:52:00 +0200 Subject: [PATCH] net/mlx5: fix meter mark allocation [ upstream commit 112facb17b0c0efd90e15501d0830a0f6af7b7c9 ] When failing to allocate a meter HW resource, PMD may use an invalid index to release the job. Fixes: 4359d9d1f76b ("net/mlx5: fix sync meter processing in HWS") Signed-off-by: Rongwei Liu Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 052b7f2768..fcbf8df2c0 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -1901,4 +1901,6 @@ flow_hw_meter_mark_compile(struct rte_eth_dev *dev, true, error); if (!aso_mtr) { + if (queue == MLX5_HW_INV_QUEUE) + queue = CTRL_QUEUE_ID(priv); flow_hw_job_put(priv, job, queue); return -1; -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-21 11:05:11.210396983 +0000 +++ 0051-net-mlx5-fix-meter-mark-allocation.patch 2025-11-21 11:05:09.502201336 +0000 @@ -1 +1 @@ -From 112facb17b0c0efd90e15501d0830a0f6af7b7c9 Mon Sep 17 00:00:00 2001 +From 49fdd94e3a56314980642b370818075c03956a4c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 112facb17b0c0efd90e15501d0830a0f6af7b7c9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index ff68483a40..cd11619b26 100644 +index 052b7f2768..fcbf8df2c0 100644 @@ -22 +23 @@ -@@ -1935,4 +1935,6 @@ flow_hw_meter_mark_compile(struct rte_eth_dev *dev, +@@ -1901,4 +1901,6 @@ flow_hw_meter_mark_compile(struct rte_eth_dev *dev,