Skip to content

L
linux
Commit 2621a869 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files
Options

crypto: vmx - convert to skcipher API 

Convert the VMX implementations of AES-CBC, AES-CTR, and AES-XTS from
the deprecated "blkcipher" API to the "skcipher" API.

As part of this, I moved the skcipher_request for the fallback algorithm
off the stack and into the request context of the parent algorithm.

I tested this in a PowerPC VM with CONFIG_CRYPTO_MANAGER_EXTRA_TESTS=y.
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Tested-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 1fa0a7dc
Show whitespace changes
Inline Side-by-side
Showing with 252 additions and 345 deletions
drivers/crypto/vmx/aes_cbc.c
View file @ 2621a869
...@@ -7,64 +7,52 @@ ...@@ -7,64 +7,52 @@
* Author: Marcelo Henrique Cerri <mhcerri@br.ibm.com> * Author: Marcelo Henrique Cerri <mhcerri@br.ibm.com>
*/ */
#include <linux/types.h>
#include <linux/err.h>
#include <linux/crypto.h>
#include <linux/delay.h>
#include <asm/simd.h> #include <asm/simd.h>
#include <asm/switch_to.h> #include <asm/switch_to.h>
#include <crypto/aes.h> #include <crypto/aes.h>
#include <crypto/internal/simd.h> #include <crypto/internal/simd.h>
#include <crypto/scatterwalk.h> #include <crypto/internal/skcipher.h>
#include <crypto/skcipher.h>
#include "aesp8-ppc.h" #include "aesp8-ppc.h"
struct p8_aes_cbc_ctx { struct p8_aes_cbc_ctx {
struct crypto_sync_skcipher *fallback; struct crypto_skcipher *fallback;
struct aes_key enc_key; struct aes_key enc_key;
struct aes_key dec_key; struct aes_key dec_key;
}; };
static int p8_aes_cbc_init(struct crypto_tfm *tfm) static int p8_aes_cbc_init(struct crypto_skcipher *tfm)
{ {
const char *alg = crypto_tfm_alg_name(tfm); struct p8_aes_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);
struct crypto_sync_skcipher *fallback; struct crypto_skcipher *fallback;
struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
fallback = crypto_alloc_sync_skcipher(alg, 0,
CRYPTO_ALG_NEED_FALLBACK);
fallback = crypto_alloc_skcipher("cbc(aes)", 0,
CRYPTO_ALG_NEED_FALLBACK |
CRYPTO_ALG_ASYNC);
if (IS_ERR(fallback)) { if (IS_ERR(fallback)) {
printk(KERN_ERR pr_err("Failed to allocate cbc(aes) fallback: %ld\n",
"Failed to allocate transformation for '%s': %ld\n", PTR_ERR(fallback));
alg, PTR_ERR(fallback));
return PTR_ERR(fallback); return PTR_ERR(fallback);
} }
crypto_sync_skcipher_set_flags( crypto_skcipher_set_reqsize(tfm, sizeof(struct skcipher_request) +
fallback, crypto_skcipher_reqsize(fallback));
crypto_skcipher_get_flags((struct crypto_skcipher *)tfm));
ctx->fallback = fallback; ctx->fallback = fallback;
return 0; return 0;
} }
static void p8_aes_cbc_exit(struct crypto_tfm *tfm) static void p8_aes_cbc_exit(struct crypto_skcipher *tfm)
{ {
struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(tfm); struct p8_aes_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);
if (ctx->fallback) { crypto_free_skcipher(ctx->fallback);
crypto_free_sync_skcipher(ctx->fallback);
ctx->fallback = NULL;
}
} }
static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key, static int p8_aes_cbc_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keylen) unsigned int keylen)
{ {
struct p8_aes_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);
int ret; int ret;
struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
preempt_disable(); preempt_disable();
pagefault_disable(); pagefault_disable();
...@@ -75,108 +63,71 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key, ...@@ -75,108 +63,71 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key,
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
ret |= crypto_sync_skcipher_setkey(ctx->fallback, key, keylen); ret |= crypto_skcipher_setkey(ctx->fallback, key, keylen);
return ret ? -EINVAL : 0; return ret ? -EINVAL : 0;
} }
static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc, static int p8_aes_cbc_crypt(struct skcipher_request *req, int enc)
struct scatterlist *dst,
struct scatterlist *src, unsigned int nbytes)
{ {
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
const struct p8_aes_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);
struct skcipher_walk walk;
unsigned int nbytes;
int ret; int ret;
struct blkcipher_walk walk;
struct p8_aes_cbc_ctx *ctx =
crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm));
if (!crypto_simd_usable()) { if (!crypto_simd_usable()) {
SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback); struct skcipher_request *subreq = skcipher_request_ctx(req);
skcipher_request_set_sync_tfm(req, ctx->fallback);
skcipher_request_set_callback(req, desc->flags, NULL, NULL);
skcipher_request_set_crypt(req, src, dst, nbytes, desc->info);
ret = crypto_skcipher_encrypt(req);
skcipher_request_zero(req);
} else {
blkcipher_walk_init(&walk, dst, src, nbytes);
ret = blkcipher_walk_virt(desc, &walk);
while ((nbytes = walk.nbytes)) {
preempt_disable();
pagefault_disable();
enable_kernel_vsx();
aes_p8_cbc_encrypt(walk.src.virt.addr,
walk.dst.virt.addr,
nbytes & AES_BLOCK_MASK,
&ctx->enc_key, walk.iv, 1);
disable_kernel_vsx();
pagefault_enable();
preempt_enable();
nbytes &= AES_BLOCK_SIZE - 1; *subreq = *req;
ret = blkcipher_walk_done(desc, &walk, nbytes); skcipher_request_set_tfm(subreq, ctx->fallback);
} return enc ? crypto_skcipher_encrypt(subreq) :
crypto_skcipher_decrypt(subreq);
} }
return ret; ret = skcipher_walk_virt(&walk, req, false);
} while ((nbytes = walk.nbytes) != 0) {
static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc,
struct scatterlist *dst,
struct scatterlist *src, unsigned int nbytes)
{
int ret;
struct blkcipher_walk walk;
struct p8_aes_cbc_ctx *ctx =
crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm));
if (!crypto_simd_usable()) {
SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback);
skcipher_request_set_sync_tfm(req, ctx->fallback);
skcipher_request_set_callback(req, desc->flags, NULL, NULL);
skcipher_request_set_crypt(req, src, dst, nbytes, desc->info);
ret = crypto_skcipher_decrypt(req);
skcipher_request_zero(req);
} else {
blkcipher_walk_init(&walk, dst, src, nbytes);
ret = blkcipher_walk_virt(desc, &walk);
while ((nbytes = walk.nbytes)) {
preempt_disable(); preempt_disable();
pagefault_disable(); pagefault_disable();
enable_kernel_vsx(); enable_kernel_vsx();
aes_p8_cbc_encrypt(walk.src.virt.addr, aes_p8_cbc_encrypt(walk.src.virt.addr,
walk.dst.virt.addr, walk.dst.virt.addr,
nbytes & AES_BLOCK_MASK, round_down(nbytes, AES_BLOCK_SIZE),
&ctx->dec_key, walk.iv, 0); enc ? &ctx->enc_key : &ctx->dec_key,
walk.iv, enc);
disable_kernel_vsx(); disable_kernel_vsx();
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
nbytes &= AES_BLOCK_SIZE - 1; ret = skcipher_walk_done(&walk, nbytes % AES_BLOCK_SIZE);
ret = blkcipher_walk_done(desc, &walk, nbytes);
}
} }
return ret; return ret;
} }
static int p8_aes_cbc_encrypt(struct skcipher_request *req)
{
return p8_aes_cbc_crypt(req, 1);
}
struct crypto_alg p8_aes_cbc_alg = { static int p8_aes_cbc_decrypt(struct skcipher_request *req)
.cra_name = "cbc(aes)", {
.cra_driver_name = "p8_aes_cbc", return p8_aes_cbc_crypt(req, 0);
.cra_module = THIS_MODULE, }
.cra_priority = 2000,
.cra_type = &crypto_blkcipher_type, struct skcipher_alg p8_aes_cbc_alg = {
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK, .base.cra_name = "cbc(aes)",
.cra_alignmask = 0, .base.cra_driver_name = "p8_aes_cbc",
.cra_blocksize = AES_BLOCK_SIZE, .base.cra_module = THIS_MODULE,
.cra_ctxsize = sizeof(struct p8_aes_cbc_ctx), .base.cra_priority = 2000,
.cra_init = p8_aes_cbc_init, .base.cra_flags = CRYPTO_ALG_NEED_FALLBACK,
.cra_exit = p8_aes_cbc_exit, .base.cra_blocksize = AES_BLOCK_SIZE,
.cra_blkcipher = { .base.cra_ctxsize = sizeof(struct p8_aes_cbc_ctx),
.ivsize = AES_BLOCK_SIZE,
.min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE,
.setkey = p8_aes_cbc_setkey, .setkey = p8_aes_cbc_setkey,
.encrypt = p8_aes_cbc_encrypt, .encrypt = p8_aes_cbc_encrypt,
.decrypt = p8_aes_cbc_decrypt, .decrypt = p8_aes_cbc_decrypt,
}, .init = p8_aes_cbc_init,
.exit = p8_aes_cbc_exit,
.min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE,
}; };
drivers/crypto/vmx/aes_ctr.c
View file @ 2621a869
...@@ -7,62 +7,51 @@ ...@@ -7,62 +7,51 @@
* Author: Marcelo Henrique Cerri <mhcerri@br.ibm.com> * Author: Marcelo Henrique Cerri <mhcerri@br.ibm.com>
*/ */
#include <linux/types.h>
#include <linux/err.h>
#include <linux/crypto.h>
#include <linux/delay.h>
#include <asm/simd.h> #include <asm/simd.h>
#include <asm/switch_to.h> #include <asm/switch_to.h>
#include <crypto/aes.h> #include <crypto/aes.h>
#include <crypto/internal/simd.h> #include <crypto/internal/simd.h>
#include <crypto/scatterwalk.h> #include <crypto/internal/skcipher.h>
#include <crypto/skcipher.h>
#include "aesp8-ppc.h" #include "aesp8-ppc.h"
struct p8_aes_ctr_ctx { struct p8_aes_ctr_ctx {
struct crypto_sync_skcipher *fallback; struct crypto_skcipher *fallback;
struct aes_key enc_key; struct aes_key enc_key;
}; };
static int p8_aes_ctr_init(struct crypto_tfm *tfm) static int p8_aes_ctr_init(struct crypto_skcipher *tfm)
{ {
const char *alg = crypto_tfm_alg_name(tfm); struct p8_aes_ctr_ctx *ctx = crypto_skcipher_ctx(tfm);
struct crypto_sync_skcipher *fallback; struct crypto_skcipher *fallback;
struct p8_aes_ctr_ctx *ctx = crypto_tfm_ctx(tfm);
fallback = crypto_alloc_sync_skcipher(alg, 0, fallback = crypto_alloc_skcipher("ctr(aes)", 0,
CRYPTO_ALG_NEED_FALLBACK); CRYPTO_ALG_NEED_FALLBACK |
CRYPTO_ALG_ASYNC);
if (IS_ERR(fallback)) { if (IS_ERR(fallback)) {
printk(KERN_ERR pr_err("Failed to allocate ctr(aes) fallback: %ld\n",
"Failed to allocate transformation for '%s': %ld\n", PTR_ERR(fallback));
alg, PTR_ERR(fallback));
return PTR_ERR(fallback); return PTR_ERR(fallback);
} }
crypto_sync_skcipher_set_flags( crypto_skcipher_set_reqsize(tfm, sizeof(struct skcipher_request) +
fallback, crypto_skcipher_reqsize(fallback));
crypto_skcipher_get_flags((struct crypto_skcipher *)tfm));
ctx->fallback = fallback; ctx->fallback = fallback;
return 0; return 0;
} }
static void p8_aes_ctr_exit(struct crypto_tfm *tfm) static void p8_aes_ctr_exit(struct crypto_skcipher *tfm)
{ {
struct p8_aes_ctr_ctx *ctx = crypto_tfm_ctx(tfm); struct p8_aes_ctr_ctx *ctx = crypto_skcipher_ctx(tfm);
if (ctx->fallback) { crypto_free_skcipher(ctx->fallback);
crypto_free_sync_skcipher(ctx->fallback);
ctx->fallback = NULL;
}
} }
static int p8_aes_ctr_setkey(struct crypto_tfm *tfm, const u8 *key, static int p8_aes_ctr_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keylen) unsigned int keylen)
{ {
struct p8_aes_ctr_ctx *ctx = crypto_skcipher_ctx(tfm);
int ret; int ret;
struct p8_aes_ctr_ctx *ctx = crypto_tfm_ctx(tfm);
preempt_disable(); preempt_disable();
pagefault_disable(); pagefault_disable();
...@@ -72,13 +61,13 @@ static int p8_aes_ctr_setkey(struct crypto_tfm *tfm, const u8 *key, ...@@ -72,13 +61,13 @@ static int p8_aes_ctr_setkey(struct crypto_tfm *tfm, const u8 *key,
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
ret |= crypto_sync_skcipher_setkey(ctx->fallback, key, keylen); ret |= crypto_skcipher_setkey(ctx->fallback, key, keylen);
return ret ? -EINVAL : 0; return ret ? -EINVAL : 0;
} }
static void p8_aes_ctr_final(struct p8_aes_ctr_ctx *ctx, static void p8_aes_ctr_final(const struct p8_aes_ctr_ctx *ctx,
struct blkcipher_walk *walk) struct skcipher_walk *walk)
{ {
u8 *ctrblk = walk->iv; u8 *ctrblk = walk->iv;
u8 keystream[AES_BLOCK_SIZE]; u8 keystream[AES_BLOCK_SIZE];
...@@ -98,77 +87,63 @@ static void p8_aes_ctr_final(struct p8_aes_ctr_ctx *ctx, ...@@ -98,77 +87,63 @@ static void p8_aes_ctr_final(struct p8_aes_ctr_ctx *ctx,
crypto_inc(ctrblk, AES_BLOCK_SIZE); crypto_inc(ctrblk, AES_BLOCK_SIZE);
} }
static int p8_aes_ctr_crypt(struct blkcipher_desc *desc, static int p8_aes_ctr_crypt(struct skcipher_request *req)
struct scatterlist *dst,
struct scatterlist *src, unsigned int nbytes)
{ {
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
const struct p8_aes_ctr_ctx *ctx = crypto_skcipher_ctx(tfm);
struct skcipher_walk walk;
unsigned int nbytes;
int ret; int ret;
u64 inc;
struct blkcipher_walk walk;
struct p8_aes_ctr_ctx *ctx =
crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm));
if (!crypto_simd_usable()) { if (!crypto_simd_usable()) {
SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback); struct skcipher_request *subreq = skcipher_request_ctx(req);
skcipher_request_set_sync_tfm(req, ctx->fallback);
skcipher_request_set_callback(req, desc->flags, NULL, NULL); *subreq = *req;
skcipher_request_set_crypt(req, src, dst, nbytes, desc->info); skcipher_request_set_tfm(subreq, ctx->fallback);
ret = crypto_skcipher_encrypt(req); return crypto_skcipher_encrypt(subreq);
skcipher_request_zero(req); }
} else {
blkcipher_walk_init(&walk, dst, src, nbytes); ret = skcipher_walk_virt(&walk, req, false);
ret = blkcipher_walk_virt_block(desc, &walk, AES_BLOCK_SIZE);
while ((nbytes = walk.nbytes) >= AES_BLOCK_SIZE) { while ((nbytes = walk.nbytes) >= AES_BLOCK_SIZE) {
preempt_disable(); preempt_disable();
pagefault_disable(); pagefault_disable();
enable_kernel_vsx(); enable_kernel_vsx();
aes_p8_ctr32_encrypt_blocks(walk.src.virt.addr, aes_p8_ctr32_encrypt_blocks(walk.src.virt.addr,
walk.dst.virt.addr, walk.dst.virt.addr,
(nbytes & nbytes / AES_BLOCK_SIZE,
AES_BLOCK_MASK) / &ctx->enc_key, walk.iv);
AES_BLOCK_SIZE,
&ctx->enc_key,
walk.iv);
disable_kernel_vsx(); disable_kernel_vsx();
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
/* We need to update IV mostly for last bytes/round */ do {
inc = (nbytes & AES_BLOCK_MASK) / AES_BLOCK_SIZE;
if (inc > 0)
while (inc--)
crypto_inc(walk.iv, AES_BLOCK_SIZE); crypto_inc(walk.iv, AES_BLOCK_SIZE);
} while ((nbytes -= AES_BLOCK_SIZE) >= AES_BLOCK_SIZE);
nbytes &= AES_BLOCK_SIZE - 1; ret = skcipher_walk_done(&walk, nbytes);
ret = blkcipher_walk_done(desc, &walk, nbytes);
} }
if (walk.nbytes) { if (nbytes) {
p8_aes_ctr_final(ctx, &walk); p8_aes_ctr_final(ctx, &walk);
ret = blkcipher_walk_done(desc, &walk, 0); ret = skcipher_walk_done(&walk, 0);
}
} }
return ret; return ret;
} }
struct crypto_alg p8_aes_ctr_alg = { struct skcipher_alg p8_aes_ctr_alg = {
.cra_name = "ctr(aes)", .base.cra_name = "ctr(aes)",
.cra_driver_name = "p8_aes_ctr", .base.cra_driver_name = "p8_aes_ctr",
.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.cra_priority = 2000, .base.cra_priority = 2000,
.cra_type = &crypto_blkcipher_type, .base.cra_flags = CRYPTO_ALG_NEED_FALLBACK,
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK, .base.cra_blocksize = 1,
.cra_alignmask = 0, .base.cra_ctxsize = sizeof(struct p8_aes_ctr_ctx),
.cra_blocksize = 1,
.cra_ctxsize = sizeof(struct p8_aes_ctr_ctx),
.cra_init = p8_aes_ctr_init,
.cra_exit = p8_aes_ctr_exit,
.cra_blkcipher = {
.ivsize = AES_BLOCK_SIZE,
.min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE,
.setkey = p8_aes_ctr_setkey, .setkey = p8_aes_ctr_setkey,
.encrypt = p8_aes_ctr_crypt, .encrypt = p8_aes_ctr_crypt,
.decrypt = p8_aes_ctr_crypt, .decrypt = p8_aes_ctr_crypt,
}, .init = p8_aes_ctr_init,
.exit = p8_aes_ctr_exit,
.min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE,
.chunksize = AES_BLOCK_SIZE,
}; };
drivers/crypto/vmx/aes_xts.c
View file @ 2621a869
...@@ -7,67 +7,56 @@ ...@@ -7,67 +7,56 @@
* Author: Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com> * Author: Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
*/ */
#include <linux/types.h>
#include <linux/err.h>
#include <linux/crypto.h>
#include <linux/delay.h>
#include <asm/simd.h> #include <asm/simd.h>
#include <asm/switch_to.h> #include <asm/switch_to.h>
#include <crypto/aes.h> #include <crypto/aes.h>
#include <crypto/internal/simd.h> #include <crypto/internal/simd.h>
#include <crypto/scatterwalk.h> #include <crypto/internal/skcipher.h>
#include <crypto/xts.h> #include <crypto/xts.h>
#include <crypto/skcipher.h>
#include "aesp8-ppc.h" #include "aesp8-ppc.h"
struct p8_aes_xts_ctx { struct p8_aes_xts_ctx {
struct crypto_sync_skcipher *fallback; struct crypto_skcipher *fallback;
struct aes_key enc_key; struct aes_key enc_key;
struct aes_key dec_key; struct aes_key dec_key;
struct aes_key tweak_key; struct aes_key tweak_key;
}; };
static int p8_aes_xts_init(struct crypto_tfm *tfm) static int p8_aes_xts_init(struct crypto_skcipher *tfm)
{ {
const char *alg = crypto_tfm_alg_name(tfm); struct p8_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
struct crypto_sync_skcipher *fallback; struct crypto_skcipher *fallback;
struct p8_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm);
fallback = crypto_alloc_sync_skcipher(alg, 0, fallback = crypto_alloc_skcipher("xts(aes)", 0,
CRYPTO_ALG_NEED_FALLBACK); CRYPTO_ALG_NEED_FALLBACK |
CRYPTO_ALG_ASYNC);
if (IS_ERR(fallback)) { if (IS_ERR(fallback)) {
printk(KERN_ERR pr_err("Failed to allocate xts(aes) fallback: %ld\n",
"Failed to allocate transformation for '%s': %ld\n", PTR_ERR(fallback));
alg, PTR_ERR(fallback));
return PTR_ERR(fallback); return PTR_ERR(fallback);
} }
crypto_sync_skcipher_set_flags( crypto_skcipher_set_reqsize(tfm, sizeof(struct skcipher_request) +
fallback, crypto_skcipher_reqsize(fallback));
crypto_skcipher_get_flags((struct crypto_skcipher *)tfm));
ctx->fallback = fallback; ctx->fallback = fallback;
return 0; return 0;
} }
static void p8_aes_xts_exit(struct crypto_tfm *tfm) static void p8_aes_xts_exit(struct crypto_skcipher *tfm)
{ {
struct p8_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm); struct p8_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
if (ctx->fallback) { crypto_free_skcipher(ctx->fallback);
crypto_free_sync_skcipher(ctx->fallback);
ctx->fallback = NULL;
}
} }
static int p8_aes_xts_setkey(struct crypto_tfm *tfm, const u8 *key, static int p8_aes_xts_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keylen) unsigned int keylen)
{ {
struct p8_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
int ret; int ret;
struct p8_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm);
ret = xts_check_key(tfm, key, keylen); ret = xts_verify_key(tfm, key, keylen);
if (ret) if (ret)
return ret; return ret;
...@@ -81,100 +70,90 @@ static int p8_aes_xts_setkey(struct crypto_tfm *tfm, const u8 *key, ...@@ -81,100 +70,90 @@ static int p8_aes_xts_setkey(struct crypto_tfm *tfm, const u8 *key,
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
ret |= crypto_sync_skcipher_setkey(ctx->fallback, key, keylen); ret |= crypto_skcipher_setkey(ctx->fallback, key, keylen);
return ret ? -EINVAL : 0; return ret ? -EINVAL : 0;
} }
static int p8_aes_xts_crypt(struct blkcipher_desc *desc, static int p8_aes_xts_crypt(struct skcipher_request *req, int enc)
struct scatterlist *dst,
struct scatterlist *src,
unsigned int nbytes, int enc)
{ {
int ret; struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
const struct p8_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
struct skcipher_walk walk;
unsigned int nbytes;
u8 tweak[AES_BLOCK_SIZE]; u8 tweak[AES_BLOCK_SIZE];
u8 *iv; int ret;
struct blkcipher_walk walk;
struct p8_aes_xts_ctx *ctx =
crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm));
if (!crypto_simd_usable()) { if (!crypto_simd_usable()) {
SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback); struct skcipher_request *subreq = skcipher_request_ctx(req);
skcipher_request_set_sync_tfm(req, ctx->fallback);
skcipher_request_set_callback(req, desc->flags, NULL, NULL);
skcipher_request_set_crypt(req, src, dst, nbytes, desc->info);
ret = enc? crypto_skcipher_encrypt(req) : crypto_skcipher_decrypt(req);
skcipher_request_zero(req);
} else {
blkcipher_walk_init(&walk, dst, src, nbytes);
ret = blkcipher_walk_virt(desc, &walk); *subreq = *req;
skcipher_request_set_tfm(subreq, ctx->fallback);
return enc ? crypto_skcipher_encrypt(subreq) :
crypto_skcipher_decrypt(subreq);
}
ret = skcipher_walk_virt(&walk, req, false);
if (ret)
return ret;
preempt_disable(); preempt_disable();
pagefault_disable(); pagefault_disable();
enable_kernel_vsx(); enable_kernel_vsx();
iv = walk.iv; aes_p8_encrypt(walk.iv, tweak, &ctx->tweak_key);
memset(tweak, 0, AES_BLOCK_SIZE);
aes_p8_encrypt(iv, tweak, &ctx->tweak_key);
disable_kernel_vsx(); disable_kernel_vsx();
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
while ((nbytes = walk.nbytes)) { while ((nbytes = walk.nbytes) != 0) {
preempt_disable(); preempt_disable();
pagefault_disable(); pagefault_disable();
enable_kernel_vsx(); enable_kernel_vsx();
if (enc) if (enc)
aes_p8_xts_encrypt(walk.src.virt.addr, walk.dst.virt.addr, aes_p8_xts_encrypt(walk.src.virt.addr,
nbytes & AES_BLOCK_MASK, &ctx->enc_key, NULL, tweak); walk.dst.virt.addr,
round_down(nbytes, AES_BLOCK_SIZE),
&ctx->enc_key, NULL, tweak);
else else
aes_p8_xts_decrypt(walk.src.virt.addr, walk.dst.virt.addr, aes_p8_xts_decrypt(walk.src.virt.addr,
nbytes & AES_BLOCK_MASK, &ctx->dec_key, NULL, tweak); walk.dst.virt.addr,
round_down(nbytes, AES_BLOCK_SIZE),
&ctx->dec_key, NULL, tweak);
disable_kernel_vsx(); disable_kernel_vsx();
pagefault_enable(); pagefault_enable();
preempt_enable(); preempt_enable();
nbytes &= AES_BLOCK_SIZE - 1; ret = skcipher_walk_done(&walk, nbytes % AES_BLOCK_SIZE);
ret = blkcipher_walk_done(desc, &walk, nbytes);
}
} }
return ret; return ret;
} }
static int p8_aes_xts_encrypt(struct blkcipher_desc *desc, static int p8_aes_xts_encrypt(struct skcipher_request *req)
struct scatterlist *dst,
struct scatterlist *src, unsigned int nbytes)
{ {
return p8_aes_xts_crypt(desc, dst, src, nbytes, 1); return p8_aes_xts_crypt(req, 1);
} }
static int p8_aes_xts_decrypt(struct blkcipher_desc *desc, static int p8_aes_xts_decrypt(struct skcipher_request *req)
struct scatterlist *dst,
struct scatterlist *src, unsigned int nbytes)
{ {
return p8_aes_xts_crypt(desc, dst, src, nbytes, 0); return p8_aes_xts_crypt(req, 0);
} }
struct crypto_alg p8_aes_xts_alg = { struct skcipher_alg p8_aes_xts_alg = {
.cra_name = "xts(aes)", .base.cra_name = "xts(aes)",
.cra_driver_name = "p8_aes_xts", .base.cra_driver_name = "p8_aes_xts",
.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.cra_priority = 2000, .base.cra_priority = 2000,
.cra_type = &crypto_blkcipher_type, .base.cra_flags = CRYPTO_ALG_NEED_FALLBACK,
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK, .base.cra_blocksize = AES_BLOCK_SIZE,
.cra_alignmask = 0, .base.cra_ctxsize = sizeof(struct p8_aes_xts_ctx),
.cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct p8_aes_xts_ctx),
.cra_init = p8_aes_xts_init,
.cra_exit = p8_aes_xts_exit,
.cra_blkcipher = {
.ivsize = AES_BLOCK_SIZE,
.min_keysize = 2 * AES_MIN_KEY_SIZE,
.max_keysize = 2 * AES_MAX_KEY_SIZE,
.setkey = p8_aes_xts_setkey, .setkey = p8_aes_xts_setkey,
.encrypt = p8_aes_xts_encrypt, .encrypt = p8_aes_xts_encrypt,
.decrypt = p8_aes_xts_decrypt, .decrypt = p8_aes_xts_decrypt,
} .init = p8_aes_xts_init,
.exit = p8_aes_xts_exit,
.min_keysize = 2 * AES_MIN_KEY_SIZE,
.max_keysize = 2 * AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE,
}; };
drivers/crypto/vmx/aesp8-ppc.h
View file @ 2621a869
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <crypto/aes.h> #include <crypto/aes.h>
#define AES_BLOCK_MASK (~(AES_BLOCK_SIZE-1))
struct aes_key { struct aes_key {
u8 key[AES_MAX_KEYLENGTH]; u8 key[AES_MAX_KEYLENGTH];
int rounds; int rounds;
......
drivers/crypto/vmx/vmx.c
View file @ 2621a869
...@@ -15,54 +15,58 @@ ...@@ -15,54 +15,58 @@
#include <linux/crypto.h> #include <linux/crypto.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <crypto/internal/hash.h> #include <crypto/internal/hash.h>
#include <crypto/internal/skcipher.h>
extern struct shash_alg p8_ghash_alg; extern struct shash_alg p8_ghash_alg;
extern struct crypto_alg p8_aes_alg; extern struct crypto_alg p8_aes_alg;
extern struct crypto_alg p8_aes_cbc_alg; extern struct skcipher_alg p8_aes_cbc_alg;
extern struct crypto_alg p8_aes_ctr_alg; extern struct skcipher_alg p8_aes_ctr_alg;
extern struct crypto_alg p8_aes_xts_alg; extern struct skcipher_alg p8_aes_xts_alg;
static struct crypto_alg *algs[] = {
&p8_aes_alg,
&p8_aes_cbc_alg,
&p8_aes_ctr_alg,
&p8_aes_xts_alg,
NULL,
};
static int __init p8_init(void) static int __init p8_init(void)
{ {
int ret = 0; int ret;
struct crypto_alg **alg_it;
for (alg_it = algs; *alg_it; alg_it++) { ret = crypto_register_shash(&p8_ghash_alg);
ret = crypto_register_alg(*alg_it);
printk(KERN_INFO "crypto_register_alg '%s' = %d\n",
(*alg_it)->cra_name, ret);
if (ret) {
for (alg_it--; alg_it >= algs; alg_it--)
crypto_unregister_alg(*alg_it);
break;
}
}
if (ret) if (ret)
return ret; goto err;
ret = crypto_register_shash(&p8_ghash_alg); ret = crypto_register_alg(&p8_aes_alg);
if (ret) { if (ret)
for (alg_it = algs; *alg_it; alg_it++) goto err_unregister_ghash;
crypto_unregister_alg(*alg_it);
} ret = crypto_register_skcipher(&p8_aes_cbc_alg);
if (ret)
goto err_unregister_aes;
ret = crypto_register_skcipher(&p8_aes_ctr_alg);
if (ret)
goto err_unregister_aes_cbc;
ret = crypto_register_skcipher(&p8_aes_xts_alg);
if (ret)
goto err_unregister_aes_ctr;
return 0;
err_unregister_aes_ctr:
crypto_unregister_skcipher(&p8_aes_ctr_alg);
err_unregister_aes_cbc:
crypto_unregister_skcipher(&p8_aes_cbc_alg);
err_unregister_aes:
crypto_unregister_alg(&p8_aes_alg);
err_unregister_ghash:
crypto_unregister_shash(&p8_ghash_alg);
err:
return ret; return ret;
} }
static void __exit p8_exit(void) static void __exit p8_exit(void)
{ {
struct crypto_alg **alg_it; crypto_unregister_skcipher(&p8_aes_xts_alg);
crypto_unregister_skcipher(&p8_aes_ctr_alg);
for (alg_it = algs; *alg_it; alg_it++) { crypto_unregister_skcipher(&p8_aes_cbc_alg);
printk(KERN_INFO "Removing '%s'\n", (*alg_it)->cra_name); crypto_unregister_alg(&p8_aes_alg);
crypto_unregister_alg(*alg_it);
}
crypto_unregister_shash(&p8_ghash_alg); crypto_unregister_shash(&p8_ghash_alg);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7