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 AA62545804 for ; Fri, 23 Aug 2024 18:21:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A2DF84338B; Fri, 23 Aug 2024 18:21:34 +0200 (CEST) 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 229C4402BE for ; Fri, 23 Aug 2024 18:21:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430092; 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=7lgaSclxcpBeretYq4F8dxNZ8Ha0CR03T31w4Z0igyU=; b=EicxGGDC3a6GG8Xby2cOd9Fa8ABK4DXLPoiS5nr2vQApwF/doWnJIJiP2g0qhmOFDVI9Fk 7d8/DARdXLnd/cG12ZJ/j814hJvF8zOe5kZ3TDAAgvLwEzKBFCsT9xrcfRuFxt3j1fBEub ySBevrvsJ7lv8ULqp0XYKYJSyt0ok9g= Received: from mx-prod-mc-05.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-653-gsPTzcGGOLexLok6Wu8FEA-1; Fri, 23 Aug 2024 12:21:31 -0400 X-MC-Unique: gsPTzcGGOLexLok6Wu8FEA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 45BA61955F56; Fri, 23 Aug 2024 16:21:30 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6F24E1956053; Fri, 23 Aug 2024 16:21:28 +0000 (UTC) From: Kevin Traynor To: Jiawei Wang Cc: Bing Zhao , Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix hash Rx queue release in flow sample' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:00 +0100 Message-ID: <20240823161929.1004778-52-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 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 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/2a597e9f8b713ba95d47305d656f22533065c4a7 Thanks. Kevin --- >From 2a597e9f8b713ba95d47305d656f22533065c4a7 Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Mon, 20 May 2024 18:07:09 +0300 Subject: [PATCH] net/mlx5: fix hash Rx queue release in flow sample [ upstream commit cf3f6ba146abe613c811a281ceadf7b22ef82ab6 ] While the queue/RSS action was added to sample action lists, the Rx hash queue resource was allocated in the sample action translation to create the sample DR action later. While there's a failure in the flow creation, the Rx hash queue resource of the sample action list was destroyed in the wrong place. This patch adds the checking to release the Rx hash queue resource after the sample action release, to avoid one more extra release if there's a failure. Fixes: ca5eb60ecd5b ("net/mlx5: fix resource release for mirror flow") Signed-off-by: Jiawei Wang Reviewed-by: Bing Zhao Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_dv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 7a3e7ef96f..ff6713225c 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -14147,5 +14147,6 @@ error: handle_idx, dh, next) { /* hrxq is union, don't clear it if the flag is not set. */ - if (dh->fate_action == MLX5_FLOW_FATE_QUEUE && dh->rix_hrxq) { + if (dh->fate_action == MLX5_FLOW_FATE_QUEUE && dh->rix_hrxq && + !dh->dvh.rix_sample && !dh->dvh.rix_dest_array) { mlx5_hrxq_release(dev, dh->rix_hrxq); dh->rix_hrxq = 0; -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.447589876 +0100 +++ 0052-net-mlx5-fix-hash-Rx-queue-release-in-flow-sample.patch 2024-08-23 17:18:09.714430084 +0100 @@ -1 +1 @@ -From cf3f6ba146abe613c811a281ceadf7b22ef82ab6 Mon Sep 17 00:00:00 2001 +From 2a597e9f8b713ba95d47305d656f22533065c4a7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cf3f6ba146abe613c811a281ceadf7b22ef82ab6 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 04cb9291a8..7330e13787 100644 +index 7a3e7ef96f..ff6713225c 100644 @@ -31 +32 @@ -@@ -15669,5 +15669,6 @@ error: +@@ -14147,5 +14147,6 @@ error: