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 16CB246468 for ; Mon, 24 Mar 2025 17:18:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1050A40DD0; Mon, 24 Mar 2025 17:18:27 +0100 (CET) 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 461AA40BA6 for ; Mon, 24 Mar 2025 17:18:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742833105; 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=KMCEfTUsYUaMtXVpPo26RipkaHYpDRFbIuyLqnZziLI=; b=PAgQ4bYOGiVI9ybqm2zaSnEbrugMEiilDOq7IYMcHRkHH1hMK8/+c8MKStDZNDw094ZdLH r83qqDWG7iRjkB1ksteQHmS4L2DDXj5JalgtFwnwFNA72vSG3348qgxBueVzEPwtcYIWMh E9hdloV9XiZmOD5sMse1E3JINJ7R7cw= Received: from mx-prod-mc-06.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-180-RDV5XNsCOc-aGGU3xMeo7A-1; Mon, 24 Mar 2025 12:18:17 -0400 X-MC-Unique: RDV5XNsCOc-aGGU3xMeo7A-1 X-Mimecast-MFC-AGG-ID: RDV5XNsCOc-aGGU3xMeo7A_1742833096 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BBA631800A3F; Mon, 24 Mar 2025 16:18:16 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.16]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 33E9430001A1; Mon, 24 Mar 2025 16:18:14 +0000 (UTC) From: Kevin Traynor To: Bing Zhao Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix flow group ID for action translation' has been queued to stable release 24.11.2 Date: Mon, 24 Mar 2025 16:16:23 +0000 Message-ID: <20250324161731.63950-16-ktraynor@redhat.com> In-Reply-To: <20250324161731.63950-1-ktraynor@redhat.com> References: <20250324161731.63950-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: -N1f6UrZmihe--KqMjvDvG4SYtQRiAqp5_Vf3uzcN48_1742833096 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 03/28/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/a9b2ac1bf31e5e8c6a136fbf4f6c8311353050c9 Thanks. Kevin --- >From a9b2ac1bf31e5e8c6a136fbf4f6c8311353050c9 Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Mon, 3 Mar 2025 15:49:20 +0200 Subject: [PATCH] net/mlx5: fix flow group ID for action translation [ upstream commit 39c93b85866bad6c43a8a6d8bb3f81bfc0d2ff94 ] In HWS non-template API, the actual group ID is calculated in the flow_hw_translate_flow_actions(). This would be set into the dummy template table for the following usage. Since __flow_hw_translate_actions_template() is also called for the dummy action template and some fixed actions' translation. The actual group ID is also needed to avoid the misuse of actions for 'root' table. Only the 'group' in the attributes can be used in this function. The actual group should be set explicitly before calling it in the non-template API. Fixes: 27d171b88031 ("net/mlx5: abstract flow action and enable reconfigure") Signed-off-by: Bing Zhao Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 8f3cb45daf..07037d49cb 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -13520,4 +13520,5 @@ flow_hw_translate_flow_actions(struct rte_eth_dev *dev, table->nb_action_templates = 1; memcpy(&table->cfg.attr.flow_attr, attr, sizeof(*attr)); + table->cfg.attr.flow_attr.group = src_group; table->ats[0].action_template = at; ret = __flow_hw_translate_actions_template(dev, &table->cfg, hw_acts, at, -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-24 16:15:15.382677775 +0000 +++ 0016-net-mlx5-fix-flow-group-ID-for-action-translation.patch 2025-03-24 16:15:14.779735618 +0000 @@ -1 +1 @@ -From 39c93b85866bad6c43a8a6d8bb3f81bfc0d2ff94 Mon Sep 17 00:00:00 2001 +From a9b2ac1bf31e5e8c6a136fbf4f6c8311353050c9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 39c93b85866bad6c43a8a6d8bb3f81bfc0d2ff94 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index c95261cd01..22778310b0 100644 +index 8f3cb45daf..07037d49cb 100644 @@ -30 +31 @@ -@@ -13764,4 +13764,5 @@ flow_hw_translate_flow_actions(struct rte_eth_dev *dev, +@@ -13520,4 +13520,5 @@ flow_hw_translate_flow_actions(struct rte_eth_dev *dev,