From patchwork Tue Feb 14 10:03:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 93939 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1485983qgi; Tue, 14 Feb 2017 02:05:20 -0800 (PST) X-Received: by 10.84.231.134 with SMTP id g6mr4197197plk.110.1487066719916; Tue, 14 Feb 2017 02:05:19 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l36si55002plg.114.2017.02.14.02.05.19; Tue, 14 Feb 2017 02:05:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752521AbdBNKEj (ORCPT + 1 other); Tue, 14 Feb 2017 05:04:39 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:35415 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752490AbdBNKEP (ORCPT ); Tue, 14 Feb 2017 05:04:15 -0500 Received: by mail-wm0-f53.google.com with SMTP id v186so13524817wmd.0 for ; Tue, 14 Feb 2017 02:04:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=iTasM8a15QRKORcEHdjoxRXCr5qGdouEQR9bBcZs2lI=; b=DvtvG3jZlGb+teoizahj4UY+FkwPtQNNudz+ot6Wl1K6RTdkcp9QrannOkcKxOvUpc vCjKdO8fYKXnYLLFtk8ikqYFVEPVMnVf6fDg60EwU4t2lUSuQWKX+MXZ4opv+yRnkiv5 3K2ME2ZCt+uW+skKe6uQkB+xOAi6/E6YDQOVE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=iTasM8a15QRKORcEHdjoxRXCr5qGdouEQR9bBcZs2lI=; b=EDAWtayLDHmDQ1DuWBXaMjQP1MlHDbwcYiX0WZ4rAmx1v/NkCSDFP8RWKmQWiB6tpt 5SjgC3FrBVgcrmVgjzdMqnVTTnyC2FQhSOThlU9iqNMuAtN4iBkrhv16EzzpKJMT6Omd Taf+/O5e62SLGTfU7HQ/Fkim6QS/76rKoMazIaWc//jYL6hSpP94bw/2TlCO58Atn4Hl 4ZuB1BBuqW3Jjlh2Lc7AibYsc62Azj22/eDdJzbKcECKVqcu3fnqXrko/O/hEerZNDAt ercLc80M+Clin9doMU6z6OuXi5CRwOzjRyZNYaHZL/hWgErWNY5+pwPIgjCoVVKzbkAF NB/A== X-Gm-Message-State: AMke39kldTQyKn/3VZc0RNv2XQ/PALpZYujvgs0MhTwXg8HIV2QGlLSosJmArX1jdBbPc76Q X-Received: by 10.28.197.142 with SMTP id v136mr2462044wmf.62.1487066654039; Tue, 14 Feb 2017 02:04:14 -0800 (PST) Received: from localhost.localdomain ([196.80.229.213]) by smtp.gmail.com with ESMTPSA id 8sm3076455wmg.1.2017.02.14.02.04.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Feb 2017 02:04:13 -0800 (PST) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au Cc: Ard Biesheuvel Subject: [PATCH 1/2] crypto: arm/aes-neonbs - resolve fallback cipher at runtime Date: Tue, 14 Feb 2017 10:03:59 +0000 Message-Id: <1487066640-17886-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Currently, the bit sliced NEON AES code for ARM has a link time dependency on the scalar ARM asm implementation, which it uses as a fallback to perform CBC encryption and the encryption of the initial XTS tweak. The bit sliced NEON code is both fast and time invariant, which makes it a reasonable default on hardware that supports it. However, the ARM asm code it pulls in is not time invariant, and due to the way it is linked in, cannot be overridden by the new generic time invariant driver. In fact, it will not be used at all, given that the ARM asm code registers itself as a cipher with a priority that exceeds the priority of the fixed time cipher. So remove the link time dependency, and allocate the fallback cipher via the crypto API. Note that this requires this driver's module_init call to be replaced with late_initcall, so that the (possibly generic) fallback cipher is guaranteed to be available when the builtin test is performed at registration time. Signed-off-by: Ard Biesheuvel --- arch/arm/crypto/Kconfig | 2 +- arch/arm/crypto/aes-neonbs-glue.c | 65 ++++++++++++++++++++++++++++++--------- 2 files changed, 51 insertions(+), 16 deletions(-) -- 2.7.4 diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig index a8fce93137fb..b9adedcc5b2e 100644 --- a/arch/arm/crypto/Kconfig +++ b/arch/arm/crypto/Kconfig @@ -73,7 +73,7 @@ config CRYPTO_AES_ARM_BS depends on KERNEL_MODE_NEON select CRYPTO_BLKCIPHER select CRYPTO_SIMD - select CRYPTO_AES_ARM + select CRYPTO_AES help Use a faster and more secure NEON based implementation of AES in CBC, CTR and XTS modes diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c index 2920b96dbd36..6a2a30b9e4f5 100644 --- a/arch/arm/crypto/aes-neonbs-glue.c +++ b/arch/arm/crypto/aes-neonbs-glue.c @@ -42,9 +42,6 @@ asmlinkage void aesbs_xts_encrypt(u8 out[], u8 const in[], u8 const rk[], asmlinkage void aesbs_xts_decrypt(u8 out[], u8 const in[], u8 const rk[], int rounds, int blocks, u8 iv[]); -asmlinkage void __aes_arm_encrypt(const u32 rk[], int rounds, const u8 in[], - u8 out[]); - struct aesbs_ctx { int rounds; u8 rk[13 * (8 * AES_BLOCK_SIZE) + 32] __aligned(AES_BLOCK_SIZE); @@ -52,12 +49,12 @@ struct aesbs_ctx { struct aesbs_cbc_ctx { struct aesbs_ctx key; - u32 enc[AES_MAX_KEYLENGTH_U32]; + struct crypto_cipher *enc_tfm; }; struct aesbs_xts_ctx { struct aesbs_ctx key; - u32 twkey[AES_MAX_KEYLENGTH_U32]; + struct crypto_cipher *tweak_tfm; }; static int aesbs_setkey(struct crypto_skcipher *tfm, const u8 *in_key, @@ -132,20 +129,18 @@ static int aesbs_cbc_setkey(struct crypto_skcipher *tfm, const u8 *in_key, ctx->key.rounds = 6 + key_len / 4; - memcpy(ctx->enc, rk.key_enc, sizeof(ctx->enc)); - kernel_neon_begin(); aesbs_convert_key(ctx->key.rk, rk.key_enc, ctx->key.rounds); kernel_neon_end(); - return 0; + return crypto_cipher_setkey(ctx->enc_tfm, in_key, key_len); } static void cbc_encrypt_one(struct crypto_skcipher *tfm, const u8 *src, u8 *dst) { struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm); - __aes_arm_encrypt(ctx->enc, ctx->key.rounds, src, dst); + crypto_cipher_encrypt_one(ctx->enc_tfm, dst, src); } static int cbc_encrypt(struct skcipher_request *req) @@ -181,6 +176,23 @@ static int cbc_decrypt(struct skcipher_request *req) return err; } +static int cbc_init(struct crypto_tfm *tfm) +{ + struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm); + + ctx->enc_tfm = crypto_alloc_cipher("aes", 0, 0); + if (IS_ERR(ctx->enc_tfm)) + return PTR_ERR(ctx->enc_tfm); + return 0; +} + +static void cbc_exit(struct crypto_tfm *tfm) +{ + struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm); + + crypto_free_cipher(ctx->enc_tfm); +} + static int ctr_encrypt(struct skcipher_request *req) { struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req); @@ -228,7 +240,6 @@ static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key, unsigned int key_len) { struct aesbs_xts_ctx *ctx = crypto_skcipher_ctx(tfm); - struct crypto_aes_ctx rk; int err; err = xts_verify_key(tfm, in_key, key_len); @@ -236,13 +247,33 @@ static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key, return err; key_len /= 2; - err = crypto_aes_expand_key(&rk, in_key + key_len, key_len); + err = crypto_cipher_setkey(ctx->tweak_tfm, in_key + key_len, key_len); if (err) return err; - memcpy(ctx->twkey, rk.key_enc, sizeof(ctx->twkey)); + err = aesbs_setkey(tfm, in_key, key_len); + if (err) + return err; + + return 0; + +} + +static int xts_init(struct crypto_tfm *tfm) +{ + struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm); + + ctx->tweak_tfm = crypto_alloc_cipher("aes", 0, 0); + if (IS_ERR(ctx->tweak_tfm)) + return PTR_ERR(ctx->tweak_tfm); + return 0; +} + +static void xts_exit(struct crypto_tfm *tfm) +{ + struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm); - return aesbs_setkey(tfm, in_key, key_len); + crypto_free_cipher(ctx->tweak_tfm); } static int __xts_crypt(struct skcipher_request *req, @@ -256,7 +287,7 @@ static int __xts_crypt(struct skcipher_request *req, err = skcipher_walk_virt(&walk, req, true); - __aes_arm_encrypt(ctx->twkey, ctx->key.rounds, walk.iv, walk.iv); + crypto_cipher_encrypt_one(ctx->tweak_tfm, walk.iv, walk.iv); kernel_neon_begin(); while (walk.nbytes >= AES_BLOCK_SIZE) { @@ -309,6 +340,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_ctxsize = sizeof(struct aesbs_cbc_ctx), .base.cra_module = THIS_MODULE, .base.cra_flags = CRYPTO_ALG_INTERNAL, + .base.cra_init = cbc_init, + .base.cra_exit = cbc_exit, .min_keysize = AES_MIN_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE, @@ -342,6 +375,8 @@ static struct skcipher_alg aes_algs[] = { { .base.cra_ctxsize = sizeof(struct aesbs_xts_ctx), .base.cra_module = THIS_MODULE, .base.cra_flags = CRYPTO_ALG_INTERNAL, + .base.cra_init = xts_init, + .base.cra_exit = xts_exit, .min_keysize = 2 * AES_MIN_KEY_SIZE, .max_keysize = 2 * AES_MAX_KEY_SIZE, @@ -402,5 +437,5 @@ static int __init aes_init(void) return err; } -module_init(aes_init); +late_initcall(aes_init); module_exit(aes_exit); From patchwork Tue Feb 14 10:04:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 93940 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1486087qgi; Tue, 14 Feb 2017 02:05:34 -0800 (PST) X-Received: by 10.99.219.21 with SMTP id e21mr31996716pgg.29.1487066733956; Tue, 14 Feb 2017 02:05:33 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 3si76911pli.45.2017.02.14.02.05.33; Tue, 14 Feb 2017 02:05:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753578AbdBNKEi (ORCPT + 1 other); Tue, 14 Feb 2017 05:04:38 -0500 Received: from mail-wr0-f173.google.com ([209.85.128.173]:36006 "EHLO mail-wr0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752521AbdBNKEV (ORCPT ); Tue, 14 Feb 2017 05:04:21 -0500 Received: by mail-wr0-f173.google.com with SMTP id k90so165940514wrc.3 for ; Tue, 14 Feb 2017 02:04:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=an7WRMDe0ANCSBb2gXxvipZ+ESiG1yJmPJB5d3wuVUY=; b=ERUT+AGxttMNP2IARRzj3qJyuP/yEdWA7erVQTmVpN0z65OEV3RMt8kI8yUiMCoBeo 8Au8NtFYDWcS2q/E8w+qJhJM6V+L8F2OsriC5oPYEaelltDyaW2F4xBOKJ2ts3hQL/fJ 7UnPKc9FIasBb2NQjURaegYlUiKc97xSOJ1ww= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=an7WRMDe0ANCSBb2gXxvipZ+ESiG1yJmPJB5d3wuVUY=; b=eHFRAzqfENGXu3qgsybVHddBBWwYeJ2IItHzO3Ic1Eq5il4urjUlf6KMcv/HGvY0UP ax9pxFd3KKNo4l7WO8PAY7w5qUxfuA+U9XB7UyjNm/TeTSJfM2cXqUim+zkKaoWrrp+o ToiImY1rCBCPGPkbLhXCJm/yqQD+cHDCjxSINDAc+gueYqtEjSTLfG7ytmjv75dWmRCU mxqdEM3Y4zM6lGEPFM3/fq8phMPWVfPxNDlIt+ioR98jiNlicFhMZ5fOn4GnXA6keO8L M6gQ7XE/1np9av6TDROvJJ2WnoCkss6ScO5tRvFjLyHEgRUMOfzoLQbhl0kCNzOEg44x w/lw== X-Gm-Message-State: AMke39kxz9QBJNIJfVm1V4mgc+iMzE7VVLrItwAxzf3aPmfeX+BnZ++6miAluQ0wafUXHEeU X-Received: by 10.223.135.69 with SMTP id 5mr25617663wrz.174.1487066659526; Tue, 14 Feb 2017 02:04:19 -0800 (PST) Received: from localhost.localdomain ([196.80.229.213]) by smtp.gmail.com with ESMTPSA id 8sm3076455wmg.1.2017.02.14.02.04.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Feb 2017 02:04:18 -0800 (PST) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au Cc: Ard Biesheuvel , "Jason A . Donenfeld" Subject: [PATCH 2/2] crypto: algapi - annotate expected branch behavior in crypto_inc() Date: Tue, 14 Feb 2017 10:04:00 +0000 Message-Id: <1487066640-17886-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487066640-17886-1-git-send-email-ard.biesheuvel@linaro.org> References: <1487066640-17886-1-git-send-email-ard.biesheuvel@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org To prevent unnecessary branching, mark the exit condition of the primary loop as likely(), given that a carry in a 32-bit counter occurs very rarely. On arm64, the resulting code is emitted by GCC as 9a8: cmp w1, #0x3 9ac: add x3, x0, w1, uxtw 9b0: b.ls 9e0 9b4: ldr w2, [x3,#-4]! 9b8: rev w2, w2 9bc: add w2, w2, #0x1 9c0: rev w4, w2 9c4: str w4, [x3] 9c8: cbz w2, 9d0 9cc: ret where the two remaining branch conditions (one for size < 4 and one for the carry) are statically predicted as non-taken, resulting in optimal execution in the vast majority of cases. Also, replace the open coded alignment test with IS_ALIGNED(). Cc: Jason A. Donenfeld Signed-off-by: Ard Biesheuvel --- crypto/algapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/crypto/algapi.c b/crypto/algapi.c index 6b52e8f0b95f..9eed4ef9c971 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -963,11 +963,11 @@ void crypto_inc(u8 *a, unsigned int size) u32 c; if (IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) || - !((unsigned long)b & (__alignof__(*b) - 1))) + IS_ALIGNED((unsigned long)b, __alignof__(*b))) for (; size >= 4; size -= 4) { c = be32_to_cpu(*--b) + 1; *b = cpu_to_be32(c); - if (c) + if (likely(c)) return; }