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 73330A0C41 for ; Tue, 30 Nov 2021 17:39:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DCED41177; Tue, 30 Nov 2021 17:39:11 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 25C6B410F7 for ; Tue, 30 Nov 2021 17:39:10 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 0284140035 for ; Tue, 30 Nov 2021 16:39:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290350; bh=dUirMeTugfbmK/JN4FFBLpjw3aNYuREbD32CI76VvaI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YnY5qEZB/KmSC5DXhc7QIzHTyWM1frYmgpNi25g3qDtBPjQSUmu0oG68SIRxRudUl t0q54F3jRCJGgqi9fBgmj73ioaxUUjxfmS/+SJ+G+su+j9FBD2I4Z6lS6ea1T5d50U Didhoe7gb7Muf4u3DgzHjv9pye03YIFNo0R/eeSFsw7tfgHr3QScSE5d36HkNr8ruo XOucCTY3IWfu3XJ9g4UqOw49NvvQkMt2pcZLuaWsaUqRXo0i5UgxQS2uapDfYYVLOJ JaeH+hcMX5ysKhv0F14iZOimPTSm7UQ/WkT2MXJhxWNkBzBupCH5Yar+0ckNm3GV9i hfGtM/iOtEy6A== Received: by mail-ed1-f72.google.com with SMTP id d13-20020a056402516d00b003e7e67a8f93so17523266ede.0 for ; Tue, 30 Nov 2021 08:39:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dUirMeTugfbmK/JN4FFBLpjw3aNYuREbD32CI76VvaI=; b=uqzMAHVnwalPtDJAlZs5EJPAtm+ooNuufev4ehelBQGmxUntMUNnyS0egdoMlLklRY YZNpUUhsYrf/qe+kLbRxuksq0liDG04huUu0zVZy5kfl+70xdqTVLxq0M+Vyd27EqKGA NUcJQwgCJBhZAbAkhNrL+Yq2MJXlmKXLZPztxxx14/4N97hvW/2RolzQW4TMzcExX7HY U1YIhs/RWPVcc4xQef7A4gJJgObxf3eOIYDO3Dksoe+SetuHAOfKv45QfKUAMEIdKqlo tryWthWE+2Boer7JLGK9grV3Pmjj9I3lDgUw6Po0Vz/TjotHg/SbgXOaEjUsvxP9ZK7b VGqg== X-Gm-Message-State: AOAM530AsTYGXGO+QBqN0574z2rOfpI1uwZoU/BMg52HhYwW0NnIMurE DrhqJp12/NyXLr4UytUCG6UcscMVmcZpF5lm65zLKHSge5Pcu4MMdZKjfyAzFYzu5kAt1t227RX SlkcAwineuwifUq59CLmN6ase X-Received: by 2002:a17:906:9744:: with SMTP id o4mr247439ejy.322.1638290349656; Tue, 30 Nov 2021 08:39:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyIcArx2uEC7fJhxAWFehbyIlmaTgdMa9C8dOHZwclabiMPsuZPCaGtXzLpVaI8bAWvwjEqMQ== X-Received: by 2002:a17:906:9744:: with SMTP id o4mr247418ejy.322.1638290349498; Tue, 30 Nov 2021 08:39:09 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id v13sm9034212ejo.36.2021.11.30.08.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:39:09 -0800 (PST) From: christian.ehrhardt@canonical.com To: Lance Richardson Cc: Ferruh Yigit , Olivier Matz , dpdk stable Subject: patch 'net: fix checksum API documentation' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:23 +0100 Message-Id: <20211130163605.2460997-59-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/0b9f46c0b78feacbbcfba8a1417f6926d83dd5aa Thanks. Christian Ehrhardt --- >From 0b9f46c0b78feacbbcfba8a1417f6926d83dd5aa 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 [ 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 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h index f03db05e18..cedfd27ac1 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -322,15 +322,14 @@ rte_ipv4_phdr_cksum(const struct rte_ipv4_hdr *ipv4_hdr, uint64_t ol_flags) /** * Process the IPv4 UDP or TCP checksum. * - * The IPv4 header should not contains options. 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) @@ -423,15 +422,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.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:09.442171659 +0100 +++ 0059-net-fix-checksum-API-documentation.patch 2021-11-30 16:50:05.726873060 +0100 @@ -1 +1 @@ -From dc954ae73aab9aaf45b8d5ce42f4490773dd1fab Mon Sep 17 00:00:00 2001 +From 0b9f46c0b78feacbbcfba8a1417f6926d83dd5aa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dc954ae73aab9aaf45b8d5ce42f4490773dd1fab ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - lib/net/rte_ip.h | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) + lib/librte_net/rte_ip.h | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) @@ -20,5 +21,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) +diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h +index f03db05e18..cedfd27ac1 100644 +--- a/lib/librte_net/rte_ip.h ++++ b/lib/librte_net/rte_ip.h +@@ -322,15 +322,14 @@ rte_ipv4_phdr_cksum(const struct rte_ipv4_hdr *ipv4_hdr, uint64_t ol_flags) @@ -28,2 +29,2 @@ -- * The IP and layer 4 checksum must be set to 0 in the packet by -- * the caller. +- * The IPv4 header should not contains options. The IP and layer 4 +- * checksum must be set to 0 in the packet by the caller. @@ -42,10 +43 @@ -@@ -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) +@@ -423,15 +422,15 @@ rte_ipv6_phdr_cksum(const struct rte_ipv6_hdr *ipv6_hdr, uint64_t ol_flags)