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 76D67433D8 for ; Mon, 11 Dec 2023 11:16:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6FB4740ED2; Mon, 11 Dec 2023 11:16:30 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2089.outbound.protection.outlook.com [40.107.212.89]) by mails.dpdk.org (Postfix) with ESMTP id A04EF40ED2 for ; Mon, 11 Dec 2023 11:16:28 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lqvKfXts9fnBOuIS0JPZOoltpeIBa1U7dQCaP26tGbJCeUFsk65Po7rG2y4ETJyt90yVhCJ+LCyz+X4/N90ykcW3uHwPp40Y221EDMSBRDUWQRVfvCTiCR7mKg3P08ojxnn9y5zjos2RQalLkf8oUnKF7H+5jl+wp8mmhsHFmhnWadUN0fKhyh09ZCE+iOCjfplyQ0taXbw3Zv+WYAfvudUpoASljN7WF5k7WLgG9dIDW25JqyRm6OCaKEX5Fusc4x2PdxOH6BT20dZLj7wxW3XDICFMdv7XQhSW5+YdGptrVg7VmVosIEEvwU3j9bKYBz6Z26qvxq4d0yygApLSpA== 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=yWpLtW3PQaGSWKWXjjdYqwUiadt1tb0UGtXfzYz7vFY=; b=gNoYJOdnY6KYpqz/X/dAYZo/vtR5qRSXeMn0+x0RQxo+tEOHeYPZjO1kiSUfIRgXI0xuV3a69AJct7RhV6vrEm1/IYsIy1HmxCKDxYtPKnf+/dWalP+MkStRsiBhlsLFo4nQABlQjMGx0vNfEwVql32ZfHzb4gORXB5XDI65/rxWokKIW+4h+GbjRg7c03a/xnDeIy+QTGDt36ptVXyzet15Jh7pAoT4IXfD1U8dZmHVSPIPr4fe0swYjG6uxExwLBZv+3MaEEgIxEL/PlbnA9HdziRtqrGr3keLM1hhRzSkDLCwbKHxSd168JMVTegCGdMdmDmWAUbVYIQjkbGUEQ== 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=yWpLtW3PQaGSWKWXjjdYqwUiadt1tb0UGtXfzYz7vFY=; b=LuJqpsglDzpSjJHK79uN2vkdQCz4oIbc/S7EnebWL3re2jxnJogJCOkDNjIbSvlRntwXn+DDmwm4psKW5fGxjJ/mtHUOLUAPTJanFpsaVvKcvdJAY/2cMAtn8KIPrMGN5X6rKdp76UhpZLORWYtUTOWyNMoLWyPjK1fQSNVcTlasdsJJOBhN6IWj3JI2HuUD6mWV5X3fm2X+ztZI9fV9NwqJfI0cNyRLibrU8TGRaMmMH9YwU3InqtiWQdPbGSNtDGpPdSsv+HghCgq3QJues+ENB2XBH+wSFpaIPeyi9dvGz6NtXiKMxdTpbqXgxgvZUp2m8FG2+ptrOyDXV+u7Dg== Received: from SJ0PR05CA0155.namprd05.prod.outlook.com (2603:10b6:a03:339::10) by SJ2PR12MB9005.namprd12.prod.outlook.com (2603:10b6:a03:53d::10) 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:16:26 +0000 Received: from DS3PEPF000099E0.namprd04.prod.outlook.com (2603:10b6:a03:339:cafe::18) by SJ0PR05CA0155.outlook.office365.com (2603:10b6:a03:339::10) 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:16:26 +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 DS3PEPF000099E0.mail.protection.outlook.com (10.167.17.203) 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:16:25 +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:16:13 -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:16:11 -0800 From: Xueming Li To: David Marchand CC: Ales Musil , Ferruh Yigit , "dpdk stable" Subject: patch 'net/tap: fix L4 checksum offloading' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:06 +0800 Message-ID: <20231211101226.2122-42-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: DS3PEPF000099E0:EE_|SJ2PR12MB9005:EE_ X-MS-Office365-Filtering-Correlation-Id: 374cc209-8854-4020-2769-08dbfa323bb2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f0ygfyxRNPZlEWlv7f8P+eDEUeXlNzr/QteNxC3/CeaavHPh3gtzMaEch8HCNdfmiEjdkwERIMvJZtnw4nss/EFUl1WSI3aa0ESBY6WZ8wRNA8UiUC5xufiR/jPBd56mHyGj6tKH/OEQCZhCUBCwDcPq1u2tseqPNC5l7TStxiVqhsKxxTKf/jRCDEPeVlSPVPcoY/9YOutHJSxjEtrWoRXTYtgCdJMzKXyel+BUeurx7iQATILE2cuRMTzVbAHVO7aeKsNaK9PmxnkNcEKc31wVQCk6KlL9/W3h2CYUEZEdeAmzP08LWe/AjbUDXZiPm1snAWa4vKantnn1BGC+nSjiZAV/n9Npc7ONmzOGIvrls392l8sXHh7Tw7AtLgzv5pSDhwFD+IvNRs7aY66gBfHHPt0gktDskj1RVhn1e5VTk75Ahp/joLAIWSfjKGnODhX9iTYTOyfJN/8mWMs0NFbMR8nyr/XUXSV34Df0RGh7QwkudfzOrRMfdrZsohXVaVHHABDbEnm75c4Vm3IRewwsN3aIWLCZ75qhfykUs0EsCKJMW7I5v/HxO4iU3crs4yL3iXqKpzwtjKX+9FvqmV7YmncQc7eudpu1QbhzwHKmaDO53bWX1F7JniwZgEJTxwKXx6GktoQyogjv3R/8UIYrpS1x7ePUY1PrVAT4SMa65TvGQcjII04NW8Tf3ZIAAjV+g8iVNp8HqA7IrFaz4aFWEYX6MIf8bK0HYDEeDmeT1rIMTakv4hNynYo01ERLhfzk1n+ZjBn4x0ixxWjW7k/WNCvvzfxt073ms7lz8Lc= 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)(136003)(346002)(39860400002)(376002)(396003)(230922051799003)(64100799003)(451199024)(82310400011)(1800799012)(186009)(36840700001)(40470700004)(46966006)(55016003)(40480700001)(41300700001)(4001150100001)(40460700003)(2906002)(5660300002)(316002)(4326008)(6916009)(8936002)(8676002)(70586007)(54906003)(70206006)(356005)(82740400003)(7636003)(2616005)(86362001)(36756003)(36860700001)(47076005)(966005)(83380400001)(426003)(26005)(478600001)(6666004)(6286002)(336012)(1076003)(16526019)(7696005)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:16:25.8490 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 374cc209-8854-4020-2769-08dbfa323bb2 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: DS3PEPF000099E0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB9005 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=db03b8a934a722f4804405e0ee41bc9da32da4bf Thanks. Xueming Li --- >From db03b8a934a722f4804405e0ee41bc9da32da4bf Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 24 Aug 2023 09:18:20 +0200 Subject: [PATCH] net/tap: fix L4 checksum offloading Cc: Xueming Li [ upstream commit 0bbafe48ae0a35e306b1cd91b0e7726ae4451f9a ] The L4 checksum offloading API does not require l4_len to be set. Make the driver discover the L4 headers size by itself. Fixes: 6546e76056e3 ("net/tap: calculate checksums of multi segs packets") Signed-off-by: David Marchand Tested-by: Ales Musil Acked-by: Ferruh Yigit --- .mailmap | 1 + drivers/net/tap/rte_eth_tap.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index b3473b08eb..7631227cd3 100644 --- a/.mailmap +++ b/.mailmap @@ -38,6 +38,7 @@ Aleksandr Loktionov Aleksandr Miloshenko Aleksey Baulin Aleksey Katargin +Ales Musil Alexander Bechikov Alexander Belyakov Alexander Chernavin diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index ef8eb610f6..b65a23aed3 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -645,13 +645,22 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, ((mbuf->ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_IPV4) || (mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == RTE_MBUF_F_TX_UDP_CKSUM || (mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == RTE_MBUF_F_TX_TCP_CKSUM))) { + unsigned int l4_len = 0; + is_cksum = 1; + if ((mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == + RTE_MBUF_F_TX_UDP_CKSUM) + l4_len = sizeof(struct rte_udp_hdr); + else if ((mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == + RTE_MBUF_F_TX_TCP_CKSUM) + l4_len = sizeof(struct rte_tcp_hdr); + /* Support only packets with at least layer 4 * header included in the first segment */ seg_len = rte_pktmbuf_data_len(mbuf); - l234_hlen = mbuf->l2_len + mbuf->l3_len + mbuf->l4_len; + l234_hlen = mbuf->l2_len + mbuf->l3_len + l4_len; if (seg_len < l234_hlen) return -1; @@ -661,7 +670,7 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, rte_memcpy(m_copy, rte_pktmbuf_mtod(mbuf, void *), l234_hlen); tap_tx_l3_cksum(m_copy, mbuf->ol_flags, - mbuf->l2_len, mbuf->l3_len, mbuf->l4_len, + mbuf->l2_len, mbuf->l3_len, l4_len, &l4_cksum, &l4_phdr_cksum, &l4_raw_cksum); iovecs[k].iov_base = m_copy; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.480046100 +0800 +++ 0041-net-tap-fix-L4-checksum-offloading.patch 2023-12-11 17:56:22.977652300 +0800 @@ -1 +1 @@ -From 0bbafe48ae0a35e306b1cd91b0e7726ae4451f9a Mon Sep 17 00:00:00 2001 +From db03b8a934a722f4804405e0ee41bc9da32da4bf Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0bbafe48ae0a35e306b1cd91b0e7726ae4451f9a ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index c384d97a1a..c0ab6d090b 100644 +index b3473b08eb..7631227cd3 100644 @@ -24 +26 @@ -@@ -41,6 +41,7 @@ Aleksandr Loktionov +@@ -38,6 +38,7 @@ Aleksandr Loktionov @@ -33 +35 @@ -index b25a52655f..66335d2755 100644 +index ef8eb610f6..b65a23aed3 100644