Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/92259/?format=api
{ "id": 92259, "url": "https://patches.dpdk.org/api/patches/92259/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210427135755.927-4-olivier.matz@6wind.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210427135755.927-4-olivier.matz@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210427135755.927-4-olivier.matz@6wind.com", "date": "2021-04-27T13:57:54", "name": "[3/4] net: introduce functions to verify L4 checksums", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "69bbb01cf32ac442be2b4682561619d122464098", "submitter": { "id": 8, "url": "https://patches.dpdk.org/api/people/8/?format=api", "name": "Olivier Matz", "email": "olivier.matz@6wind.com" }, "delegate": { "id": 3961, "url": "https://patches.dpdk.org/api/users/3961/?format=api", "username": "arybchenko", "first_name": "Andrew", "last_name": "Rybchenko", "email": "andrew.rybchenko@oktetlabs.ru" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210427135755.927-4-olivier.matz@6wind.com/mbox/", "series": [ { "id": 16703, "url": "https://patches.dpdk.org/api/series/16703/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=16703", "date": "2021-04-27T13:57:51", "name": "net/tap: fix Rx cksum", "version": 1, "mbox": "https://patches.dpdk.org/series/16703/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/92259/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/92259/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 93E69A0A02;\n\tTue, 27 Apr 2021 15:58:44 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id AF95D4126F;\n\tTue, 27 Apr 2021 15:58:28 +0200 (CEST)", "from mail-wr1-f50.google.com (mail-wr1-f50.google.com\n [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 342B241254\n for <dev@dpdk.org>; Tue, 27 Apr 2021 15:58:25 +0200 (CEST)", "by mail-wr1-f50.google.com with SMTP id a4so59593625wrr.2\n for <dev@dpdk.org>; Tue, 27 Apr 2021 06:58:25 -0700 (PDT)", "from gojira.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com.\n [62.23.145.78])\n by smtp.gmail.com with ESMTPSA id h9sm21072213wmb.35.2021.04.27.06.58.24\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 27 Apr 2021 06:58:24 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=Oa3ka7bDPcxBK5oC6uLX2escOC1pza5afzxHlNpJ7Mw=;\n b=jhJaDSqxIJ0d0u4tLvTCXeEKxzpv6xbYYUmKl9MpCvsU5XNDwwTaA4EA5T9D6gqrfe\n rn6usy/fsWdXYCN+X24nrIHfqzdJ8V3R+5A6n1X0nbzNLhk/S3NZ0T1hyrzcsTpycxrc\n /7UNFYHCSwFyXTZRAmOJ3AsGBPG3b6xB6mE/VUsf4/ofOK9h22Pjnrf2w21IUT85VtZl\n 1H4dG2DSz7IcpUJc3cZQjuD4AMWG7lSox98tUUffiQlg2eD2oHEwk5aUQw+1PFGsjag9\n 72qLat/rQWys9FNshpJCVnHtAxfI5oOrOEEFA0/E5iX88oB6JkJ0njkQOUN6+ymVc3lY\n QVeg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=Oa3ka7bDPcxBK5oC6uLX2escOC1pza5afzxHlNpJ7Mw=;\n b=b61eAMHtUOgF9Hn7B4bsI/INle29FwhhPiCSX6qfmnZ4XNizQGWNL9qT+zzw038TpO\n XYS1b4UEVZTsopMYbYwemCTUC13bIZjz/vaCzfjY9VBYufVyJOqVj4jtgaP3piGr48Bp\n i6QIu1o4Pyhe9ea4SpdnqdvHnhRq2OADoQmFP0Z2mfMUzydNpeo4vXxEb6EQgzfi93l6\n exE6FyXDvC2ZtkGX7KS/+9EjKbDCv13ec3AUf9jWKqWp4H+aZmMjaIekSEE5e5Fum1Ny\n 05jeKXWnPXrEj1628WexFFwScUOuzgJygZN6D2WlOkDD9mYlK4i7CERsCvdhtMiO/Bq8\n 3XKQ==", "X-Gm-Message-State": "AOAM532jUWyKirjQ9qSXfdVCqgWybi3yaIFpD/HxGmGVb8byY3omc3PS\n a6DQdt39nqFyoCECj6MFufnLt6NBVYhgCw==", "X-Google-Smtp-Source": "\n ABdhPJxY5L5W2BKiSeJ8KOkNqzBwVMpzx5mHN/2BBVPYWo7hdmCzKOtsZDyB3ZrFIWym9NIumwmoGQ==", "X-Received": "by 2002:a5d:6510:: with SMTP id x16mr9589070wru.345.1619531904986;\n Tue, 27 Apr 2021 06:58:24 -0700 (PDT)", "From": "Olivier Matz <olivier.matz@6wind.com>", "To": "dev@dpdk.org", "Cc": "Keith Wiles <keith.wiles@intel.com>, Hongzhi Guo <guohongzhi1@huawei.com>,\n\t=?utf-8?q?Morten_Br=C3=B8rup?= <mb@smartsharesystems.com>,\n Thomas Monjalon <thomas@monjalon.net>", "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\n checksums", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Since commit d5df2ae0428a (\"net: fix unneeded replacement of TCP\nchecksum 0\"), the functions rte_ipv4_udptcp_cksum() and\nrte_ipv6_udptcp_cksum() can return either 0x0000 or 0xffff when used to\nverify a packet containing a valid checksum.\n\nSince these functions should be used to calculate the checksum to set in\na packet, introduce 2 new helpers for checksum verification. They return\n0 if the checksum is valid in the packet.\n\nUse this new helper in net/tap driver.\n\nSigned-off-by: Olivier Matz <olivier.matz@6wind.com>\n---\n drivers/net/tap/rte_eth_tap.c | 7 +-\n lib/net/rte_ip.h | 124 +++++++++++++++++++++++++++-------\n 2 files changed, 104 insertions(+), 27 deletions(-)", "diff": "diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c\nindex 71282e8065..b14d5a1d55 100644\n--- a/drivers/net/tap/rte_eth_tap.c\n+++ b/drivers/net/tap/rte_eth_tap.c\n@@ -365,11 +365,12 @@ tap_verify_csum(struct rte_mbuf *mbuf)\n \t\t\t\t\treturn;\n \t\t\t\t}\n \t\t\t}\n-\t\t\tcksum = rte_ipv4_udptcp_cksum(l3_hdr, l4_hdr);\n+\t\t\tcksum_ok = !rte_ipv4_udptcp_cksum_verify(l3_hdr,\n+\t\t\t\t\t\t\t\t l4_hdr);\n \t\t} else { /* l3 == RTE_PTYPE_L3_IPV6, checked above */\n-\t\t\tcksum = rte_ipv6_udptcp_cksum(l3_hdr, l4_hdr);\n+\t\t\tcksum_ok = !rte_ipv6_udptcp_cksum_verify(l3_hdr,\n+\t\t\t\t\t\t\t\t l4_hdr);\n \t\t}\n-\t\tcksum_ok = (cksum == 0) || (cksum == 0xffff);\n \t\tmbuf->ol_flags |= cksum_ok ?\n \t\t\tPKT_RX_L4_CKSUM_GOOD : PKT_RX_L4_CKSUM_BAD;\n \t}\ndiff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h\nindex 8c189009b0..ef84bcc5bf 100644\n--- a/lib/net/rte_ip.h\n+++ b/lib/net/rte_ip.h\n@@ -344,20 +344,10 @@ rte_ipv4_phdr_cksum(const struct rte_ipv4_hdr *ipv4_hdr, uint64_t ol_flags)\n }\n \n /**\n- * Process the IPv4 UDP or TCP checksum.\n- *\n- * The IP and layer 4 checksum must be set to 0 in the packet by\n- * the caller.\n- *\n- * @param ipv4_hdr\n- * The pointer to the contiguous IPv4 header.\n- * @param l4_hdr\n- * The pointer to the beginning of the L4 header.\n- * @return\n- * The complemented checksum to set in the IP packet.\n+ * @internal Calculate the non-complemented IPv4 L4 checksum\n */\n static inline uint16_t\n-rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr)\n+__rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr)\n {\n \tuint32_t cksum;\n \tuint32_t l3_len, l4_len;\n@@ -374,16 +364,62 @@ rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr)\n \tcksum += rte_ipv4_phdr_cksum(ipv4_hdr, 0);\n \n \tcksum = ((cksum & 0xffff0000) >> 16) + (cksum & 0xffff);\n-\tcksum = (~cksum) & 0xffff;\n+\n+\treturn (uint16_t)cksum;\n+}\n+\n+/**\n+ * Process the IPv4 UDP or TCP checksum.\n+ *\n+ * The IP and layer 4 checksum must be set to 0 in the packet by\n+ * the caller.\n+ *\n+ * @param ipv4_hdr\n+ * The pointer to the contiguous IPv4 header.\n+ * @param l4_hdr\n+ * The pointer to the beginning of the L4 header.\n+ * @return\n+ * The complemented checksum to set in the IP packet.\n+ */\n+static inline uint16_t\n+rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr)\n+{\n+\tuint16_t cksum = __rte_ipv4_udptcp_cksum(ipv4_hdr, l4_hdr);\n+\n+\tcksum = ~cksum;\n+\n \t/*\n-\t * Per RFC 768:If the computed checksum is zero for UDP,\n+\t * Per RFC 768: If the computed checksum is zero for UDP,\n \t * it is transmitted as all ones\n \t * (the equivalent in one's complement arithmetic).\n \t */\n \tif (cksum == 0 && ipv4_hdr->next_proto_id == IPPROTO_UDP)\n \t\tcksum = 0xffff;\n \n-\treturn (uint16_t)cksum;\n+\treturn cksum;\n+}\n+\n+/**\n+ * Validate the IPv4 UDP or TCP checksum.\n+ *\n+ * @param ipv4_hdr\n+ * The pointer to the contiguous IPv4 header.\n+ * @param l4_hdr\n+ * The pointer to the beginning of the L4 header.\n+ * @return\n+ * Return 0 if the checksum is correct, else -1.\n+ */\n+__rte_experimental\n+static inline int\n+rte_ipv4_udptcp_cksum_verify(const struct rte_ipv4_hdr *ipv4_hdr,\n+\t\t\t const void *l4_hdr)\n+{\n+\tuint16_t cksum = __rte_ipv4_udptcp_cksum(ipv4_hdr, l4_hdr);\n+\n+\tif (cksum != 0xffff)\n+\t\treturn -1;\n+\n+\treturn 0;\n }\n \n /**\n@@ -448,6 +484,25 @@ rte_ipv6_phdr_cksum(const struct rte_ipv6_hdr *ipv6_hdr, uint64_t ol_flags)\n \treturn __rte_raw_cksum_reduce(sum);\n }\n \n+/**\n+ * @internal Calculate the non-complemented IPv4 L4 checksum\n+ */\n+static inline uint16_t\n+__rte_ipv6_udptcp_cksum(const struct rte_ipv6_hdr *ipv6_hdr, const void *l4_hdr)\n+{\n+\tuint32_t cksum;\n+\tuint32_t l4_len;\n+\n+\tl4_len = rte_be_to_cpu_16(ipv6_hdr->payload_len);\n+\n+\tcksum = rte_raw_cksum(l4_hdr, l4_len);\n+\tcksum += rte_ipv6_phdr_cksum(ipv6_hdr, 0);\n+\n+\tcksum = ((cksum & 0xffff0000) >> 16) + (cksum & 0xffff);\n+\n+\treturn (uint16_t)cksum;\n+}\n+\n /**\n * Process the IPv6 UDP or TCP checksum.\n *\n@@ -464,16 +519,10 @@ rte_ipv6_phdr_cksum(const struct rte_ipv6_hdr *ipv6_hdr, uint64_t ol_flags)\n static inline uint16_t\n rte_ipv6_udptcp_cksum(const struct rte_ipv6_hdr *ipv6_hdr, const void *l4_hdr)\n {\n-\tuint32_t cksum;\n-\tuint32_t l4_len;\n-\n-\tl4_len = rte_be_to_cpu_16(ipv6_hdr->payload_len);\n+\tuint16_t cksum = __rte_ipv6_udptcp_cksum(ipv6_hdr, l4_hdr);\n \n-\tcksum = rte_raw_cksum(l4_hdr, l4_len);\n-\tcksum += rte_ipv6_phdr_cksum(ipv6_hdr, 0);\n+\tcksum = ~cksum;\n \n-\tcksum = ((cksum & 0xffff0000) >> 16) + (cksum & 0xffff);\n-\tcksum = (~cksum) & 0xffff;\n \t/*\n \t * Per RFC 768: If the computed checksum is zero for UDP,\n \t * it is transmitted as all ones\n@@ -482,7 +531,34 @@ rte_ipv6_udptcp_cksum(const struct rte_ipv6_hdr *ipv6_hdr, const void *l4_hdr)\n \tif (cksum == 0 && ipv6_hdr->proto == IPPROTO_UDP)\n \t\tcksum = 0xffff;\n \n-\treturn (uint16_t)cksum;\n+\treturn cksum;\n+}\n+\n+/**\n+ * Validate the IPv6 UDP or TCP checksum.\n+ *\n+ * The function accepts a 0 checksum, since it can exceptionally happen. See 8.1\n+ * (Upper-Layer Checksums) in RFC 8200.\n+ *\n+ * @param ipv6_hdr\n+ * The pointer to the contiguous IPv6 header.\n+ * @param l4_hdr\n+ * The pointer to the beginning of the L4 header.\n+ * @return\n+ * Return 0 if the checksum is correct, else -1.\n+ */\n+__rte_experimental\n+static inline int\n+rte_ipv6_udptcp_cksum_verify(const struct rte_ipv6_hdr *ipv6_hdr,\n+\t\t\t const void *l4_hdr)\n+{\n+\tuint16_t cksum;\n+\n+\tcksum = __rte_ipv6_udptcp_cksum(ipv6_hdr, l4_hdr);\n+\tif (cksum != 0xffff)\n+\t\treturn -1;\n+\n+\treturn 0;\n }\n \n /** IPv6 fragment extension header. */\n", "prefixes": [ "3/4" ] }