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 C426646532 for ; Tue, 8 Apr 2025 10:12:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD68240E4F; Tue, 8 Apr 2025 10:12:17 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2079.outbound.protection.outlook.com [40.107.92.79]) by mails.dpdk.org (Postfix) with ESMTP id 343AC4027F for ; Tue, 8 Apr 2025 10:12:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cLG7461lSzk8domuMhEHzQ5ZU/sfUxrZs/V+GZ8GF3kQzaSEOddBacYV3LDFydn6LBlkOtOANmC3gbRlMSx1oWpnIJFxnTYFgxsZ1MYAo9BYbFv5ZDizsJzN2kDzWRpSzPs37b8uzsMq3zeH1fp3MZKzrHSniWERrhhpZ5C5uZi6Q71dHsfyzAEA3ozcWEco98ENEKi/EQwncnyitHI7VoUmE3yVY1U4Xd86dHqOH94bK3w8PxRTymO3GQHW4OhGnhKs54bWy1n41k/2IPnVrmgJEnkcB9jnoEptPJ9Rzs56gJs+odLrccHXXcqrgrD9fq7vUyol78as/jLU10wBZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=O+4NNi+DpkwTwcO6VPblSTF8kum3PDBeVpbiHoZTvQ4=; b=C0uWQ3L37reB3TrI3k6k0k8vHvj1FdgZ2fXxsO1KH1qxSY3K2ouFID2wvzo2c5Kr1UmMCv9PARcw4m03IavCCqCjy4Gt8mGFxuycHFDMR9lp0lP/MuZ7lI1CDpkhDWtiLmBuSaa+vaqWDPL49o25wNNdaPPeoyh8vOQAunfK1gtkDGo0g1Y7mi2WlqyvNVIKOjxuQjqPlMnHKsakxfEJ55x1bf0CGYOkV9T1e6Y5Sbj2588u+bAONqO2MxuEUavoB3tbepBBmsm/U2JMbhwp3/TPV4+0UX8/FGy/mk/L5E5z83lq9pQZXgvUJ08l1Xmn5LWTTAieikyLDm5swTJElQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O+4NNi+DpkwTwcO6VPblSTF8kum3PDBeVpbiHoZTvQ4=; b=Dq96v/ZBfkz7VWOXRgIqp8SuCtoD6U7N89Wr63STo37yPIXDAIvC6BoodZgjZ1tAnroVsrM9W3rVeFPIlZwhhQCPNjRmXe4bqqrwujBguRlo9pl/qhrQq8WVBUPWO/NEHAuM2CpdrCLzQnLZLGxq+Fy5h+LRAVh0NSxWDFXsY2aBLQ58YiC2xyRYdBZHW4yp5zH6N4UT+Unsz0vorpMDkzzJ0oLo/esbzZbw5LfBeWX0ywYAfj8Otc8MqDaCLJg94PJNmQEZhZeseQUx6MVvXUcwDV8iPCYk+93VJK6B/xJRpQTxfpLoARnzm1EHA2O0Vg/eaXgwW3cZq8OqcaAX0g== Received: from DS7PR03CA0022.namprd03.prod.outlook.com (2603:10b6:5:3b8::27) by DS0PR12MB8018.namprd12.prod.outlook.com (2603:10b6:8:149::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.35; Tue, 8 Apr 2025 08:12:13 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:5:3b8:cafe::c) by DS7PR03CA0022.outlook.office365.com (2603:10b6:5:3b8::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8606.35 via Frontend Transport; Tue, 8 Apr 2025 08:12:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS3PEPF000099E2.mail.protection.outlook.com (10.167.17.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.22 via Frontend Transport; Tue, 8 Apr 2025 08:12:13 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 8 Apr 2025 01:12:02 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 8 Apr 2025 01:12:00 -0700 From: Xueming Li To: Gregory Etelson CC: Xueming Li , Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix IPIP tunnel verification' has been queued to stable release 23.11.4 Date: Tue, 8 Apr 2025 16:10:45 +0800 Message-ID: <20250408081054.375502-7-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408081054.375502-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> <20250408081054.375502-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099E2:EE_|DS0PR12MB8018:EE_ X-MS-Office365-Filtering-Correlation-Id: b87548f4-c342-4d53-31f2-08dd767511c5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?pI2rbTFm6sdmm1rZJ1zY2Hk/tz0WC0Kd+9UJ7+hUf3T+eLdDrWCk6DyMx4La?= =?us-ascii?Q?MZplOFLOzGC4j30p+jstd+2sI/1+wLArRM/FtdV06oTeZANwWHe822cFIy9f?= =?us-ascii?Q?Wkf6vkrs3TQ+HtALyOfEve+N5jEezjrTGncozMnkH+B8saYf9cGN729NBAAZ?= =?us-ascii?Q?ljmKUnwtcsJaza1A4zLPXjy6GLByXvqiFFJpIriu8hHEucoAY1pba+jFHyPl?= =?us-ascii?Q?6JFn2SpWGksbXoxgug+y+79eC5GZXGbaoCV9/6uYeI/gh/oD7TPjVGtUDn3b?= =?us-ascii?Q?tbSmwpfh3Ca4VL+fLW2Rbw44SrZZWsA8++JSOpNVa7JZ/gZbNGyPiYiXX8kI?= =?us-ascii?Q?tJwmmgiXHmDV7K6FttMA+lXGgq3KBtOjQNUcLix1fHG1DoP5+pRBXVM8Z9JS?= =?us-ascii?Q?JrxhbW1Oo42AFT1o3zqXAFFDyw4ptLyz1cXumHW6HPyWeU/Hka4dhlwYa7TO?= =?us-ascii?Q?Ig5iMDVtQnKD2EIs+Amp69qaCVHtYA2lrTHOPFO8J8QPzw7QUOwaIzuD96b0?= =?us-ascii?Q?GnIiDDa3PgIFo6VCLZuAvn7+VivffvluYFPGTbU+pYpdAjJAz0EB1VJfuu+z?= =?us-ascii?Q?G8RLUdzCFlF8kkryu2ByR9aSkAYFNT4Nw+jua0cB409YcpMsxh/CewvL95Wm?= =?us-ascii?Q?gKFzvP0g88pLbTn0F6xl6Ovdv1o+a6wALg5UtawzJoXaK3LbBtuDdvi1HNl+?= =?us-ascii?Q?cBc74aShFrue17GuDUqj3HCZqwfyoXIW3rrhQAMSyeoizbVE2Qzqq6VRU57V?= =?us-ascii?Q?0SJ89a9EGi3DlNdcfmmFRWV4SOYU9SjndrbD36aiA5ajAJM9MlhdSJhsLrq6?= =?us-ascii?Q?Dwd62atbFLTqYKVviMdfZfAZvuBB6KyXUxamqtQusXpicTf+hRqdD4uWsfCj?= =?us-ascii?Q?ZaKLaLnOR930ObTtnqCxIt488EBhvzaAq4wDsyBTLAHhU2iEWv5CwpUb7oqV?= =?us-ascii?Q?I3DXXaCq8VcRhH/KscVxTvGuCcaqL4GQVxcAjb2s8Kp4iudktgJ9bSyvz1fS?= =?us-ascii?Q?EkPFS5ZKhlwAJT9jR3ShZshWjHq5kYMb42moRokam8De5dh1P3VQda/M+uKS?= =?us-ascii?Q?nMsWG6bWr7FhcOnFd8/EoKvAlrgaLhs8s08YzO3p1zFt+vhNq+FQS+PJMt3u?= =?us-ascii?Q?kFVWfA4Srh/hWNx9ZqICcUAlXQ7+ImexK0/S6uvOtn+mkPyZ0vdcdsLSzK6E?= =?us-ascii?Q?6j3DaJ+pLi+52tLsBmUA/x+W0MHpSR3VDGYA8ekk6bUETGDFhtzgZqQBtewm?= =?us-ascii?Q?7prGudR1QEiP4i5Fg6TIA8/trq7nli0XRuEKHlOzU1xlnW6Z5oJHpulJG9S3?= =?us-ascii?Q?hOqr2QHGOUoln2akFk0wNDw6b38/h1MrgScfDoORDdaMEQ2Gh0SGaAW9wRYF?= =?us-ascii?Q?UpV+9JdpEfH3H/BuvG9mlKjgKkeZ6UWXek86ZvX0fPb8PEVbeUkolJAqnQ8c?= =?us-ascii?Q?ksCrDzZkoib8/+0tM3JCOJI4Ws6D9CDVtlxwdR2YMH/17wj91tCQhEb4A7XE?= =?us-ascii?Q?zxtVR0nYxCX6d7Y=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 08:12:13.6459 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b87548f4-c342-4d53-31f2-08dd767511c5 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8018 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 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/10/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=83a85b7ef9462635e7ddbc99f4e080342f2c0650 Thanks. Xueming Li --- >From 83a85b7ef9462635e7ddbc99f4e080342f2c0650 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 Cc: Xueming Li [ 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 80edb4e966..1caec52ceb 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7584,7 +7584,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; } @@ -7605,7 +7608,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-04-08 15:39:07.115746597 +0800 +++ 0041-net-mlx5-fix-IPIP-tunnel-verification.patch 2025-04-08 15:39:06.026436549 +0800 @@ -1 +1 @@ -From 3d80d35b118ecfb650e51fabafc682ea8a3adb8f Mon Sep 17 00:00:00 2001 +From 83a85b7ef9462635e7ddbc99f4e080342f2c0650 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3d80d35b118ecfb650e51fabafc682ea8a3adb8f ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index c77041317b..8703403b8f 100644 +index 80edb4e966..1caec52ceb 100644 @@ -29 +31 @@ -@@ -7925,7 +7925,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7584,7 +7584,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -41 +43 @@ -@@ -7949,7 +7952,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7605,7 +7608,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,