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 BFA1446468 for ; Mon, 24 Mar 2025 17:18:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B971640A71; Mon, 24 Mar 2025 17:18:25 +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 EAEA740A71 for ; Mon, 24 Mar 2025 17:18:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742833103; 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=NiBXusEmfRRnE26jCwEXkyliuTINp47OcyrKrtgFxi4=; b=QXSERV5/Yyt+KCHXBX0j76DjB0AtasCUPkg6BrvYALCtDlqmoIf5gbREJcYJKtV01sgjut eqhj5uNS0DbqeGG4PdqU+Cg0B6Ed8FQHa/coFWFYQjzKnXLM6Um0JQskTpIkNEfcinhSYd oUrrUN1E7Tv6hTVHt7EYPN7wbCE4iVs= Received: from mx-prod-mc-03.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-221-fiL-9XCFPWCqq6H4Fv2-Eg-1; Mon, 24 Mar 2025 12:18:22 -0400 X-MC-Unique: fiL-9XCFPWCqq6H4Fv2-Eg-1 X-Mimecast-MFC-AGG-ID: fiL-9XCFPWCqq6H4Fv2-Eg_1742833101 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 12A6E1955D84; Mon, 24 Mar 2025 16:18:21 +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 7BB4730001A1; Mon, 24 Mar 2025 16:18:19 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix IPIP tunnel verification' has been queued to stable release 24.11.2 Date: Mon, 24 Mar 2025 16:16:25 +0000 Message-ID: <20250324161731.63950-18-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: cq6cYzskN7giPAijck6q3UsF4lpxMhqPuCJZYAio3WA_1742833101 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/116949c7a7b780f147613068cbbd6257e6053654 Thanks. Kevin --- >From 116949c7a7b780f147613068cbbd6257e6053654 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Mon, 10 Mar 2025 13:19:45 +0200 Subject: [PATCH] net/mlx5: fix IPIP tunnel verification [ upstream commit 3d80d35b118ecfb650e51fabafc682ea8a3adb8f ] Assuming a case with the following pattern: eth / ipv4 / udp / vxlan / eth / ipv4 proto is (IPv4 | IPv6) MLX5 PMD incorrectly recognized this as a packet encapsulated as VXLAN and IP in IP at the same packet header level. This caused a flow validation error. This patch fixes the inner IP in IP detection logic. Fixes: 2db234e769e1 ("net/mlx5: fix IP-in-IP tunnels recognition") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_dv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index a4a3552386..6fe4204c1f 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7926,5 +7926,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, item_flags, &l3_tunnel_flag); - if (l3_tunnel_detection == l3_tunnel_inner) { + /* + * explicitly allow inner IPIP match + */ + if (l3_tunnel_detection == l3_tunnel_outer) { item_flags |= l3_tunnel_flag; tunnel = 1; @@ -7950,5 +7953,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, item_flags, &l3_tunnel_flag); - if (l3_tunnel_detection == l3_tunnel_inner) { + /* + * explicitly allow inner IPIP match + */ + if (l3_tunnel_detection == l3_tunnel_outer) { item_flags |= l3_tunnel_flag; tunnel = 1; -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-24 16:15:15.478266052 +0000 +++ 0018-net-mlx5-fix-IPIP-tunnel-verification.patch 2025-03-24 16:15:14.815735765 +0000 @@ -1 +1 @@ -From 3d80d35b118ecfb650e51fabafc682ea8a3adb8f Mon Sep 17 00:00:00 2001 +From 116949c7a7b780f147613068cbbd6257e6053654 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3d80d35b118ecfb650e51fabafc682ea8a3adb8f ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index c77041317b..8703403b8f 100644 +index a4a3552386..6fe4204c1f 100644