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 C643046211 for ; Thu, 13 Feb 2025 11:02:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C1B5B42F13; Thu, 13 Feb 2025 11:02:39 +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 D3AE242F11 for ; Thu, 13 Feb 2025 11:02:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440958; 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=9kZKDpncz3EWtqctYsB/mZb/9Tu/tj1BcmMwqq1wnV8=; b=R+r9VqepUeBvIPR0Qz2igTXZ9TPtbbjlsB61Pp58kYbK/V6mYgu8Ntrs8tyFTKzJKgwtk+ FBCGmif8jIKPF4fWBXK8UXOtpIvL6zc3HoWOpAm9vWPnNsUMfTxymlzqYtIBGwP8oH4PWi vdodgeOwCs87jpRKnSHe600tRYBHFWM= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-121-7tnpXTR4OTS-XVyROXt0Rg-1; Thu, 13 Feb 2025 05:02:35 -0500 X-MC-Unique: 7tnpXTR4OTS-XVyROXt0Rg-1 X-Mimecast-MFC-AGG-ID: 7tnpXTR4OTS-XVyROXt0Rg_1739440954 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 436F21800373; Thu, 13 Feb 2025 10:02:34 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A99FD1800360; Thu, 13 Feb 2025 10:02:32 +0000 (UTC) From: Kevin Traynor To: Maayan Kashani Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix flush of non-template flow rules' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:41 +0000 Message-ID: <20250213095933.362078-74-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: snDftDEj_7Mb5k8dippuAbNIiR7MLjYpcpKsmvIquqM_1739440954 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/17/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/c6eafb6fe056da98f66807304b30d3bef313c5e4 Thanks. Kevin --- >From c6eafb6fe056da98f66807304b30d3bef313c5e4 Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Tue, 28 Jan 2025 09:54:05 +0200 Subject: [PATCH] net/mlx5: fix flush of non-template flow rules [ upstream commit 716929be9456b78875d0eb20bc54c13acf99efc0 ] Fix flow flush for non template flows on top of HWS, in another fix it was added return after releasing template flows. Need to drop the return in order to release non template list of flows. Fixes: 1ea333d2de22 ("net/mlx5: fix Rx queue reference count in flushing flows") Signed-off-by: Maayan Kashani Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 9203643300..3d3b422f05 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -8122,5 +8122,4 @@ mlx5_flow_list_flush(struct rte_eth_dev *dev, enum mlx5_flow_type type, flow_hw_q_flow_flush(dev, NULL); priv->hws_rule_flushing = false; - return; } #endif -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:42.438371758 +0000 +++ 0074-net-mlx5-fix-flush-of-non-template-flow-rules.patch 2025-02-12 17:29:34.469946640 +0000 @@ -1 +1 @@ -From 716929be9456b78875d0eb20bc54c13acf99efc0 Mon Sep 17 00:00:00 2001 +From c6eafb6fe056da98f66807304b30d3bef313c5e4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 716929be9456b78875d0eb20bc54c13acf99efc0 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index bfc44f25bf..a2ee237841 100644 +index 9203643300..3d3b422f05 100644 @@ -23 +24 @@ -@@ -8119,5 +8119,4 @@ mlx5_flow_list_flush(struct rte_eth_dev *dev, enum mlx5_flow_type type, +@@ -8122,5 +8122,4 @@ mlx5_flow_list_flush(struct rte_eth_dev *dev, enum mlx5_flow_type type,