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 1479745610 for ; Fri, 12 Jul 2024 12:50:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C0CC402E5; Fri, 12 Jul 2024 12:50:43 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2059.outbound.protection.outlook.com [40.107.93.59]) by mails.dpdk.org (Postfix) with ESMTP id A44BC40261 for ; Fri, 12 Jul 2024 12:50:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=n72eqMf79A24o0fBMRTcYGaYAlsiMXOVMd0aaDJiYLMRi+FQtpWu9o09EOZL3aOr1RcskVAh6U5CajSULfOERl9/oyMTz2VKshNrDpKTdRalLLyVbXsPBp3tV3vAALkKGrr/mtXQu0mo9b6MEXxqsVRViU3T6a1ZqMQD1m2D81ojV9Zo1QeC8n6Hdl25MuNlNbRSPgh6PD8NOW/XkWLoQZFeoKSEfs5M/ZjA2a/xdtOt9aWbDR30eAYV+EFtw4yXfJkeZLILas078D8rzvxDQdOmK9BDtrDaivv2OysPYCyyEffaNgO5tYeRWk4uh4zKXe5G3MYQyuj9jjL27sd0EA== 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=8L7FBOYGrNdvk58xIi6wUETD9FONQ8BrusYFiHj/L/I=; b=GA/xwn29QtsT1NZejLRhRyajkfjfeN/R3uypfW2R+vXD/yAlnNIkWKRQBl144OxeHA6/9b4PNCZ+nIT4NREitriY8+GRtfO1w5lqpTYavlaiW18e1g0beHqyBcgNRj+/9DXSF2uUGzZhPYClQuta//kBmga3dqhiwzZJ8RzBN3FbQuEbLjrsYH0e/3GxTJ/y975XQuJ+4In3Znn4rp/W60o/LTyJ+9b+bH6ha+19Um07rkryOgBUnJFk6eM01Y/eEBUvK1H+YzvbYKqMHgybgPgI4DFlWW1eQL4aOmFaPiFH2FrDSDdYcDuvpg+WnJO8QrMS+KXmdRB9c28qZIHlOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.com 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=8L7FBOYGrNdvk58xIi6wUETD9FONQ8BrusYFiHj/L/I=; b=KX+qgAX/OMEXLrvLU1I7QdyYZBbvuf0h0QiE2GWlNWHELJ1szAHMG6Q/NnO1wFqaq0K3oMU+7G4JtizWmieavOHxBED0r1suaRUT27mnZQPrwpD94WJmqYvKFu6O5qG+1uHTWi2CYyRoTnkJz0JhVVqWf1FZzzMin6xhUj7NX/Q3Y8IVG/diPlaodHgsAOjGbcyNPZkBoXmXoXU4PpCKux5R28mOrh6FK3U2FIx1TGovhqbEnsh1fByWU3wHpJ+JJBH5jxiJpBV7Y5qz36boaSLJGrQCapaeuaVah/+HZCvsWP5B/z335sY8UA2c760K4qLWKW/dRS65zURAKFtEZw== Received: from DM6PR04CA0019.namprd04.prod.outlook.com (2603:10b6:5:334::24) by SA0PR12MB4351.namprd12.prod.outlook.com (2603:10b6:806:71::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23; Fri, 12 Jul 2024 10:50:35 +0000 Received: from DS1PEPF00017096.namprd05.prod.outlook.com (2603:10b6:5:334:cafe::9c) by DM6PR04CA0019.outlook.office365.com (2603:10b6:5:334::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:50:35 +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 DS1PEPF00017096.mail.protection.outlook.com (10.167.18.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:50:35 +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.1544.4; Fri, 12 Jul 2024 03:50:24 -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.4; Fri, 12 Jul 2024 03:50:11 -0700 From: Xueming Li To: David Marchand CC: Jun Wang , Ali Alnubani , "dpdk stable" Subject: patch 'net/i40e: fix outer UDP checksum offload for X710' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:31 +0800 Message-ID: <20240712104528.308638-46-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: DS1PEPF00017096:EE_|SA0PR12MB4351:EE_ X-MS-Office365-Filtering-Correlation-Id: 9baa699f-da87-4933-ab6a-08dca26075cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?B?L0UxNnFjWHRmK3BDZmpXcUU4RWhDSmRaRk40MDgzalBjUkJrMHFCKzE5T1RY?= =?utf-8?B?N1Jic3VKV1FoUFg2QmlneHN1SnQxNDRySElXZGVNaTRHMlU4TWlaTzd0U0NI?= =?utf-8?B?RWdTa0sxRGtuTmNneDNlaWZ2cGp2MzFEdWZWVnpSeldzU1VMMFlwQVdLM0ZU?= =?utf-8?B?emZYS0FqSWFmNVJJTGlvVU03ZHVGbjhHdUNQTnRYNGN1cUNTSXY3amFiTUYz?= =?utf-8?B?NHVsTEo2Z1VaKzFqT0tySkZZMG5tWnZaZFBIWkkwYmFoVzAvYjdoR3Z0YWFy?= =?utf-8?B?S0lpWW5PTGk1SjR1dmZvRnJCcWdvZmUrVnRLNUtVcVYvVzUvL1UzR0xldmVL?= =?utf-8?B?WnZ4TGtjeEFkbnF6OEVmbWdYdnBaY0JaM1pSWklhME1mWk1lYUFEMk9yd2pX?= =?utf-8?B?ajUrUHRjOENZQnhUQ21MZmNYYUNXWUFRVTFmOGFBYTNTUDN5NHdrc2t3bFI2?= =?utf-8?B?NzU4ZjlkeklIUG5mSWs3UFQvbnJ4d2sxalh2bk9NTFF6ZWhXd1FXVkpmWGpa?= =?utf-8?B?VUhXWXV3TzZpK2lYKy94SEpMNFU3OEJmWlYyQjhZM3lJdVQzTG1GN2ZQT1hv?= =?utf-8?B?Wk9zNEpLSVpVcnhHQjMyZFRLMDlDS3QwWFZETDQ3bFQ5anVkNDFFSE9laGNK?= =?utf-8?B?ZWhQTjhpdW02bS92dzZCQmNUa210Qk9ncGlKZVd1K0s4akN4Zm04OW5vcGpS?= =?utf-8?B?RlVvK1ppNld4NTk5N2xJVjFkQWoveDVna25jVjg4ZmZRcHdzME9jSjJnemRL?= =?utf-8?B?eCtSVkhyOS9wQUlDZlgrcTNlc3NrQ0QzajQ4d3lQb1RacytET005c3lNWjFO?= =?utf-8?B?WVdhbTE0S042YWxKTDFIc3F1eW13QTBPeVBMV0lDWTNGS3lNMjR2cFNOTmNC?= =?utf-8?B?Z1RhMC93QTdPVXhiLzBra0JTRzhwR0hPQnFLeGhzVkxGRDlnMXkzcEJ3akh2?= =?utf-8?B?RkFKNUtKb0NZQmg5TERNbFlwNUtMMkNBWmhndndpbHdVcWZ5MzlqSzdIbWVm?= =?utf-8?B?SGsvc2FBMWZhSFlpeGRWQzBaT2tiQzJ5cHJobkhGYmdqejlSenFxOGkwUlZo?= =?utf-8?B?bVRZL2dYL1dabGlUdDl4azVLNjY2NVVGZ0c5dVg2dTRLQUZDYXdvK0kxRkxH?= =?utf-8?B?QndHSDZiQS90MSttYW9peStrdG4vMll6dWs4TkFwSFltSmxWRXJ2N2ZzZWlH?= =?utf-8?B?S3FVVHg2YU1JVFplTmwrRmN3S3JYMFhiQ01NaHhTUmVjUEU0UkVadFJIdEJx?= =?utf-8?B?Mk9GZVMrbWtRbXdxamNGdEZmN01Pd3ZqeXhubndaaHJROUd6bTJDVWlPeTN4?= =?utf-8?B?SjR2UG5WUkUvMzFlNk1FbjNuNSs4azBQbGFlMUlUc1dNVEJqYzlXaDRlWWtH?= =?utf-8?B?YUh2YlNNMlprVG4wSTZSWHlZT2VXNlAyckxUaWxxRWlMYXJ6MDF0bjZzUTNW?= =?utf-8?B?U2J2Y2NhcisyTjdac2FoSmVVTDgzYlRycHh2MGErUGQ2czF2enpUbEt5VFk5?= =?utf-8?B?SGJXMk1yQmRPRDJKbGVoN1pxeU9EdzUvQ29mZGJpMjd3d0plVVdRT1VFY1pp?= =?utf-8?B?QVR2VzRzL3gweWJkdVFZdzVRNWhPQ2VSV3BxOFYwdGxiajBIcUY4RzBOMzk4?= =?utf-8?B?YktZOGFvT2o2cGprR0ErZy9PUHlwdDA1eUh3WFNjMjJyMmx2MGhWeXd0NHNH?= =?utf-8?B?WElvNzRBSFE1bmM3aUZrbC93dXkxRnQyOEtXTGZNWEZmOG0wZld0aldONHVH?= =?utf-8?B?U3pQUEphc3pwOUI2blZNREJtZXU0aCtIa1ZUcG9xZVFoYVV0eU9VVmRNSUta?= =?utf-8?B?dXJubkg4WGVReHdQSG9IbHVGNVRNU0dJalhaZGJkcUhuaWRsOURYV01RYW9N?= =?utf-8?B?Tms5OUZQcTNldzFJMTFtUlNSTi94VjZ4TmpPVllKVzMzNko1eEdZMEZYUEg4?= =?utf-8?Q?q0PxH0uYkV7w4/uIobAF620iuqy4FNrO?= 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:(13230040)(376014)(1800799024)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:50:35.5269 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9baa699f-da87-4933-ab6a-08dca26075cc 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: DS1PEPF00017096.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4351 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.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 07/14/24. 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=6cbf97cfe01954c981d8127256e9c23c9657dd9a Thanks. Xueming Li --- >From 6cbf97cfe01954c981d8127256e9c23c9657dd9a Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 18 Apr 2024 10:20:19 +0200 Subject: [PATCH] net/i40e: fix outer UDP checksum offload for X710 Cc: Xueming Li [ upstream commit 6b5e31f7fbd71675c8f3f6d8c0f74fd1f3a0dff5 ] According to the X710 datasheet (and confirmed on the field..), X710 devices do not support outer checksum offload. """ 8.4.4.2 Transmit L3 and L4 Integrity Offload Tunneling UDP headers and GRE header are not offloaded while the X710/XXV710/XL710 leaves their checksum field as is. If a checksum is required, software should provide it as well as the inner checksum value(s) that are required for the outer checksum. """ Fix Tx offload capabilities according to the hardware. X722 may support such offload by setting I40E_TXD_CTX_QW0_L4T_CS_MASK. Bugzilla ID: 1406 Fixes: 8cc79a1636cd ("net/i40e: fix forward outer IPv6 VXLAN") Reported-by: Jun Wang Signed-off-by: David Marchand Tested-by: Ali Alnubani --- .mailmap | 1 + drivers/net/i40e/i40e_ethdev.c | 6 +++++- drivers/net/i40e/i40e_rxtx.c | 9 +++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index db6bc47117..79e25426fe 100644 --- a/.mailmap +++ b/.mailmap @@ -713,6 +713,7 @@ Junjie Wan Jun Qiu Jun W Zhou Junxiao Shi +Jun Wang Jun Yang Junyu Jiang Juraj Linkeš diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 3ca226156b..ffc1f6d874 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -3724,8 +3724,12 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO | RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO | RTE_ETH_TX_OFFLOAD_MULTI_SEGS | - RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM | dev_info->tx_queue_offload_capa; + if (hw->mac.type == I40E_MAC_X722) { + dev_info->tx_offload_capa |= + RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM; + } + dev_info->dev_capa = RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP | RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP; diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 9aa5facb53..5e693cb1ea 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -295,6 +295,15 @@ i40e_parse_tunneling_params(uint64_t ol_flags, */ *cd_tunneling |= (tx_offload.l2_len >> 1) << I40E_TXD_CTX_QW0_NATLEN_SHIFT; + + /** + * Calculate the tunneling UDP checksum (only supported with X722). + * Shall be set only if L4TUNT = 01b and EIPT is not zero + */ + if ((*cd_tunneling & I40E_TXD_CTX_QW0_EXT_IP_MASK) && + (*cd_tunneling & I40E_TXD_CTX_UDP_TUNNELING) && + (ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM)) + *cd_tunneling |= I40E_TXD_CTX_QW0_L4T_CS_MASK; } static inline void -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:16.139997183 +0800 +++ 0045-net-i40e-fix-outer-UDP-checksum-offload-for-X710.patch 2024-07-12 18:40:14.056594233 +0800 @@ -1 +1 @@ -From 6b5e31f7fbd71675c8f3f6d8c0f74fd1f3a0dff5 Mon Sep 17 00:00:00 2001 +From 6cbf97cfe01954c981d8127256e9c23c9657dd9a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6b5e31f7fbd71675c8f3f6d8c0f74fd1f3a0dff5 ] @@ -24 +26,0 @@ -Cc: stable@dpdk.org @@ -36 +38 @@ -index cb8d65bf0e..1aca379558 100644 +index db6bc47117..79e25426fe 100644 @@ -39 +41 @@ -@@ -720,6 +720,7 @@ Junjie Wan +@@ -713,6 +713,7 @@ Junjie Wan @@ -48 +50 @@ -index 801cc95607..c38515a758 100644 +index 3ca226156b..ffc1f6d874 100644 @@ -51 +53 @@ -@@ -3862,8 +3862,12 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +@@ -3724,8 +3724,12 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) @@ -66 +68 @@ -index 155f24377b..dc466ae371 100644 +index 9aa5facb53..5e693cb1ea 100644