qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
	"Alberto Garcia" <berto@igalia.com>
Subject: [Qemu-devel] [PATCH 5/6] crypto: convert xts_mult_x to use xts_uint128 type
Date: Tue,  9 Oct 2018 13:55:40 +0100	[thread overview]
Message-ID: <20181009125541.24455-6-berrange@redhat.com> (raw)
In-Reply-To: <20181009125541.24455-1-berrange@redhat.com>

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é <berrange@redhat.com>
---
 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);
-- 
2.17.1

  parent reply	other threads:[~2018-10-09 12:56 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-09 12:55 [Qemu-devel] [PATCH 0/6] crypto: improve performance of XTS cipher mode Daniel P. Berrangé
2018-10-09 12:55 ` [Qemu-devel] [PATCH 1/6] crypto: expand algorithm coverage for cipher benchmark Daniel P. Berrangé
2018-10-09 14:04   ` Marc-André Lureau
2018-10-10 11:45   ` Alberto Garcia
2018-10-09 12:55 ` [Qemu-devel] [PATCH 2/6] crypto: remove code duplication in tweak encrypt/decrypt Daniel P. Berrangé
2018-10-09 13:43   ` Alberto Garcia
2018-10-09 13:51   ` Marc-André Lureau
2018-10-09 12:55 ` [Qemu-devel] [PATCH 3/6] crypto: introduce a xts_uint128 data type Daniel P. Berrangé
2018-10-09 14:40   ` Alberto Garcia
2018-10-09 14:50   ` Alberto Garcia
2018-10-09 14:58     ` Daniel P. Berrangé
2018-10-09 15:14       ` Alberto Garcia
2018-10-09 12:55 ` [Qemu-devel] [PATCH 4/6] crypto: convert xts_tweak_encdec to use xts_uint128 type Daniel P. Berrangé
2018-10-09 15:02   ` Alberto Garcia
2018-10-09 15:06     ` Daniel P. Berrangé
2018-10-09 15:30       ` Alberto Garcia
2018-10-09 15:31         ` Daniel P. Berrangé
2018-10-11 12:16           ` Alberto Garcia
2018-10-09 12:55 ` Daniel P. Berrangé [this message]
2018-10-09 13:52   ` [Qemu-devel] [PATCH 5/6] crypto: convert xts_mult_x " Alberto Garcia
2018-10-09 13:55     ` Daniel P. Berrangé
2018-10-09 14:25       ` Alberto Garcia
2018-10-09 12:55 ` [Qemu-devel] [PATCH 6/6] crypto: annotate xts_tweak_encdec as inlineable Daniel P. Berrangé
2018-10-09 15:37   ` Alberto Garcia
2018-10-09 13:59 ` [Qemu-devel] [PATCH 0/6] crypto: improve performance of XTS cipher mode Marc-André Lureau
2018-10-09 14:13   ` Daniel P. Berrangé
2018-10-09 14:27     ` Marc-André Lureau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181009125541.24455-6-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=berto@igalia.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).