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 BF75546BAE for ; Fri, 18 Jul 2025 21:34:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B6C3940611; Fri, 18 Jul 2025 21:34:07 +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 C395A40611 for ; Fri, 18 Jul 2025 21:34:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867245; 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=6DUGm2j0hqCL4pKdrHidCrvY85Ppo357XDslw8hLPmk=; b=jF+KPae87FA22JWRAGT/6tJrtJuF+EnL+3vzYSgEJ+XVIFwM7wSd7rRmJrBxq5r6eID26q tiSSKDOE1f+YTuWNkDHZA9AK2xMb8uZ7EnhTnGyCWRkXdOkQfnPWJ2PGwt02YZJNYpq1W9 WvdtzM7N6wkhZGsmJy/kaivYukJrQAk= 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-180-pJK0lr7lP7OrNnRf-5O-TA-1; Fri, 18 Jul 2025 15:34:02 -0400 X-MC-Unique: pJK0lr7lP7OrNnRf-5O-TA-1 X-Mimecast-MFC-AGG-ID: pJK0lr7lP7OrNnRf-5O-TA_1752867241 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 0365D18004A7; Fri, 18 Jul 2025 19:34:01 +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 62657180045B; Fri, 18 Jul 2025 19:33:59 +0000 (UTC) From: Kevin Traynor To: Dariusz Sosnowski Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix flex tunnel flow validation' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:25 +0100 Message-ID: <20250718193247.1008129-31-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: rT7TYjWqg8zCjyD2-B-mfjK-wb0umavJFU9WaA6oEGk_1752867241 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/66d99d9d2eff1ac399b0f4dddbecb008beb25123 Thanks. Kevin --- >From 66d99d9d2eff1ac399b0f4dddbecb008beb25123 Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Wed, 30 Apr 2025 13:03:31 +0200 Subject: [PATCH] net/mlx5: fix flex tunnel flow validation [ upstream commit 7cafa01ff9fad60d93ba4c536a28c288c36cbcee ] Pattern template validation did not take into account the configured tunnel mode of the flex item. This caused validation failures for templates with flex item registered as tunnel headers. Specifically, any item after such flex item was still considered as outer header, not an inner. This patch fixes the flex item validation, by correctly updating recognized items bitmask depending on flex item mode. Fixes: 80c676259a04 ("net/mlx5: validate HWS template items") Signed-off-by: Dariusz Sosnowski Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_hw.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 3183efe94b..e15466117b 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -8761,10 +8761,19 @@ __flow_hw_pattern_validate(struct rte_eth_dev *dev, MLX5_FLOW_ITEM_OUTER_IPV6_ROUTING_EXT; break; - case RTE_FLOW_ITEM_TYPE_FLEX: - /* match mlx5dr_definer_conv_items_to_hl() */ - last_item = tunnel ? - MLX5_FLOW_ITEM_INNER_FLEX : - MLX5_FLOW_ITEM_OUTER_FLEX; + case RTE_FLOW_ITEM_TYPE_FLEX: { + enum rte_flow_item_flex_tunnel_mode tunnel_mode = FLEX_TUNNEL_MODE_SINGLE; + + ret = mlx5_flex_get_tunnel_mode(item, &tunnel_mode); + if (ret < 0) + return rte_flow_error_set(error, -ret, RTE_FLOW_ERROR_TYPE_ITEM, + item, "Unable to get flex item mode"); + if (tunnel_mode == FLEX_TUNNEL_MODE_TUNNEL) + last_item = MLX5_FLOW_ITEM_FLEX_TUNNEL; + else + last_item = tunnel ? + MLX5_FLOW_ITEM_INNER_FLEX : + MLX5_FLOW_ITEM_OUTER_FLEX; break; + } case RTE_FLOW_ITEM_TYPE_RANDOM: last_item = MLX5_FLOW_ITEM_RANDOM; -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:12.183083945 +0100 +++ 0031-net-mlx5-fix-flex-tunnel-flow-validation.patch 2025-07-18 20:29:10.876907165 +0100 @@ -1 +1 @@ -From 7cafa01ff9fad60d93ba4c536a28c288c36cbcee Mon Sep 17 00:00:00 2001 +From 66d99d9d2eff1ac399b0f4dddbecb008beb25123 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7cafa01ff9fad60d93ba4c536a28c288c36cbcee ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index e9f032f67e..d58f3d10a1 100644 +index 3183efe94b..e15466117b 100644 @@ -30 +31 @@ -@@ -8886,10 +8886,19 @@ __flow_hw_pattern_validate(struct rte_eth_dev *dev, +@@ -8761,10 +8761,19 @@ __flow_hw_pattern_validate(struct rte_eth_dev *dev,