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 BA3BE46423 for ; Wed, 19 Mar 2025 15:22:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE8074060C; Wed, 19 Mar 2025 15:22:08 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 6A43C4026B for ; Wed, 19 Mar 2025 15:22:07 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4394036c0efso31279545e9.2 for ; Wed, 19 Mar 2025 07:22:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742394127; x=1742998927; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dtgaDef2Z6t7nXlADhPss8ui6BVA5rZa0o1H/RG36Ck=; b=KHaz6Nltw9zFfdwmk/ULB0zrVipgzlzOkWA1wosPkW7gX6NOBBE8bkePQ90QjwKwte cKfxy6d+JZMbHYmgTjA/X2pbEm7et9Jdr8ldH3pbNi7rzAewqDmHmeZdoQ5u7MwWCvxs S5TL/qWJ6tbT2Z2yZ9dkR4YJgs3czogyfLybA6gIIRWeWO2a7A2iUgOePQPRCa9ssA/D tFNF1OAYq8WltsGBmhPcVub0VlFlWucpuNUh059czA9RIIAdfc2EGO1liZVOweGMWwHH Tk0yzNsI5pINxjUwK2YSHp9Mvk/DyjDVZWccCyQBpqmpNK8oppO7ztdOE+9789+R1pro 8dwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742394127; x=1742998927; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dtgaDef2Z6t7nXlADhPss8ui6BVA5rZa0o1H/RG36Ck=; b=fzqiCsaKD4OwxnbuIRx/6AakW8nAkbJPhrkTpfLzd6/T5KIXjlhw6WP+7myn2PWN1t A2aKlu3IbE8XRinSlcF8stbS8H875hDM9AFGDeB9+Fe0DieyYwREPWXwfEGG2Ik75oOA kIGjoY8FM0sRSyiERkvm4j7HJPAPUzs3bJRplNEsmFVnUt/dByG+8Ukd6ZOGQ2njDepA OLJAh0CNKZM3z35DaOlNckXH8EumMW4ByZxqE0rY+c2M+oeETb8KpmZZZW6NNDyUaCjS p9v5QsfdztGmO0Q2SqhVta6DgHby5npNbze27halgEZ7g7VM02nshDf1Vj8HcG6KkWYd bsJg== X-Forwarded-Encrypted: i=1; AJvYcCUS58pGYu19cfBZCrjQuUmNznw6jFh2xbjVAnXIyjWXy2CxyEYn+JcVZ4ZSR8DG+55HJm9iWGA=@dpdk.org X-Gm-Message-State: AOJu0YwMneQgIlW4bkY1RY/pF7LHwZJZdpIs11NqxThC2fKeQ+vU8ybu cM2zU7AWBfhef1C/TIPODH1Zi7S9BpQSa+t/zkPOd/N51loF+sYg9Yvs4w== X-Gm-Gg: ASbGncuzjleV5Ok3Hj7EvJTCJ5/50waxRVMRVYa9Yafn41evkLFTrbeVQuBSl8pVJ31 e4YWWayHAJo6UdEef9i8AQNIlMyB1flWXyK3/8KfW2Lmoetzg8mKGJyKf6e7UaONE+NIFtTQxFz r35BuXZLBSraHB8ARnvD9SedVw5Rl3BJJdB0jRLGOu3Zfu/H51CauZJOkFz7lBHCocicP7169NQ sIJXlMiZPbEux9Ths4IQTaqMojtf3AXdcU8XgbQe6i6ojbCT1zjvSn3olKmU/rjX6LjomNWDSvI 9/cBa7XmX8LE00J6muP1POyAK596TEGWOPwvj8M0GKu8DSmA+xg= X-Google-Smtp-Source: AGHT+IGSt4WLT+HbCvf1ngqMd5EuyygYED1x5KXrhWAwKrSWpqANHYZxZiPxfZ4rZ2mJc3gf0F5KAA== X-Received: by 2002:a05:600c:5785:b0:43a:ed4d:716c with SMTP id 5b1f17b1804b1-43d4454add2mr19108975e9.22.1742394126922; Wed, 19 Mar 2025 07:22:06 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:4eab:5a5d:ba39:287e]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-395cb7ebaa5sm21018840f8f.87.2025.03.19.07.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 07:22:06 -0700 (PDT) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix IPIP tunnel verification' has been queued to stable release 22.11.8 Date: Wed, 19 Mar 2025 14:21:19 +0000 Message-ID: <20250319142142.439602-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250319142142.439602-1-luca.boccassi@gmail.com> References: <20250307122431.1415551-28-luca.boccassi@gmail.com> <20250319142142.439602-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.8 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/21/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/963a6c51d044a62e833c6d276b0d6e072214c4a7 Thanks. Luca Boccassi --- >From 963a6c51d044a62e833c6d276b0d6e072214c4a7 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 df437aba38..2cc7376669 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7249,7 +7249,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, mlx5_flow_tunnel_ip_check(items, next_protocol, 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; } @@ -7270,7 +7273,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, mlx5_flow_tunnel_ip_check(items, next_protocol, 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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-19 14:20:57.374803928 +0000 +++ 0008-net-mlx5-fix-IPIP-tunnel-verification.patch 2025-03-19 14:20:57.073289107 +0000 @@ -1 +1 @@ -From 3d80d35b118ecfb650e51fabafc682ea8a3adb8f Mon Sep 17 00:00:00 2001 +From 963a6c51d044a62e833c6d276b0d6e072214c4a7 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 df437aba38..2cc7376669 100644 @@ -29 +30 @@ -@@ -7925,7 +7925,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7249,7 +7249,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -41 +42 @@ -@@ -7949,7 +7952,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7270,7 +7273,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,