From patchwork Tue Oct 9 12:55:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 981190 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42Ty3j5HcPz9s5c for ; Tue, 9 Oct 2018 23:59:12 +1100 (AEDT) Received: from localhost ([::1]:51294 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9rbQ-0002in-Ub for incoming@patchwork.ozlabs.org; Tue, 09 Oct 2018 08:59:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9rYV-0000c0-7X for qemu-devel@nongnu.org; Tue, 09 Oct 2018 08:56:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g9rYP-0004Gp-BQ for qemu-devel@nongnu.org; Tue, 09 Oct 2018 08:56:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55444) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g9rYP-0004EY-4C for qemu-devel@nongnu.org; Tue, 09 Oct 2018 08:56:01 -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 85302307D912; Tue, 9 Oct 2018 12:55:58 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7A666A96D; Tue, 9 Oct 2018 12:55:57 +0000 (UTC) From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 9 Oct 2018 13:55:40 +0100 Message-Id: <20181009125541.24455-6-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.48]); Tue, 09 Oct 2018 12:55:58 +0000 (UTC) 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 5/6] crypto: convert xts_mult_x to use xts_uint128 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Using 64-bit arithmetic increases the performance for xts-aes-128 when built with gcrypt: Encrypt: 320 MB/s -> 460 MB/s Decrypt: 325 MB/s -> 485 MB/s Signed-off-by: Daniel P. Berrangé --- crypto/xts.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/crypto/xts.c b/crypto/xts.c index f109c8a3ee..bba3280746 100644 --- a/crypto/xts.c +++ b/crypto/xts.c @@ -37,19 +37,17 @@ typedef struct { (D)->b = (S1)->b ^ (S2)->b; \ } while (0) -static void xts_mult_x(uint8_t *I) +static void xts_mult_x(xts_uint128 *I) { - int x; - uint8_t t, tt; + uint64_t tt; - for (x = t = 0; x < 16; x++) { - tt = I[x] >> 7; - I[x] = ((I[x] << 1) | t) & 0xFF; - t = tt; - } - if (tt) { - I[0] ^= 0x87; + tt = I->a >> 63; + I->a = I->a << 1; + + if (I->b >> 63) { + I->a ^= 0x87; } + I->b = (I->b << 1) | tt; } @@ -77,7 +75,7 @@ static void xts_tweak_encdec(const void *ctx, xts_uint128_xor(dst, dst, iv); /* LFSR the tweak */ - xts_mult_x((uint8_t *)iv); + xts_mult_x(iv); } @@ -124,7 +122,7 @@ void xts_decrypt(const void *datactx, if (mo > 0) { xts_uint128 S, D; memcpy(&CC, &T, XTS_BLOCK_SIZE); - xts_mult_x((uint8_t *)&CC); + xts_mult_x(&CC); /* PP = tweak decrypt block m-1 */ memcpy(&S, src, XTS_BLOCK_SIZE);