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 5829F5A0272 for ; Fri, 2 Feb 2024 15:11:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706883114; 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=0pK1VH8khLhnTA+gPBykbWDP2040M3X794PWC8auCOo=; b=d5fmMiuhFyIKhQmQX/cHm//1p1Eb9kw5IdLB6VoyjN317j3sgk8qKY6GiGaaJIVSWF+gAL 39mR4KkvbGMjtO/CuobZskd6pdADNhNtpD6ZIVYavfXZy6+DwmjEKgA+jupEhMjkP2VugI OLEAs/TsS0bsQB4jNzVWFnBIr+ZztXQ= 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-607-LzaR8763O7u1cfmAk6hSOg-1; Fri, 02 Feb 2024 09:11:53 -0500 X-MC-Unique: LzaR8763O7u1cfmAk6hSOg-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 ED9BC185A785 for ; Fri, 2 Feb 2024 14:11:52 +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 D5C9640C95AD; Fri, 2 Feb 2024 14:11:52 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 03/24] checksum: align buffers Date: Fri, 2 Feb 2024 15:11:30 +0100 Message-ID: <20240202141151.3762941-4-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: R4EN5W7Q26EZ3M7Y7CBYUXCSJIDGHUJ4 X-Message-ID-Hash: R4EN5W7Q26EZ3M7Y7CBYUXCSJIDGHUJ4 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: if buffer is not aligned use sum_16b() only on the not aligned part, and then use csum() on the remaining part Signed-off-by: Laurent Vivier --- checksum.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/checksum.c b/checksum.c index f21c9b7a14d1..c94980771c63 100644 --- a/checksum.c +++ b/checksum.c @@ -407,7 +407,19 @@ less_than_128_bytes: __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(csum_avx2(buf, len, init)); + intptr_t align = ((intptr_t)buf + 0x1f) & ~(intptr_t)0x1f; + unsigned int pad = align - (intptr_t)buf; + + if (len < pad) + pad = len; + + if (pad) + init += sum_16b(buf, pad); + + if (len > pad) + init = csum_avx2((void *)align, len - pad, init); + + return (uint16_t)~csum_fold(init); } #else /* __AVX2__ */ -- 2.42.0