In preparation of duplicating the sync ctr(aes) functionality to modules
under arch/arm, move the helper function from a inline .h file to the
AES library, which is already depended upon by the drivers that use this
fallback.

Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
 arch/arm64/crypto/aes-ctr-fallback.h | 53 --------------------
 arch/arm64/crypto/aes-glue.c         | 17 ++++---
 arch/arm64/crypto/aes-neonbs-glue.c  | 12 +++--
 crypto/Kconfig                       |  1 +
 include/crypto/aes.h                 | 11 ++++
 lib/crypto/aes.c                     | 41 +++++++++++++++
 6 files changed, 72 insertions(+), 63 deletions(-)

diff --git a/arch/arm64/crypto/aes-ctr-fallback.h 
b/arch/arm64/crypto/aes-ctr-fallback.h
deleted file mode 100644
index c9285717b6b5..000000000000
--- a/arch/arm64/crypto/aes-ctr-fallback.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Fallback for sync aes(ctr) in contexts where kernel mode NEON
- * is not allowed
- *
- * Copyright (C) 2017 Linaro Ltd <ard.biesheu...@linaro.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <crypto/aes.h>
-#include <crypto/internal/skcipher.h>
-
-asmlinkage void __aes_arm64_encrypt(u32 *rk, u8 *out, const u8 *in, int 
rounds);
-
-static inline int aes_ctr_encrypt_fallback(struct crypto_aes_ctx *ctx,
-                                          struct skcipher_request *req)
-{
-       struct skcipher_walk walk;
-       u8 buf[AES_BLOCK_SIZE];
-       int err;
-
-       err = skcipher_walk_virt(&walk, req, true);
-
-       while (walk.nbytes > 0) {
-               u8 *dst = walk.dst.virt.addr;
-               u8 *src = walk.src.virt.addr;
-               int nbytes = walk.nbytes;
-               int tail = 0;
-
-               if (nbytes < walk.total) {
-                       nbytes = round_down(nbytes, AES_BLOCK_SIZE);
-                       tail = walk.nbytes % AES_BLOCK_SIZE;
-               }
-
-               do {
-                       int bsize = min(nbytes, AES_BLOCK_SIZE);
-
-                       __aes_arm64_encrypt(ctx->key_enc, buf, walk.iv,
-                                           6 + ctx->key_length / 4);
-                       crypto_xor_cpy(dst, src, buf, bsize);
-                       crypto_inc(walk.iv, AES_BLOCK_SIZE);
-
-                       dst += AES_BLOCK_SIZE;
-                       src += AES_BLOCK_SIZE;
-                       nbytes -= AES_BLOCK_SIZE;
-               } while (nbytes > 0);
-
-               err = skcipher_walk_done(&walk, tail);
-       }
-       return err;
-}
diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c
index 8fa17a764802..3d9cedbb91c9 100644
--- a/arch/arm64/crypto/aes-glue.c
+++ b/arch/arm64/crypto/aes-glue.c
@@ -21,7 +21,6 @@
 #include <crypto/xts.h>
 
 #include "aes-ce-setkey.h"
-#include "aes-ctr-fallback.h"
 
 #ifdef USE_V8_CRYPTO_EXTENSIONS
 #define MODE                   "ce"
@@ -409,8 +408,15 @@ static int ctr_encrypt_sync(struct skcipher_request *req)
        struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
        struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm);
 
-       if (!crypto_simd_usable())
-               return aes_ctr_encrypt_fallback(ctx, req);
+       if (!crypto_simd_usable()) {
+               struct skcipher_walk walk;
+               int err;
+
+               err = skcipher_walk_virt(&walk, req, true);
+               if (err)
+                       return err;
+               return skcipher_encrypt_aes_ctr(&walk, ctx);
+       }
 
        return ctr_encrypt(req);
 }
@@ -653,15 +659,14 @@ static void mac_do_update(struct crypto_aes_ctx *ctx, u8 
const in[], int blocks,
                kernel_neon_end();
        } else {
                if (enc_before)
-                       __aes_arm64_encrypt(ctx->key_enc, dg, dg, rounds);
+                       aes_encrypt(ctx, dg, dg);
 
                while (blocks--) {
                        crypto_xor(dg, in, AES_BLOCK_SIZE);
                        in += AES_BLOCK_SIZE;
 
                        if (blocks || enc_after)
-                               __aes_arm64_encrypt(ctx->key_enc, dg, dg,
-                                                   rounds);
+                               aes_encrypt(ctx, dg, dg);
                }
        }
 }
diff --git a/arch/arm64/crypto/aes-neonbs-glue.c 
b/arch/arm64/crypto/aes-neonbs-glue.c
index cb8d90f795a0..02d46e97c1e1 100644
--- a/arch/arm64/crypto/aes-neonbs-glue.c
+++ b/arch/arm64/crypto/aes-neonbs-glue.c
@@ -16,8 +16,6 @@
 #include <crypto/xts.h>
 #include <linux/module.h>
 
