From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 0AA6C5A0271 for ; Wed, 6 Mar 2024 06:58:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1709704722; bh=Kq6ucQmQ/yVza4Ql8SX38GWG9tr529N1uP4n2E97jhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oi8EZdvGqUhVxmEbH4yMX5lxLteVDuPT37bCLmaj5ciCb7kvA3n47SSlOFfZPi3Ft mM2Jp3X77ohmbNI3gGPjZwUaD5GmmhSo3dBmwdB0zz7nQn/IWE+iuCYdndX5ZrjxKV hkr91l9gbo1g6vXRZCi31jo8FLgmPx7ZZyJTT/kbgVl4nRpdxPsknkofs47capIveE xkSoVWbYcaYsEhBSJQDXzt0MBRmehZqSeeNQ6fFAt52NfqjzClpig8ppx5G7/yIXrv LjT1Hg04odvGV7tJbZicVm2CM+Nrxp0Y1vJd1htHGJOa25/VJRn9TYz/nIvbZfHgZs KcJb/t1dDmRbw== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4TqMDy25F5z4wcK; Wed, 6 Mar 2024 16:58:42 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v2 3/9] checksum: add csum_iov() Date: Wed, 6 Mar 2024 16:58:32 +1100 Message-ID: <20240306055838.1180477-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240306055838.1180477-1-david@gibson.dropbear.id.au> References: <20240306055838.1180477-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 2DL3PVL77A4QFSAI7EITSD566VGMAUJW X-Message-ID-Hash: 2DL3PVL77A4QFSAI7EITSD566VGMAUJW X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: lvivier@redhat.com, David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Laurent Vivier Introduce the function csum_unfolded() that computes the unfolded 32-bit checksum of a data buffer, and call it from csum() that returns the folded value. Introduce csum_iov() that computes the checksum using csum_folded() on all vectors of the iovec array and returns the folded result. Signed-off-by: Laurent Vivier Reviewed-by: David Gibson Message-ID: <20240303135114.1023026-4-lvivier@redhat.com> [dwg: Fixed trivial cppcheck & clang-tidy regressions] Signed-off-by: David Gibson --- checksum.c | 59 ++++++++++++++++++++++++++++++++++++++++++------------ checksum.h | 4 +++- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/checksum.c b/checksum.c index 65486b46..643957b5 100644 --- a/checksum.c +++ b/checksum.c @@ -57,6 +57,7 @@ #include #include "util.h" +#include "checksum.h" /* Checksums are optional for UDP over IPv4, so we usually just set * them to 0. Change this to 1 to calculate real UDP over IPv4 @@ -112,8 +113,6 @@ uint16_t csum_fold(uint32_t sum) return sum; } -uint16_t csum(const void *buf, size_t len, uint32_t init); - /** * csum_ip4_header() - Calculate and set IPv4 header checksum * @ip4h: IPv4 header @@ -385,16 +384,17 @@ less_than_128_bytes: } /** - * csum() - Compute TCP/IP-style checksum - * @buf: Input buffer - * @len: Input length - * @init: Initial 32-bit checksum, 0 for no pre-computed checksum + * csum_unfolded - Calculate the unfolded checksum of a data buffer. * - * Return: 16-bit folded, complemented checksum + * @buf: Input buffer + * @len: Input length + * @init: Initial 32-bit checksum, 0 for no pre-computed checksum + * + * Return: 32-bit unfolded */ /* NOLINTNEXTLINE(clang-diagnostic-unknown-attributes) */ __attribute__((optimize("-fno-strict-aliasing"))) /* See csum_16b() */ -uint16_t csum(const void *buf, size_t len, uint32_t init) +uint32_t csum_unfolded(const void *buf, size_t len, uint32_t init) { intptr_t align = ROUND_UP((intptr_t)buf, sizeof(__m256i)); unsigned int pad = align - (intptr_t)buf; @@ -408,16 +408,31 @@ uint16_t csum(const void *buf, size_t len, uint32_t init) if (len > pad) init = csum_avx2((void *)align, len - pad, init); - return (uint16_t)~csum_fold(init); + return init; } - #else /* __AVX2__ */ +/** + * csum_unfolded - Calculate the unfolded checksum of a data buffer. + * + * @buf: Input buffer + * @len: Input length + * @init: Initial 32-bit checksum, 0 for no pre-computed checksum + * + * Return: 32-bit unfolded checksum + */ +/* NOLINTNEXTLINE(clang-diagnostic-unknown-attributes) */ +__attribute__((optimize("-fno-strict-aliasing"))) /* See csum_16b() */ +uint32_t csum_unfolded(const void *buf, size_t len, uint32_t init) +{ + return sum_16b(buf, len) + init; +} +#endif /* !__AVX2__ */ /** * csum() - Compute TCP/IP-style checksum * @buf: Input buffer * @len: Input length - * @sum: Initial 32-bit checksum, 0 for no pre-computed checksum + * @init: Initial 32-bit checksum, 0 for no pre-computed checksum * * Return: 16-bit folded, complemented checksum */ @@ -425,7 +440,25 @@ uint16_t csum(const void *buf, size_t len, uint32_t init) __attribute__((optimize("-fno-strict-aliasing"))) /* See csum_16b() */ uint16_t csum(const void *buf, size_t len, uint32_t init) { - return (uint16_t)~csum_fold(sum_16b(buf, len) + init); + return (uint16_t)~csum_fold(csum_unfolded(buf, len, init)); } -#endif /* !__AVX2__ */ +/** + * csum_iov() - Calculates the unfolded checksum over an array of IO vectors + * + * @iov Pointer to the array of IO vectors + * @n Length of the array + * @init Initial 32-bit checksum, 0 for no pre-computed checksum + * + * Return: 16-bit folded, complemented checksum + */ +/* cppcheck-suppress unusedFunction */ +uint16_t csum_iov(const struct iovec *iov, size_t n, uint32_t init) +{ + unsigned int i; + + for (i = 0; i < n; i++) + init = csum_unfolded(iov[i].iov_base, iov[i].iov_len, init); + + return (uint16_t)~csum_fold(init); +} diff --git a/checksum.h b/checksum.h index 21c0310d..cb80ab38 100644 --- a/checksum.h +++ b/checksum.h @@ -17,13 +17,15 @@ void csum_ip4_header(struct iphdr *ip4h); void csum_udp4(struct udphdr *udp4hr, struct in_addr saddr, struct in_addr daddr, const void *payload, size_t len); -void csum_icmp4(struct icmphdr *ih, const void *payload, size_t len); +void csum_icmp4(struct icmphdr *icmp4hr, const void *payload, size_t len); void csum_udp6(struct udphdr *udp6hr, const struct in6_addr *saddr, const struct in6_addr *daddr, const void *payload, size_t len); void csum_icmp6(struct icmp6hdr *icmp6hr, const struct in6_addr *saddr, const struct in6_addr *daddr, const void *payload, size_t len); +uint32_t csum_unfolded(const void *buf, size_t len, uint32_t init); uint16_t csum(const void *buf, size_t len, uint32_t init); +uint16_t csum_iov(const struct iovec *iov, size_t n, uint32_t init); #endif /* CHECKSUM_H */ -- 2.44.0