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 0870DA034F for ; Wed, 10 Nov 2021 07:45:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 00A984014D; Wed, 10 Nov 2021 07:45:07 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2070.outbound.protection.outlook.com [40.107.220.70]) by mails.dpdk.org (Postfix) with ESMTP id 1D81E40683 for ; Wed, 10 Nov 2021 07:45:05 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JfDlv9/dRQicVGRvsmzI+yiBJRy6rx7aGPsTSoJA0FFv8Z9yGTrtFBe2/034hYJn8Bz0Aspr4Ux/FCLvQLNwjPzT9jZYQUtoZ/HCsLr4jV9DePP5YgazIxqfAk6JSOjtJJ9V+gQ+3WmQC4qSL6HWvavRA7BBT4VpWNp+eWgeQIwrgMOWuUvcrmMpJFB0lByCWfUjZbUDQk38wO+V0Orc5H5dW0NZDZqbuYI48ih8JH+Pky/fz062rY1xGq2vDOCCmfKhoOJ41TtZ+PYu86IJ/qGNonVzm4UzrTZvRio03jAOCn30zxCmu5Fmv9xRiDQe2ZjeEeZxOhVVc0sfCKMQ4Q== 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=COk+A17gJjXXgts8hKHthm9pLJfEkrH3grTZ32P78tE=; b=oIse3XIolxk16ty8gHIuLRQr3pb1hYeiQrPp8PqfwvmJMhSs/jEc4hex2xebRyuprJzI0WXA1AQ9wPbCrDowP2PhHBPGz81JIthke1f8K7wpHdA945rCvYS+yNqXP1FA1QA5GiVvhppX6iZnoBOPtZzmdFXwzHAlrowV7a+aSuDdHzQ5dlJFNWRzv7xZq6YZmqtvhbcLtnS9614n91MNkO1/bYKsJcDY62uCFUBFQ/bXzwd/idfAn+Dk//eyhZbzWZ+KV7QtZSDe1PQ+rNxG+E5ONUAD7wYBKoxkhyKD3klAaTqUzxZK0JTjkgaXkjJZTcB2zMWDxoYqMQ6+eqGW9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=6wind.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none 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=COk+A17gJjXXgts8hKHthm9pLJfEkrH3grTZ32P78tE=; b=oJ1mRGiBTTr4IPWEvHdJEycArvlQELBrP+O1EVFsFcO+1wrllJFDrWxFoQdlBNOwusSV6+HxG7zXmtImhiz3OamcqdPNZxt1wyseh8Jmh9ySzQ+IWJu6FTphBSN7gI8WemzIQ1WjwIiF/doweqMDiZJiMdkB8zJl2i68E8lhjvlq+Tm9Ic2BCIdCGD+GDhufLp+DegrBRRNL5qr/Sfpji8Y+gPaWJGJak1hBarpeoJzmscK5EVPUUZnhJcZiGlC/FZdyR8ti4jcxxqwIocLZb+Qye5yNZSF62F+h8S+4dVYLtaVUXbfdIu6V9fkZjGR+HYpPFkLfQaP1dPXURKE83g== Received: from BN6PR22CA0052.namprd22.prod.outlook.com (2603:10b6:404:ca::14) by DM6PR12MB4864.namprd12.prod.outlook.com (2603:10b6:5:209::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:45:03 +0000 Received: from BN8NAM11FT049.eop-nam11.prod.protection.outlook.com (2603:10b6:404:ca:cafe::dd) by BN6PR22CA0052.outlook.office365.com (2603:10b6:404:ca::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:45:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; 6wind.com; dkim=none (message not signed) header.d=none;6wind.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT049.mail.protection.outlook.com (10.13.177.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:45:02 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:44:59 +0000 From: Xueming Li To: Lance Richardson CC: Luca Boccassi , Ferruh Yigit , Olivier Matz , dpdk stable Date: Wed, 10 Nov 2021 14:29:56 +0800 Message-ID: <20211110063216.2744012-113-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d8ca824f-0387-41da-046c-08d9a4159f70 X-MS-TrafficTypeDiagnostic: DM6PR12MB4864: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JKQQE8GHedGur8v9l3+GTcFYUdSFKhiFmF6eHatZ4/e0+3lSoa0YNg7lVHpaiW6EUJ09bMpXA3/Q7tuipmwyCVlcNkOMZm9xchIRLB++EtRiTFkygEDd9xyoDrTQhOqeWLtCPAfEPdGPHcZeK2B28houK6cKsoXKA0CtOnOk1YnNxpriefaTSOHjYOgcBzKvU6Xf8SeRwF+Vi0fo6gakFErEbWuR1chEm11oNUMRxRY9p842MPaMKkjz1pTpfPpn1bc+M3BnYUXNTXOZh070q28jfkAIMZXfiKCeIMXl4fcXGtTxZM2LpAN7s4qnt/17lhw/B7kNLqGp6CkD+eofgDoWyUOpiRFK8O0lJjuVzWZLkSRK5pZwEV1Xewh03681H7fcDF7gTIzIBt0SjkaKgc/399Q3oVUYSPVbnK/kLN/Yhd32AUZ4q79j/UytOQ0jMWwxylB1YZLy32PmfmBGK28KunNyXPThGl+NELt1/LvxRQvogrJssbLYE2iwCcdPqVUReOg3Z/0nLknzUxTtBQ/k5ER9dl4BSc2tgbPTSSDcGIaff2GXwZpSFiaKTphBbSQOtnRXGJxom7xCRUl46kWyLwoQMPajn5EJI8XWidz5dIR89p6oGiadojOfeOS+ubckc2f6AJHnjO5y4K6b6M55BValfoIY5IXllpVd3aTHSPpqUgYU31Fgryts3QRl7F70XE2k6Pj/nNUid2tuXlBALt4KpFVa5AcJwr6Iy+A8tNMvOByE3KJ+WuXUmTOMk/tLi1wxy2rPaXfaz4lzA/r3QRMZgKUpcLrQ/ci8E/JcZn+/mIxyez+beJ8Dp7bAa6PYwcqh4baT99Rk1/iB2Q== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(86362001)(54906003)(5660300002)(16526019)(36756003)(6666004)(2906002)(36860700001)(4326008)(47076005)(53546011)(426003)(83380400001)(55016002)(336012)(356005)(7696005)(1076003)(26005)(6916009)(2616005)(70586007)(508600001)(8676002)(4001150100001)(966005)(8936002)(6286002)(7636003)(186003)(316002)(82310400003)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:45:02.3973 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d8ca824f-0387-41da-046c-08d9a4159f70 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT049.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4864 Subject: [dpdk-stable] patch 'net: fix checksum API documentation' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 11/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/449612955b72ef975de4babf525e3626e714d836 Thanks. Xueming Li --- >From 449612955b72ef975de4babf525e3626e714d836 Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Tue, 21 Sep 2021 10:59:24 -0400 Subject: [PATCH] net: fix checksum API documentation Cc: Xueming Li [ upstream commit dc954ae73aab9aaf45b8d5ce42f4490773dd1fab ] Minor corrections and improvements to documentation for checksum APIs. Fixes: 6006818cfb26 ("net: new checksum functions") Fixes: 45a08ef55e44 ("net: introduce functions to verify L4 checksums") Signed-off-by: Lance Richardson Acked-by: Ferruh Yigit Acked-by: Olivier Matz --- lib/librte_net/rte_ip.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h index b59c4d67a3..b188616ab8 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -444,15 +444,15 @@ rte_ipv6_phdr_cksum(const struct rte_ipv6_hdr *ipv6_hdr, uint64_t ol_flags) /** * Process the IPv6 UDP or TCP checksum. * - * The IPv4 header should not contains options. The layer 4 checksum - * must be set to 0 in the packet by the caller. + * The IPv6 header must not be followed by extension headers. The layer 4 + * checksum must be set to 0 in the L4 header by the caller. * * @param ipv6_hdr * The pointer to the contiguous IPv6 header. * @param l4_hdr * The pointer to the beginning of the L4 header. * @return - * The complemented checksum to set in the IP packet. + * The complemented checksum to set in the L4 header. */ static inline uint16_t rte_ipv6_udptcp_cksum(const struct rte_ipv6_hdr *ipv6_hdr, const void *l4_hdr) -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:06.972957044 +0800 +++ 0112-net-fix-checksum-API-documentation.patch 2021-11-10 14:17:01.880746009 +0800 @@ -1 +1 @@ -From dc954ae73aab9aaf45b8d5ce42f4490773dd1fab Mon Sep 17 00:00:00 2001 +From 449612955b72ef975de4babf525e3626e714d836 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit dc954ae73aab9aaf45b8d5ce42f4490773dd1fab ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -17,2 +19,2 @@ - lib/net/rte_ip.h | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) + lib/librte_net/rte_ip.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) @@ -20,32 +22,5 @@ -diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h -index bbd8650962..b3d45e85db 100644 ---- a/lib/net/rte_ip.h -+++ b/lib/net/rte_ip.h -@@ -372,15 +372,14 @@ __rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr) - /** - * Process the IPv4 UDP or TCP checksum. - * -- * The IP and layer 4 checksum must be set to 0 in the packet by -- * the caller. -+ * The layer 4 checksum must be set to 0 in the L4 header by the caller. - * - * @param ipv4_hdr - * The pointer to the contiguous IPv4 header. - * @param l4_hdr - * The pointer to the beginning of the L4 header. - * @return -- * The complemented checksum to set in the IP packet. -+ * The complemented checksum to set in the L4 header. - */ - static inline uint16_t - rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr) -@@ -489,7 +488,7 @@ rte_ipv6_phdr_cksum(const struct rte_ipv6_hdr *ipv6_hdr, uint64_t ol_flags) - } - - /** -- * @internal Calculate the non-complemented IPv4 L4 checksum -+ * @internal Calculate the non-complemented IPv6 L4 checksum - */ - static inline uint16_t - __rte_ipv6_udptcp_cksum(const struct rte_ipv6_hdr *ipv6_hdr, const void *l4_hdr) -@@ -510,15 +509,15 @@ __rte_ipv6_udptcp_cksum(const struct rte_ipv6_hdr *ipv6_hdr, const void *l4_hdr) +diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h +index b59c4d67a3..b188616ab8 100644 +--- a/lib/librte_net/rte_ip.h ++++ b/lib/librte_net/rte_ip.h +@@ -444,15 +444,15 @@ rte_ipv6_phdr_cksum(const struct rte_ipv6_hdr *ipv6_hdr, uint64_t ol_flags)