From nobody Fri Nov 7 12:26:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539089882273642.4936815807584; Tue, 9 Oct 2018 05:58:02 -0700 (PDT) Received: from localhost ([::1]:51292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9raL-0001jZ-4O for importer@patchew.org; Tue, 09 Oct 2018 08:58:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9rYN-0000Xi-8D for qemu-devel@nongnu.org; Tue, 09 Oct 2018 08:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g9rYL-0004E3-K5 for qemu-devel@nongnu.org; Tue, 09 Oct 2018 08:55:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54310) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g9rYL-0004BB-B6 for qemu-devel@nongnu.org; Tue, 09 Oct 2018 08:55:57 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 28EF03082143; Tue, 9 Oct 2018 12:55:56 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2BB8C6A962; Tue, 9 Oct 2018 12:55:55 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 9 Oct 2018 13:55:38 +0100 Message-Id: <20181009125541.24455-4-berrange@redhat.com> In-Reply-To: <20181009125541.24455-1-berrange@redhat.com> References: <20181009125541.24455-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 09 Oct 2018 12:55:56 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/6] crypto: introduce a xts_uint128 data type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alberto Garcia Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The new type is designed to allow use of 64-bit arithmetic instead of operating 1-byte at a time. The following patches will use this to improve performance. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Alberto Garcia --- crypto/xts.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/crypto/xts.c b/crypto/xts.c index 3c1a92f01d..ded4365191 100644 --- a/crypto/xts.c +++ b/crypto/xts.c @@ -26,6 +26,11 @@ #include "qemu/osdep.h" #include "crypto/xts.h" =20 +typedef struct { + uint64_t a; + uint64_t b; +} xts_uint128; + static void xts_mult_x(uint8_t *I) { int x; @@ -85,7 +90,7 @@ void xts_decrypt(const void *datactx, uint8_t *dst, const uint8_t *src) { - uint8_t PP[XTS_BLOCK_SIZE], CC[XTS_BLOCK_SIZE], T[XTS_BLOCK_SIZE]; + xts_uint128 PP, CC, T; unsigned long i, m, mo, lim; =20 /* get number of blocks */ @@ -102,10 +107,10 @@ void xts_decrypt(const void *datactx, } =20 /* encrypt the iv */ - encfunc(tweakctx, XTS_BLOCK_SIZE, T, iv); + encfunc(tweakctx, XTS_BLOCK_SIZE, (uint8_t *)&T, iv); =20 for (i =3D 0; i < lim; i++) { - xts_tweak_encdec(datactx, decfunc, src, dst, T); + xts_tweak_encdec(datactx, decfunc, src, dst, (uint8_t *)&T); =20 src +=3D XTS_BLOCK_SIZE; dst +=3D XTS_BLOCK_SIZE; @@ -113,27 +118,27 @@ void xts_decrypt(const void *datactx, =20 /* if length is not a multiple of XTS_BLOCK_SIZE then */ if (mo > 0) { - memcpy(CC, T, XTS_BLOCK_SIZE); - xts_mult_x(CC); + memcpy(&CC, &T, XTS_BLOCK_SIZE); + xts_mult_x((uint8_t *)&CC); =20 /* PP =3D tweak decrypt block m-1 */ - xts_tweak_encdec(datactx, decfunc, src, PP, CC); + xts_tweak_encdec(datactx, decfunc, src, (uint8_t *)&PP, (uint8_t *= )&CC); =20 /* Pm =3D first length % XTS_BLOCK_SIZE bytes of PP */ for (i =3D 0; i < mo; i++) { - CC[i] =3D src[XTS_BLOCK_SIZE + i]; - dst[XTS_BLOCK_SIZE + i] =3D PP[i]; + ((uint8_t *)&CC)[i] =3D src[XTS_BLOCK_SIZE + i]; + dst[XTS_BLOCK_SIZE + i] =3D ((uint8_t *)&PP)[i]; } for (; i < XTS_BLOCK_SIZE; i++) { - CC[i] =3D PP[i]; + ((uint8_t *)&CC)[i] =3D ((uint8_t *)&PP)[i]; } =20 /* Pm-1 =3D Tweak uncrypt CC */ - xts_tweak_encdec(datactx, decfunc, CC, dst, T); + xts_tweak_encdec(datactx, decfunc, (uint8_t *)&CC, dst, (uint8_t *= )&T); } =20 /* Decrypt the iv back */ - decfunc(tweakctx, XTS_BLOCK_SIZE, iv, T); + decfunc(tweakctx, XTS_BLOCK_SIZE, iv, (uint8_t *)&T); } =20 =20 @@ -146,7 +151,7 @@ void xts_encrypt(const void *datactx, uint8_t *dst, const uint8_t *src) { - uint8_t PP[XTS_BLOCK_SIZE], CC[XTS_BLOCK_SIZE], T[XTS_BLOCK_SIZE]; + xts_uint128 PP, CC, T; unsigned long i, m, mo, lim; =20 /* get number of blocks */ @@ -163,10 +168,10 @@ void xts_encrypt(const void *datactx, } =20 /* encrypt the iv */ - encfunc(tweakctx, XTS_BLOCK_SIZE, T, iv); + encfunc(tweakctx, XTS_BLOCK_SIZE, (uint8_t *)&T, iv); =20 for (i =3D 0; i < lim; i++) { - xts_tweak_encdec(datactx, encfunc, src, dst, T); + xts_tweak_encdec(datactx, encfunc, src, dst, (uint8_t *)&T); =20 dst +=3D XTS_BLOCK_SIZE; src +=3D XTS_BLOCK_SIZE; @@ -175,22 +180,22 @@ void xts_encrypt(const void *datactx, /* if length is not a multiple of XTS_BLOCK_SIZE then */ if (mo > 0) { /* CC =3D tweak encrypt block m-1 */ - xts_tweak_encdec(datactx, encfunc, src, CC, T); + xts_tweak_encdec(datactx, encfunc, src, (uint8_t *)&CC, (uint8_t *= )&T); =20 /* Cm =3D first length % XTS_BLOCK_SIZE bytes of CC */ for (i =3D 0; i < mo; i++) { - PP[i] =3D src[XTS_BLOCK_SIZE + i]; - dst[XTS_BLOCK_SIZE + i] =3D CC[i]; + ((uint8_t *)&PP)[i] =3D src[XTS_BLOCK_SIZE + i]; + dst[XTS_BLOCK_SIZE + i] =3D ((uint8_t *)&CC)[i]; } =20 for (; i < XTS_BLOCK_SIZE; i++) { - PP[i] =3D CC[i]; + ((uint8_t *)&PP)[i] =3D ((uint8_t *)&CC)[i]; } =20 /* Cm-1 =3D Tweak encrypt PP */ - xts_tweak_encdec(datactx, encfunc, PP, dst, T); + xts_tweak_encdec(datactx, encfunc, (uint8_t *)&PP, dst, (uint8_t *= )&T); } =20 /* Decrypt the iv back */ - decfunc(tweakctx, XTS_BLOCK_SIZE, iv, T); + decfunc(tweakctx, XTS_BLOCK_SIZE, iv, (uint8_t *)&T); } --=20 2.17.1