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 6649646BAE for ; Fri, 18 Jul 2025 21:36:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6044140611; Fri, 18 Jul 2025 21:36:25 +0200 (CEST) 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 85E4E40E2E for ; Fri, 18 Jul 2025 21:36:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867384; 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=b7/XIy6VlcJzmQNGMppLIFuj+DvNNLo+AdKzVZRHRNk=; b=N0+JrlaX1M49YPAlbJauJ/IcsH4BmpLKYgERAIEHaIF3q7tSURpdhq9OwRzKj+w4j2G426 9oiCsLQrFzA9lQMYgFEounViCwFCYzbE45KE8V70VWieXKPUrC3IgQ+Lzy48meR+zmvjiB HHSyG0Mh9jn67/FdIXuMiskqyyMYQNI= 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-158-sP9px4i1MI6FBtYqaQidgQ-1; Fri, 18 Jul 2025 15:36:20 -0400 X-MC-Unique: sP9px4i1MI6FBtYqaQidgQ-1 X-Mimecast-MFC-AGG-ID: sP9px4i1MI6FBtYqaQidgQ_1752867379 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BACA1195FD02; Fri, 18 Jul 2025 19:36:19 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3F30B18003FC; Fri, 18 Jul 2025 19:36:18 +0000 (UTC) From: Kevin Traynor To: Junfeng Guo Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix template flow rule identification' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:32 +0100 Message-ID: <20250718193247.1008129-98-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-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: 7NKUPEgthu0Ue5UeBghn3lrUiaFwLRcu_Tagb4djwfY_1752867379 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/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/709450b4cbdf30afd4cbe652dc7ed1901dda8b6f Thanks. Kevin --- >From 709450b4cbdf30afd4cbe652dc7ed1901dda8b6f Mon Sep 17 00:00:00 2001 From: Junfeng Guo Date: Thu, 5 Jun 2025 13:07:34 +0300 Subject: [PATCH] net/mlx5: fix template flow rule identification [ upstream commit 82e0453609e59d66b0fce9c59ce0380d7bc39e17 ] Set the flag nt_rule to be FALSE whenever the flow rule is created through template API. This would ensure that this flow is always treated as template API flow after mlx5_ipool_malloc without being zeroing via memset. Otherwise, some tables or template actions may be still in use for port init stage when attaching a port for template or non-template rule, in scenarios where the uninitialized memory nt_rule happens to contain a TRUE value. Fixes: 2fda185a8c1c ("net/mlx5: reuse flow fields") Fixes: 63296851fadb ("net/mlx5: support flow rule update") Signed-off-by: Junfeng Guo Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index a0e7a6ba0b..f60b7b0cc0 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -3889,4 +3889,5 @@ flow_hw_async_flow_create_generic(struct rte_eth_dev *dev, goto error; } + flow->nt_rule = false; rule_acts = flow_hw_get_dr_action_buffer(priv, table, action_template_index, queue); /* @@ -4095,5 +4096,5 @@ flow_hw_async_flow_update(struct rte_eth_dev *dev, aux = mlx5_flow_hw_aux(dev->data->port_id, of); nf = &aux->upd_flow; - memset(nf, 0, sizeof(struct rte_flow_hw)); + nf->nt_rule = false; rule_acts = flow_hw_get_dr_action_buffer(priv, table, action_template_index, queue); /* -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:14.397657882 +0100 +++ 0098-net-mlx5-fix-template-flow-rule-identification.patch 2025-07-18 20:29:11.011907579 +0100 @@ -1 +1 @@ -From 82e0453609e59d66b0fce9c59ce0380d7bc39e17 Mon Sep 17 00:00:00 2001 +From 709450b4cbdf30afd4cbe652dc7ed1901dda8b6f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 82e0453609e59d66b0fce9c59ce0380d7bc39e17 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index e26093522f..af2e7a84a5 100644 +index a0e7a6ba0b..f60b7b0cc0 100644 @@ -30 +31 @@ -@@ -3936,4 +3936,5 @@ flow_hw_async_flow_create_generic(struct rte_eth_dev *dev, +@@ -3889,4 +3889,5 @@ flow_hw_async_flow_create_generic(struct rte_eth_dev *dev, @@ -36 +37 @@ -@@ -4142,5 +4143,5 @@ flow_hw_async_flow_update(struct rte_eth_dev *dev, +@@ -4095,5 +4096,5 @@ flow_hw_async_flow_update(struct rte_eth_dev *dev,