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 C85BF433D8 for ; Mon, 11 Dec 2023 11:21:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BE3BD40ED2; Mon, 11 Dec 2023 11:21:14 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2088.outbound.protection.outlook.com [40.107.100.88]) by mails.dpdk.org (Postfix) with ESMTP id 4BA6640E0F for ; Mon, 11 Dec 2023 11:21:13 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UuO0nV7LKMenddGAkH2Rv1+ExjH7q3AiosthSLqw07XwB4W+jrFtH6zoncmD5YUSp9I8SQ1yXuxvT2GYRIMOpO5GA/8Uf+xj25zQyY2J0qx37xJShvpyP/dImwLjUHWn5imV5Ygxz1UlVwrw9v5N1YmWXyd6VCxQQDqJjKwCbmsSL9LELaQv1OEOMJjIUrkTvw2ADCgmRTRfFmAIHDLf4YlNXR7MK5bQ+A5X5mohWKZe3iXnhoWDgllK3+HIJkvdMtRX68+n/MkVZ2gIWAXxCfqUs/fz2XxJzXnVoYsiGSFKYbTzz+z1mPnny++vvU2F7WMjp2xPkPuw8+WkM7INzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=GDf7gkAcvv6+sHLYabSeER/Ni3O6+7BWbEAlIAFF/bU=; b=oSeiwR1YsO4JAOyZZ+sikLzv3bcq4fVlNpxKKMHDheKa50PJbD5Gwq2UwpfqDokrk1yjm1HdqvWmg5lIUhXRiKi+p4Xj+25skkMvRc+og8TisIuq+x4jbpEI1gftm/6CLBmQHyHdF8BOt00mK7KvrzNSITjEd248AyM7sXzqID2R6oBlja9a0WHlnZohlNWhfBPpMyNpb84nut5OBRf7n0m0pY+Zas4l9dSMaL4s6Hzxai1uNcdBWAboab7ukYyphaiQhimXz+u6P2QIl/Mr09ckmZPF6CEfOGdR/oEdVCgqThJ8dBKPzzN4BUY7L4gkpE7HxVMsdUajMnejbIewFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=GDf7gkAcvv6+sHLYabSeER/Ni3O6+7BWbEAlIAFF/bU=; b=nz/zSWJh9LfsQcfPvLF4DQa87Aaxriev9KCiyJqiTX080buMI1sVGcxsi+0RpUWyQBraHC4aa4JPqX6NfExt6zTMyNBgymNnGDOu6NRuCtkteM3X5FHf0iMVE9KdvUMedo8bytTgsXOJi3s7qy0obXp19K3WqnBNE44gn8HU6x0m/uCnoprRv1Dm94L6YQCzl4Cwv4brAMHWUYn3sDHBTFs+k6X1Ia3yWcXNj1siYciwt6q+qjbg24GAKD31Y1uXoRDDwY5OJyaVd56R6TqqLhd94LyFghqONO9WusaheQirBTz4xUZQd2/HeGiFHvY1v/FAU9f6vpcFuQUGuh+AIg== Received: from SA9PR13CA0055.namprd13.prod.outlook.com (2603:10b6:806:22::30) by SA1PR12MB7409.namprd12.prod.outlook.com (2603:10b6:806:29c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:21:10 +0000 Received: from SN1PEPF0002529D.namprd05.prod.outlook.com (2603:10b6:806:22:cafe::44) by SA9PR13CA0055.outlook.office365.com (2603:10b6:806:22::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.21 via Frontend Transport; Mon, 11 Dec 2023 10:21:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF0002529D.mail.protection.outlook.com (10.167.242.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:21:10 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:20:55 -0800 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.986.41; Mon, 11 Dec 2023 02:20:52 -0800 From: Xueming Li To: Eli Britstein CC: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: zero UDP checksum over IPv4 in encapsulation' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:59 +0800 Message-ID: <20231211101226.2122-95-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002529D:EE_|SA1PR12MB7409:EE_ X-MS-Office365-Filtering-Correlation-Id: 89d58288-0534-4022-7d74-08dbfa32e54c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MZaW/G/sZwLmN2Jzfh5k2vZIBTqPD548PfMDnM7WwrOMW9n1vySwFf/WrAuDEMRugcZTznSIYgWgy+E6J01yYtokKbeLMIAVb/zVsfEVCzXQnMRHrIpSPcX7X9Wv8dsWOfhONhNoSuw+5Hos3rMhhixn7uJIEdVGwNUlbJFLRlkvFJeHFsC/uY7pZ5qUwZ+TxcSnnnTyeA122PTqbOJ4UbvRAZ/rvjIwPGGZGHHpKBXP4cNGVgN5TXTTGBue+obAUPMJPbx3Z2DmF/sJQdY6gaodcCrWeD5O7Pl5wat783hVcMCbnRG7B4UrUTY1jnIXFnsb0jk4iDi3DoNW+o4719pkmszXznxD5OXctJsKy79/1pZqWSt+S5keI6CidM8q+hUHby9Iogmh5PqmOlquHm4x48FhAw7hfW9G3Nh9KyFemBXINoQkiN8sY3ITT57Uikx+DDH0zbqgSUu2sNPnQMvoY64RQzzXTxOcX/fAAdsSZS/jIAuzdlIJY8zDt41AkvTHbp7SAgyKYMtjzeoDlfyZ7TXYlyZl4NSTDLy/KPEbqaQvvVCyTwK1aO936olczKdwMc4FQFuirwZukpVCbetSVagVyGphidxrLkQwhbAambK9CdbrfWSAiB+RJtuCGP++KIiEQnzEqyEDYkXA8shZfX8/HWUWjzNMTsHlSP0w0oINK6sKFz/HQ3zSC+piAqGZ3ZB+IgD8nLQkR5CR+Xz4SMIQL0yfssivdJlabPadFaG51QBVuuz1twD8oOptlVdlSyIv4jjrIT6p1p0qLQ== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(376002)(136003)(346002)(39860400002)(396003)(230922051799003)(64100799003)(186009)(82310400011)(1800799012)(451199024)(40470700004)(36840700001)(46966006)(55016003)(40480700001)(2616005)(426003)(26005)(1076003)(16526019)(6286002)(40460700003)(7636003)(36756003)(82740400003)(86362001)(356005)(336012)(47076005)(83380400001)(5660300002)(53546011)(7696005)(36860700001)(8936002)(8676002)(6862004)(4326008)(70586007)(70206006)(966005)(37006003)(316002)(6636002)(2906002)(4001150100001)(54906003)(41300700001)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:21:10.3954 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 89d58288-0534-4022-7d74-08dbfa32e54c 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002529D.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7409 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.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 12/13/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=07a861e472461649d1ec22ab82de602f6018b88d Thanks. Xueming Li --- >From 07a861e472461649d1ec22ab82de602f6018b88d Mon Sep 17 00:00:00 2001 From: Eli Britstein Date: Mon, 13 Nov 2023 09:29:41 +0200 Subject: [PATCH] net/mlx5: zero UDP checksum over IPv4 in encapsulation Cc: Xueming Li [ upstream commit e407221d58ffdfd9b7c80f8e4fff99f67cdbd6e9 ] A zero UDP csum indicates it should not be validated by the receiver. The HW may not calculate UDP csum after encap. The cited commit made sure the UDP csum is zero for UDP over IPv6, mistakenly not handling UDP over IPv4. Fix it. Fixes: bf1d7d9a033a ("net/mlx5: zero out UDP checksum in encapsulation") Signed-off-by: Eli Britstein Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow_dv.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index aa3a258ae7..5c2af50fe5 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -4454,6 +4454,7 @@ flow_dv_zero_encap_udp_csum(void *data, struct rte_flow_error *error) { struct rte_ether_hdr *eth = NULL; struct rte_vlan_hdr *vlan = NULL; + struct rte_ipv4_hdr *ipv4 = NULL; struct rte_ipv6_hdr *ipv6 = NULL; struct rte_udp_hdr *udp = NULL; char *next_hdr; @@ -4470,24 +4471,27 @@ flow_dv_zero_encap_udp_csum(void *data, struct rte_flow_error *error) next_hdr += sizeof(struct rte_vlan_hdr); } - /* HW calculates IPv4 csum. no need to proceed */ - if (proto == RTE_ETHER_TYPE_IPV4) - return 0; - /* non IPv4/IPv6 header. not supported */ - if (proto != RTE_ETHER_TYPE_IPV6) { + if (proto != RTE_ETHER_TYPE_IPV4 && proto != RTE_ETHER_TYPE_IPV6) { return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "Cannot offload non IPv4/IPv6"); } - ipv6 = (struct rte_ipv6_hdr *)next_hdr; - - /* ignore non UDP */ - if (ipv6->proto != IPPROTO_UDP) - return 0; + if (proto == RTE_ETHER_TYPE_IPV4) { + ipv4 = (struct rte_ipv4_hdr *)next_hdr; + /* ignore non UDP */ + if (ipv4->next_proto_id != IPPROTO_UDP) + return 0; + udp = (struct rte_udp_hdr *)(ipv4 + 1); + } else { + ipv6 = (struct rte_ipv6_hdr *)next_hdr; + /* ignore non UDP */ + if (ipv6->proto != IPPROTO_UDP) + return 0; + udp = (struct rte_udp_hdr *)(ipv6 + 1); + } - udp = (struct rte_udp_hdr *)(ipv6 + 1); udp->dgram_cksum = 0; return 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:26.137553400 +0800 +++ 0094-net-mlx5-zero-UDP-checksum-over-IPv4-in-encapsulatio.patch 2023-12-11 17:56:23.207652300 +0800 @@ -1 +1 @@ -From e407221d58ffdfd9b7c80f8e4fff99f67cdbd6e9 Mon Sep 17 00:00:00 2001 +From 07a861e472461649d1ec22ab82de602f6018b88d Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e407221d58ffdfd9b7c80f8e4fff99f67cdbd6e9 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 9753af2cb1..115d730317 100644 +index aa3a258ae7..5c2af50fe5 100644 @@ -25 +27 @@ -@@ -4713,6 +4713,7 @@ flow_dv_zero_encap_udp_csum(void *data, struct rte_flow_error *error) +@@ -4454,6 +4454,7 @@ flow_dv_zero_encap_udp_csum(void *data, struct rte_flow_error *error) @@ -33 +35 @@ -@@ -4729,24 +4730,27 @@ flow_dv_zero_encap_udp_csum(void *data, struct rte_flow_error *error) +@@ -4470,24 +4471,27 @@ flow_dv_zero_encap_udp_csum(void *data, struct rte_flow_error *error)