From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTP id A71435A026F for ; Fri, 2 Feb 2024 15:12:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706883130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/tExIgtoKktbT71fjE83zkfwUGPQg5Qlwjfwmb6PruU=; b=TMYQmQHAOlz0LxcUdxEexlv7zEVyjkFS/GG3/K3dYLdmzoLxMccr1gBzOw6rH+B0xlBSDz LkqkrW2jluaM4deOU9OA6rhacg1e4EMg4wNPRQD2bjwA9W6jSjhQpfX3iZRF+6zQMtEjIo 6UvjAnqBWoDJRw6KdToeUgb7YbZ4Rb4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-689-w1auqyl0PRuegLWwmj93QQ-1; Fri, 02 Feb 2024 09:11:53 -0500 X-MC-Unique: w1auqyl0PRuegLWwmj93QQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1964484AEA2 for ; Fri, 2 Feb 2024 14:11:53 +0000 (UTC) Received: from virtlab218.virt.lab.eng.bos.redhat.com (virtlab218.virt.lab.eng.bos.redhat.com [10.19.152.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 01554400D784; Fri, 2 Feb 2024 14:11:52 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 04/24] checksum: add csum_iov() Date: Fri, 2 Feb 2024 15:11:31 +0100 Message-ID: <20240202141151.3762941-5-lvivier@redhat.com> In-Reply-To: <20240202141151.3762941-1-lvivier@redhat.com> References: <20240202141151.3762941-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: YU2IDG47QYV5BVL7P33D6FUUJFINNKMU X-Message-ID-Hash: YU2IDG47QYV5BVL7P33D6FUUJFINNKMU X-MailFrom: lvivier@redhat.com 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: Laurent Vivier 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: Signed-off-by: Laurent Vivier --- checksum.c | 39 ++++++++++++++++++++++----------------- checksum.h | 1 + 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/checksum.c b/checksum.c index c94980771c63..14b6057684d9 100644 --- a/checksum.c +++ b/checksum.c @@ -395,17 +395,8 @@ less_than_128_bytes: return (uint32_t)sum64; } -/** - * csum() - Compute TCP/IP-style checksum - * @buf: Input buffer, must be aligned to 32-byte boundary - * @len: Input length - * @init: Initial 32-bit checksum, 0 for no pre-computed checksum - * - * Return: 16-bit folded, complemented checksum sum - */ -/* 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 = ((intptr_t)buf + 0x1f) & ~(intptr_t)0x1f; unsigned int pad = align - (intptr_t)buf; @@ -419,24 +410,38 @@ 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__ */ +__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 + * @buf: Input buffer, must be aligned to 32-byte boundary * @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 + * Return: 16-bit folded, complemented checksum sum */ /* 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) { - return csum_unaligned(buf, len, init); + return (uint16_t)~csum_fold(csum_unfolded(buf, len, init)); } -#endif /* !__AVX2__ */ +uint16_t csum_iov(struct iovec *iov, unsigned int 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 21c0310d3804..6a20297a5826 100644 --- a/checksum.h +++ b/checksum.h @@ -25,5 +25,6 @@ void csum_icmp6(struct icmp6hdr *icmp6hr, const struct in6_addr *saddr, const struct in6_addr *daddr, const void *payload, size_t len); uint16_t csum(const void *buf, size_t len, uint32_t init); +uint16_t csum_iov(struct iovec *iov, unsigned int n, uint32_t init); #endif /* CHECKSUM_H */ -- 2.42.0