Skip to content

L
linux
Commit 1d0debbd authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by Herbert Xu
Browse files
Options

crypto: serpent-avx: remove duplicated glue code and use shared glue code from glue_helper 

Now that shared glue code is available, convert serpent-avx to use it.

Cc: Johannes Goetzfried <Johannes.Goetzfried@informatik.stud.uni-erlangen.de>
Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 596d8750
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 304 deletions
arch/x86/crypto/serpent_avx_glue.c
View file @ 1d0debbd
...@@ -36,357 +36,147 @@ ...@@ -36,357 +36,147 @@
#include <crypto/ctr.h> #include <crypto/ctr.h>
#include <crypto/lrw.h> #include <crypto/lrw.h>
#include <crypto/xts.h> #include <crypto/xts.h>
#include <asm/i387.h>
#include <asm/xcr.h> #include <asm/xcr.h>
#include <asm/xsave.h> #include <asm/xsave.h>
#include <asm/serpent-avx.h> #include <asm/serpent-avx.h>
#include <asm/crypto/ablk_helper.h> #include <asm/crypto/ablk_helper.h>
#include <crypto/scatterwalk.h> #include <asm/crypto/glue_helper.h>
#include <linux/workqueue.h>
#include <linux/spinlock.h>
static inline bool serpent_fpu_begin(bool fpu_enabled, unsigned int nbytes) static void serpent_decrypt_cbc_xway(void *ctx, u128 *dst, const u128 *src)
{ {
if (fpu_enabled) u128 ivs[SERPENT_PARALLEL_BLOCKS - 1];
return true; unsigned int j;
/* AVX is only used when chunk to be processed is large enough, so
* do not enable FPU until it is necessary.
*/
if (nbytes < SERPENT_BLOCK_SIZE * SERPENT_PARALLEL_BLOCKS)
return false;
kernel_fpu_begin();
return true;
}
static inline void serpent_fpu_end(bool fpu_enabled)
{
if (fpu_enabled)
kernel_fpu_end();
}
static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
bool enc)
{
bool fpu_enabled = false;
struct serpent_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
const unsigned int bsize = SERPENT_BLOCK_SIZE;
unsigned int nbytes;
int err;
err = blkcipher_walk_virt(desc, walk); for (j = 0; j < SERPENT_PARALLEL_BLOCKS - 1; j++)
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; ivs[j] = src[j];
while ((nbytes = walk->nbytes)) { serpent_dec_blk_xway(ctx, (u8 *)dst, (u8 *)src);
u8 *wsrc = walk->src.virt.addr;
u8 *wdst = walk->dst.virt.addr;
fpu_enabled = serpent_fpu_begin(fpu_enabled, nbytes);
/* Process multi-block batch */
if (nbytes >= bsize * SERPENT_PARALLEL_BLOCKS) {
do {
if (enc)
serpent_enc_blk_xway(ctx, wdst, wsrc);
else
serpent_dec_blk_xway(ctx, wdst, wsrc);
wsrc += bsize * SERPENT_PARALLEL_BLOCKS;
wdst += bsize * SERPENT_PARALLEL_BLOCKS;
nbytes -= bsize * SERPENT_PARALLEL_BLOCKS;
} while (nbytes >= bsize * SERPENT_PARALLEL_BLOCKS);
if (nbytes < bsize)
goto done;
}
/* Handle leftovers */
do {
if (enc)
__serpent_encrypt(ctx, wdst, wsrc);
else
__serpent_decrypt(ctx, wdst, wsrc);
wsrc += bsize;
wdst += bsize;
nbytes -= bsize;
} while (nbytes >= bsize);
done:
err = blkcipher_walk_done(desc, walk, nbytes);
}
serpent_fpu_end(fpu_enabled); for (j = 0; j < SERPENT_PARALLEL_BLOCKS - 1; j++)
return err; u128_xor(dst + (j + 1), dst + (j + 1), ivs + j);
} }
static int ecb_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static void serpent_crypt_ctr(void *ctx, u128 *dst, const u128 *src, u128 *iv)
struct scatterlist *src, unsigned int nbytes)
{ {
struct blkcipher_walk walk; be128 ctrblk;
blkcipher_walk_init(&walk, dst, src, nbytes);
return ecb_crypt(desc, &walk, true);
}
static int ecb_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, u128_to_be128(&ctrblk, iv);
struct scatterlist *src, unsigned int nbytes) u128_inc(iv);
{
struct blkcipher_walk walk;
blkcipher_walk_init(&walk, dst, src, nbytes); __serpent_encrypt(ctx, (u8 *)&ctrblk, (u8 *)&ctrblk);
return ecb_crypt(desc, &walk, false); u128_xor(dst, src, (u128 *)&ctrblk);
} }
static unsigned int __cbc_encrypt(struct blkcipher_desc *desc, static void serpent_crypt_ctr_xway(void *ctx, u128 *dst, const u128 *src,
struct blkcipher_walk *walk) u128 *iv)
{ {
struct serpent_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); be128 ctrblks[SERPENT_PARALLEL_BLOCKS];
const unsigned int bsize = SERPENT_BLOCK_SIZE; unsigned int i;
unsigned int nbytes = walk->nbytes;
u128 *src = (u128 *)walk->src.virt.addr;
u128 *dst = (u128 *)walk->dst.virt.addr;
u128 *iv = (u128 *)walk->iv;
do {
u128_xor(dst, src, iv);
__serpent_encrypt(ctx, (u8 *)dst, (u8 *)dst);
iv = dst;
src += 1;
dst += 1;
nbytes -= bsize;
} while (nbytes >= bsize);
u128_xor((u128 *)walk->iv, (u128 *)walk->iv, iv);
return nbytes;
}
static int cbc_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, for (i = 0; i < SERPENT_PARALLEL_BLOCKS; i++) {
struct scatterlist *src, unsigned int nbytes) if (dst != src)
{ dst[i] = src[i];
struct blkcipher_walk walk;
int err;
blkcipher_walk_init(&walk, dst, src, nbytes);
err = blkcipher_walk_virt(desc, &walk);
while ((nbytes = walk.nbytes)) { u128_to_be128(&ctrblks[i], iv);
nbytes = __cbc_encrypt(desc, &walk); u128_inc(iv);
err = blkcipher_walk_done(desc, &walk, nbytes);
} }
return err; serpent_enc_blk_xway_xor(ctx, (u8 *)dst, (u8 *)ctrblks);
} }
static unsigned int __cbc_decrypt(struct blkcipher_desc *desc, static const struct common_glue_ctx serpent_enc = {
struct blkcipher_walk *walk) .num_funcs = 2,
{ .fpu_blocks_limit = SERPENT_PARALLEL_BLOCKS,
struct serpent_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
const unsigned int bsize = SERPENT_BLOCK_SIZE; .funcs = { {
unsigned int nbytes = walk->nbytes; .num_blocks = SERPENT_PARALLEL_BLOCKS,
u128 *src = (u128 *)walk->src.virt.addr; .fn_u = { .ecb = GLUE_FUNC_CAST(serpent_enc_blk_xway) }
u128 *dst = (u128 *)walk->dst.virt.addr; }, {
u128 ivs[SERPENT_PARALLEL_BLOCKS - 1]; .num_blocks = 1,
u128 last_iv; .fn_u = { .ecb = GLUE_FUNC_CAST(__serpent_encrypt) }
int i; } }
};
/* Start of the last block. */
src += nbytes / bsize - 1;
dst += nbytes / bsize - 1;
last_iv = *src;
/* Process multi-block batch */
if (nbytes >= bsize * SERPENT_PARALLEL_BLOCKS) {
do {
nbytes -= bsize * (SERPENT_PARALLEL_BLOCKS - 1);
src -= SERPENT_PARALLEL_BLOCKS - 1;
dst -= SERPENT_PARALLEL_BLOCKS - 1;
for (i = 0; i < SERPENT_PARALLEL_BLOCKS - 1; i++)
ivs[i] = src[i];
serpent_dec_blk_xway(ctx, (u8 *)dst, (u8 *)src);
for (i = 0; i < SERPENT_PARALLEL_BLOCKS - 1; i++)
u128_xor(dst + (i + 1), dst + (i + 1), ivs + i);
nbytes -= bsize;
if (nbytes < bsize)
goto done;
u128_xor(dst, dst, src - 1);
src -= 1;
dst -= 1;
} while (nbytes >= bsize * SERPENT_PARALLEL_BLOCKS);
if (nbytes < bsize)
goto done;
}
/* Handle leftovers */
for (;;) {
__serpent_decrypt(ctx, (u8 *)dst, (u8 *)src);
nbytes -= bsize;
if (nbytes < bsize)
break;
u128_xor(dst, dst, src - 1); static const struct common_glue_ctx serpent_ctr = {
src -= 1; .num_funcs = 2,
dst -= 1; .fpu_blocks_limit = SERPENT_PARALLEL_BLOCKS,
}
.funcs = { {
.num_blocks = SERPENT_PARALLEL_BLOCKS,
.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(serpent_crypt_ctr_xway) }
}, {
.num_blocks = 1,
.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(serpent_crypt_ctr) }
} }
};
done: static const struct common_glue_ctx serpent_dec = {
u128_xor(dst, dst, (u128 *)walk->iv); .num_funcs = 2,
*(u128 *)walk->iv = last_iv; .fpu_blocks_limit = SERPENT_PARALLEL_BLOCKS,
.funcs = { {
.num_blocks = SERPENT_PARALLEL_BLOCKS,
.fn_u = { .ecb = GLUE_FUNC_CAST(serpent_dec_blk_xway) }
}, {
.num_blocks = 1,
.fn_u = { .ecb = GLUE_FUNC_CAST(__serpent_decrypt) }
} }
};
return nbytes; static const struct common_glue_ctx serpent_dec_cbc = {
} .num_funcs = 2,
.fpu_blocks_limit = SERPENT_PARALLEL_BLOCKS,
.funcs = { {
.num_blocks = SERPENT_PARALLEL_BLOCKS,
.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(serpent_decrypt_cbc_xway) }
}, {
.num_blocks = 1,
.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(__serpent_decrypt) }
} }
};
static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int ecb_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
struct scatterlist *src, unsigned int nbytes) struct scatterlist *src, unsigned int nbytes)
{ {
bool fpu_enabled = false; return glue_ecb_crypt_128bit(&serpent_enc, desc, dst, src, nbytes);
struct blkcipher_walk walk;
int err;
blkcipher_walk_init(&walk, dst, src, nbytes);
err = blkcipher_walk_virt(desc, &walk);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
while ((nbytes = walk.nbytes)) {
fpu_enabled = serpent_fpu_begin(fpu_enabled, nbytes);
nbytes = __cbc_decrypt(desc, &walk);
err = blkcipher_walk_done(desc, &walk, nbytes);
}
serpent_fpu_end(fpu_enabled);
return err;
} }
static inline void u128_to_be128(be128 *dst, const u128 *src) static int ecb_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
struct scatterlist *src, unsigned int nbytes)
{ {
dst->a = cpu_to_be64(src->a); return glue_ecb_crypt_128bit(&serpent_dec, desc, dst, src, nbytes);
dst->b = cpu_to_be64(src->b);
} }
static inline void be128_to_u128(u128 *dst, const be128 *src) static int cbc_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
struct scatterlist *src, unsigned int nbytes)
{ {
dst->a = be64_to_cpu(src->a); return glue_cbc_encrypt_128bit(GLUE_FUNC_CAST(__serpent_encrypt), desc,
dst->b = be64_to_cpu(src->b); dst, src, nbytes);
} }
static inline void u128_inc(u128 *i) static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
struct scatterlist *src, unsigned int nbytes)
{ {
i->b++; return glue_cbc_decrypt_128bit(&serpent_dec_cbc, desc, dst, src,
if (!i->b) nbytes);
i->a++;
} }
static void ctr_crypt_final(struct blkcipher_desc *desc, static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
struct blkcipher_walk *walk) struct scatterlist *src, unsigned int nbytes)
{ {
struct serpent_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); return glue_ctr_crypt_128bit(&serpent_ctr, desc, dst, src, nbytes);
u8 *ctrblk = walk->iv;
u8 keystream[SERPENT_BLOCK_SIZE];
u8 *src = walk->src.virt.addr;
u8 *dst = walk->dst.virt.addr;
unsigned int nbytes = walk->nbytes;
__serpent_encrypt(ctx, keystream, ctrblk);
crypto_xor(keystream, src, nbytes);
memcpy(dst, keystream, nbytes);
crypto_inc(ctrblk, SERPENT_BLOCK_SIZE);
} }
static unsigned int __ctr_crypt(struct blkcipher_desc *desc, static inline bool serpent_fpu_begin(bool fpu_enabled, unsigned int nbytes)
struct blkcipher_walk *walk)
{ {
struct serpent_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); return glue_fpu_begin(SERPENT_BLOCK_SIZE, SERPENT_PARALLEL_BLOCKS,
const unsigned int bsize = SERPENT_BLOCK_SIZE; NULL, fpu_enabled, nbytes);
unsigned int nbytes = walk->nbytes;
u128 *src = (u128 *)walk->src.virt.addr;
u128 *dst = (u128 *)walk->dst.virt.addr;
u128 ctrblk;
be128 ctrblocks[SERPENT_PARALLEL_BLOCKS];
int i;
be128_to_u128(&ctrblk, (be128 *)walk->iv);
/* Process multi-block batch */
if (nbytes >= bsize * SERPENT_PARALLEL_BLOCKS) {
do {
/* create ctrblks for parallel encrypt */
for (i = 0; i < SERPENT_PARALLEL_BLOCKS; i++) {
if (dst != src)
dst[i] = src[i];
u128_to_be128(&ctrblocks[i], &ctrblk);
u128_inc(&ctrblk);
}
serpent_enc_blk_xway_xor(ctx, (u8 *)dst,
(u8 *)ctrblocks);
src += SERPENT_PARALLEL_BLOCKS;
dst += SERPENT_PARALLEL_BLOCKS;
nbytes -= bsize * SERPENT_PARALLEL_BLOCKS;
} while (nbytes >= bsize * SERPENT_PARALLEL_BLOCKS);
if (nbytes < bsize)
goto done;
}
/* Handle leftovers */
do {
if (dst != src)
*dst = *src;
u128_to_be128(&ctrblocks[0], &ctrblk);
u128_inc(&ctrblk);
__serpent_encrypt(ctx, (u8 *)ctrblocks, (u8 *)ctrblocks);
u128_xor(dst, dst, (u128 *)ctrblocks);
src += 1;
dst += 1;
nbytes -= bsize;
} while (nbytes >= bsize);
done:
u128_to_be128((be128 *)walk->iv, &ctrblk);
return nbytes;
} }
static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst, static inline void serpent_fpu_end(bool fpu_enabled)
struct scatterlist *src, unsigned int nbytes)
{ {
bool fpu_enabled = false; glue_fpu_end(fpu_enabled);
struct blkcipher_walk walk;
int err;
blkcipher_walk_init(&walk, dst, src, nbytes);
err = blkcipher_walk_virt_block(desc, &walk, SERPENT_BLOCK_SIZE);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
while ((nbytes = walk.nbytes) >= SERPENT_BLOCK_SIZE) {
fpu_enabled = serpent_fpu_begin(fpu_enabled, nbytes);
nbytes = __ctr_crypt(desc, &walk);
err = blkcipher_walk_done(desc, &walk, nbytes);
}
serpent_fpu_end(fpu_enabled);
if (walk.nbytes) {
ctr_crypt_final(desc, &walk);
err = blkcipher_walk_done(desc, &walk, 0);
}
return err;
} }
struct crypt_priv { struct crypt_priv {
......
crypto/Kconfig
View file @ 1d0debbd
...@@ -842,6 +842,7 @@ config CRYPTO_SERPENT_AVX_X86_64 ...@@ -842,6 +842,7 @@ config CRYPTO_SERPENT_AVX_X86_64
select CRYPTO_ALGAPI select CRYPTO_ALGAPI
select CRYPTO_CRYPTD select CRYPTO_CRYPTD
select CRYPTO_ABLK_HELPER_X86 select CRYPTO_ABLK_HELPER_X86
select CRYPTO_GLUE_HELPER_X86
select CRYPTO_SERPENT select CRYPTO_SERPENT
select CRYPTO_LRW select CRYPTO_LRW
select CRYPTO_XTS select CRYPTO_XTS
......
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