-#include "aes-ctr-fallback.h"
-
 MODULE_AUTHOR("Ard Biesheuvel <ard.biesheu...@linaro.org>");
 MODULE_LICENSE("GPL v2");
 
@@ -288,9 +286,15 @@ static int ctr_encrypt_sync(struct skcipher_request *req)
        struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
        struct aesbs_ctr_ctx *ctx = crypto_skcipher_ctx(tfm);
 
-       if (!crypto_simd_usable())
-               return aes_ctr_encrypt_fallback(&ctx->fallback, req);
+       if (!crypto_simd_usable()) {
+               struct skcipher_walk walk;
+               int err;
 
+               err = skcipher_walk_virt(&walk, req, true);
+               if (err)
+                       return err;
+               return skcipher_encrypt_aes_ctr(&walk, &ctx->fallback);
+       }
        return ctr_encrypt(req);
 }
 
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 3b08230fe3ba..efeb307c0594 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1061,6 +1061,7 @@ comment "Ciphers"
 
 config CRYPTO_LIB_AES
        tristate
+       select CRYPTO_ALGAPI
 
 config CRYPTO_AES
        tristate "AES cipher algorithms"
diff --git a/include/crypto/aes.h b/include/crypto/aes.h
index 31ba40d803df..f67c38500746 100644
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
@@ -8,6 +8,8 @@
 
 #include <linux/types.h>
 #include <linux/crypto.h>
+#include <crypto/algapi.h>
+#include <crypto/internal/skcipher.h>
 
 #define AES_MIN_KEY_SIZE       16
 #define AES_MAX_KEY_SIZE       32
@@ -69,4 +71,13 @@ void aes_encrypt(const struct crypto_aes_ctx *ctx, u8 *out, 
const u8 *in);
  */
 void aes_decrypt(const struct crypto_aes_ctx *ctx, u8 *out, const u8 *in);
 
+/**
+ * skcipher_encrypt_aes_ctr - Process a aes(ctr) skcipher encryption request
+ *                            using the generic AES implementation.
+ * @walk: the skcipher walk data structure that describes the data to operate 
on
+ * @ctx: the AES key schedule
+ */
+int skcipher_encrypt_aes_ctr(struct skcipher_walk *walk,
+                            const struct crypto_aes_ctx *ctx);
+
 #endif
diff --git a/lib/crypto/aes.c b/lib/crypto/aes.c
index 57596148b010..f5ef29eaa714 100644
--- a/lib/crypto/aes.c
+++ b/lib/crypto/aes.c
@@ -363,6 +363,47 @@ void aes_decrypt(const struct crypto_aes_ctx *ctx, u8 
*out, const u8 *in)
 }
 EXPORT_SYMBOL(aes_decrypt);
 
+/**
+ * skcipher_encrypt_aes_ctr - Process a aes(ctr) skcipher encryption request
+ *                            using the generic AES implementation.
+ * @walk: the skcipher walk data structure that describes the data to operate 
on
+ * @ctx: the AES key schedule
+ */
+int skcipher_encrypt_aes_ctr(struct skcipher_walk *walk,
+                            const struct crypto_aes_ctx *ctx)
+{
+       u8 buf[AES_BLOCK_SIZE];
+       int err = 0;
+
+       while (walk->nbytes > 0) {
+               u8 *dst = walk->dst.virt.addr;
+               u8 *src = walk->src.virt.addr;
+               int nbytes = walk->nbytes;
+               int tail = 0;
+
+               if (nbytes < walk->total) {
+                       nbytes = round_down(nbytes, AES_BLOCK_SIZE);
+                       tail = walk->nbytes % AES_BLOCK_SIZE;
+               }
+
+               do {
+                       int bsize = min(nbytes, AES_BLOCK_SIZE);
+
+                       aes_encrypt(ctx, buf, walk->iv);
+                       crypto_xor_cpy(dst, src, buf, bsize);
+                       crypto_inc(walk->iv, AES_BLOCK_SIZE);
+
+                       dst += AES_BLOCK_SIZE;
+                       src += AES_BLOCK_SIZE;
+                       nbytes -= AES_BLOCK_SIZE;
+               } while (nbytes > 0);
+
+               err = skcipher_walk_done(walk, tail);
+       }
+       return err;
+}
+EXPORT_SYMBOL(skcipher_encrypt_aes_ctr);
+
 MODULE_DESCRIPTION("Generic AES library");
 MODULE_AUTHOR("Ard Biesheuvel <ard.biesheu...@linaro.org>");
 MODULE_LICENSE("GPL v2");
-- 
2.20.1

Reply via email to