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 93E69A0A02; Tue, 27 Apr 2021 15:58:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AF95D4126F; Tue, 27 Apr 2021 15:58:28 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 342B241254 for ; Tue, 27 Apr 2021 15:58:25 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id a4so59593625wrr.2 for ; Tue, 27 Apr 2021 06:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Oa3ka7bDPcxBK5oC6uLX2escOC1pza5afzxHlNpJ7Mw=; b=jhJaDSqxIJ0d0u4tLvTCXeEKxzpv6xbYYUmKl9MpCvsU5XNDwwTaA4EA5T9D6gqrfe rn6usy/fsWdXYCN+X24nrIHfqzdJ8V3R+5A6n1X0nbzNLhk/S3NZ0T1hyrzcsTpycxrc /7UNFYHCSwFyXTZRAmOJ3AsGBPG3b6xB6mE/VUsf4/ofOK9h22Pjnrf2w21IUT85VtZl 1H4dG2DSz7IcpUJc3cZQjuD4AMWG7lSox98tUUffiQlg2eD2oHEwk5aUQw+1PFGsjag9 72qLat/rQWys9FNshpJCVnHtAxfI5oOrOEEFA0/E5iX88oB6JkJ0njkQOUN6+ymVc3lY QVeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Oa3ka7bDPcxBK5oC6uLX2escOC1pza5afzxHlNpJ7Mw=; b=b61eAMHtUOgF9Hn7B4bsI/INle29FwhhPiCSX6qfmnZ4XNizQGWNL9qT+zzw038TpO XYS1b4UEVZTsopMYbYwemCTUC13bIZjz/vaCzfjY9VBYufVyJOqVj4jtgaP3piGr48Bp i6QIu1o4Pyhe9ea4SpdnqdvHnhRq2OADoQmFP0Z2mfMUzydNpeo4vXxEb6EQgzfi93l6 exE6FyXDvC2ZtkGX7KS/+9EjKbDCv13ec3AUf9jWKqWp4H+aZmMjaIekSEE5e5Fum1Ny 05jeKXWnPXrEj1628WexFFwScUOuzgJygZN6D2WlOkDD9mYlK4i7CERsCvdhtMiO/Bq8 3XKQ== X-Gm-Message-State: AOAM532jUWyKirjQ9qSXfdVCqgWybi3yaIFpD/HxGmGVb8byY3omc3PS a6DQdt39nqFyoCECj6MFufnLt6NBVYhgCw== X-Google-Smtp-Source: ABdhPJxY5L5W2BKiSeJ8KOkNqzBwVMpzx5mHN/2BBVPYWo7hdmCzKOtsZDyB3ZrFIWym9NIumwmoGQ== X-Received: by 2002:a5d:6510:: with SMTP id x16mr9589070wru.345.1619531904986; Tue, 27 Apr 2021 06:58:24 -0700 (PDT) Received: from gojira.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id h9sm21072213wmb.35.2021.04.27.06.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Apr 2021 06:58:24 -0700 (PDT) From: Olivier Matz To: dev@dpdk.org Cc: Keith Wiles , Hongzhi Guo , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Thomas Monjalon Date: Tue, 27 Apr 2021 15:57:54 +0200 Message-Id: <20210427135755.927-4-olivier.matz@6wind.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210427135755.927-1-olivier.matz@6wind.com> References: <20210427135755.927-1-olivier.matz@6wind.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 3/4] net: introduce functions to verify L4 checksums X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since commit d5df2ae0428a ("net: fix unneeded replacement of TCP checksum 0"), the functions rte_ipv4_udptcp_cksum() and rte_ipv6_udptcp_cksum() can return either 0x0000 or 0xffff when used to verify a packet containing a valid checksum. Since these functions should be used to calculate the checksum to set in a packet, introduce 2 new helpers for checksum verification. They return 0 if the checksum is valid in the packet. Use this new helper in net/tap driver. Signed-off-by: Olivier Matz --- drivers/net/tap/rte_eth_tap.c | 7 +- lib/net/rte_ip.h | 124 +++++++++++++++++++++++++++------- 2 files changed, 104 insertions(+), 27 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 71282e8065..b14d5a1d55 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -365,11 +365,12 @@ tap_verify_csum(struct rte_mbuf *mbuf) return; } } - cksum = rte_ipv4_udptcp_cksum(l3_hdr, l4_hdr); + cksum_ok = !rte_ipv4_udptcp_cksum_verify(l3_hdr, + l4_hdr); } else { /* l3 == RTE_PTYPE_L3_IPV6, checked above */ - cksum = rte_ipv6_udptcp_cksum(l3_hdr, l4_hdr); + cksum_ok = !rte_ipv6_udptcp_cksum_verify(l3_hdr, + l4_hdr); } - cksum_ok = (cksum == 0) || (cksum == 0xffff); mbuf->ol_flags |= cksum_ok ? PKT_RX_L4_CKSUM_GOOD : PKT_RX_L4_CKSUM_BAD; } diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h index 8c189009b0..ef84bcc5bf 100644 --- a/lib/net/rte_ip.h +++ b/lib/net/rte_ip.h @@ -344,20 +344,10 @@ rte_ipv4_phdr_cksum(const struct rte_ipv4_hdr *ipv4_hdr, uint64_t ol_flags) } /** - * Process the IPv4 UDP or TCP checksum. - * - * The IP and layer 4 checksum must be set to 0 in the packet 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. + * @internal Calculate the non-complemented IPv4 L4 checksum */ static inline uint16_t -rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr) +__rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr) { uint32_t cksum; uint32_t l3_len, l4_len; @@ -374,16 +364,62 @@ rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr) cksum += rte_ipv4_phdr_cksum(ipv4_hdr, 0); cksum = ((cksum & 0xffff0000) >> 16) + (cksum & 0xffff); - cksum = (~cksum) & 0xffff; + + return (uint16_t)cksum; +} + +/** + * Process the IPv4 UDP or TCP checksum. + * + * The IP and layer 4 checksum must be set to 0 in the packet 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. + */ +static inline uint16_t +rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr) +{ + uint16_t cksum = __rte_ipv4_udptcp_cksum(ipv4_hdr, l4_hdr); + + cksum = ~cksum; + /* - * Per RFC 768:If the computed checksum is zero for UDP, + * Per RFC 768: If the computed checksum is zero for UDP, * it is transmitted as all ones * (the equivalent in one's complement arithmetic). */ if (cksum == 0 && ipv4_hdr->next_proto_id == IPPROTO_UDP) cksum = 0xffff; - return (uint16_t)cksum; + return cksum; +} + +/** + * Validate the IPv4 UDP or TCP checksum. + * + * @param ipv4_hdr + * The pointer to the contiguous IPv4 header. + * @param l4_hdr + * The pointer to the beginning of the L4 header. + * @return + * Return 0 if the checksum is correct, else -1. + */ +__rte_experimental +static inline int +rte_ipv4_udptcp_cksum_verify(const struct rte_ipv4_hdr *ipv4_hdr, + const void *l4_hdr) +{ + uint16_t cksum = __rte_ipv4_udptcp_cksum(ipv4_hdr, l4_hdr); + + if (cksum != 0xffff) + return -1; + + return 0; } /** @@ -448,6 +484,25 @@ rte_ipv6_phdr_cksum(const struct rte_ipv6_hdr *ipv6_hdr, uint64_t ol_flags) return __rte_raw_cksum_reduce(sum); } +/** + * @internal Calculate the non-complemented IPv4 L4 checksum + */ +static inline uint16_t +__rte_ipv6_udptcp_cksum(const struct rte_ipv6_hdr *ipv6_hdr, const void *l4_hdr) +{ + uint32_t cksum; + uint32_t l4_len; + + l4_len = rte_be_to_cpu_16(ipv6_hdr->payload_len); + + cksum = rte_raw_cksum(l4_hdr, l4_len); + cksum += rte_ipv6_phdr_cksum(ipv6_hdr, 0); + + cksum = ((cksum & 0xffff0000) >> 16) + (cksum & 0xffff); + + return (uint16_t)cksum; +} + /** * Process the IPv6 UDP or TCP checksum. * @@ -464,16 +519,10 @@ rte_ipv6_phdr_cksum(const struct rte_ipv6_hdr *ipv6_hdr, uint64_t ol_flags) static inline uint16_t rte_ipv6_udptcp_cksum(const struct rte_ipv6_hdr *ipv6_hdr, const void *l4_hdr) { - uint32_t cksum; - uint32_t l4_len; - - l4_len = rte_be_to_cpu_16(ipv6_hdr->payload_len); + uint16_t cksum = __rte_ipv6_udptcp_cksum(ipv6_hdr, l4_hdr); - cksum = rte_raw_cksum(l4_hdr, l4_len); - cksum += rte_ipv6_phdr_cksum(ipv6_hdr, 0); + cksum = ~cksum; - cksum = ((cksum & 0xffff0000) >> 16) + (cksum & 0xffff); - cksum = (~cksum) & 0xffff; /* * Per RFC 768: If the computed checksum is zero for UDP, * it is transmitted as all ones @@ -482,7 +531,34 @@ rte_ipv6_udptcp_cksum(const struct rte_ipv6_hdr *ipv6_hdr, const void *l4_hdr) if (cksum == 0 && ipv6_hdr->proto == IPPROTO_UDP) cksum = 0xffff; - return (uint16_t)cksum; + return cksum; +} + +/** + * Validate the IPv6 UDP or TCP checksum. + * + * The function accepts a 0 checksum, since it can exceptionally happen. See 8.1 + * (Upper-Layer Checksums) in RFC 8200. + * + * @param ipv6_hdr + * The pointer to the contiguous IPv6 header. + * @param l4_hdr + * The pointer to the beginning of the L4 header. + * @return + * Return 0 if the checksum is correct, else -1. + */ +__rte_experimental +static inline int +rte_ipv6_udptcp_cksum_verify(const struct rte_ipv6_hdr *ipv6_hdr, + const void *l4_hdr) +{ + uint16_t cksum; + + cksum = __rte_ipv6_udptcp_cksum(ipv6_hdr, l4_hdr); + if (cksum != 0xffff) + return -1; + + return 0; } /** IPv6 fragment extension header. */ -- 2.29.2