mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 00:48:50 +00:00
d91cab7813
There are two concepts that have some confusing naming: 1. Extended State Component numbers (currently called XFEATURE_BIT_*) 2. Extended State Component masks (currently called XSTATE_*) The numbers are (currently) from 0-9. State component 3 is the bounds registers for MPX, for instance. But when we want to enable "state component 3", we go set a bit in XCR0. The bit we set is 1<<3. We can check to see if a state component feature is enabled by looking at its bit. The current 'xfeature_bit's are at best xfeature bit _numbers_. Calling them bits is at best inconsistent with ending the enum list with 'XFEATURES_NR_MAX'. This patch renames the enum to be 'xfeature'. These also happen to be what the Intel documentation calls a "state component". We also want to differentiate these from the "XSTATE_*" macros. The "XSTATE_*" macros are a mask, and we rename them to match. These macros are reasonably widely used so this patch is a wee bit big, but this really is just a rename. The only non-mechanical part of this is the s/XSTATE_EXTEND_MASK/XFEATURE_MASK_EXTEND/ We need a better name for it, but that's another patch. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tim Chen <tim.c.chen@linux.intel.com> Cc: dave@sr71.net Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/20150902233126.38653250@viggo.jf.intel.com [ Ported to v4.3-rc1. ] Signed-off-by: Ingo Molnar <mingo@kernel.org>
150 lines
4 KiB
C
150 lines
4 KiB
C
/*
|
|
* ChaCha20 256-bit cipher algorithm, RFC7539, SIMD glue code
|
|
*
|
|
* Copyright (C) 2015 Martin Willi
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#include <crypto/algapi.h>
|
|
#include <crypto/chacha20.h>
|
|
#include <linux/crypto.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <asm/fpu/api.h>
|
|
#include <asm/simd.h>
|
|
|
|
#define CHACHA20_STATE_ALIGN 16
|
|
|
|
asmlinkage void chacha20_block_xor_ssse3(u32 *state, u8 *dst, const u8 *src);
|
|
asmlinkage void chacha20_4block_xor_ssse3(u32 *state, u8 *dst, const u8 *src);
|
|
#ifdef CONFIG_AS_AVX2
|
|
asmlinkage void chacha20_8block_xor_avx2(u32 *state, u8 *dst, const u8 *src);
|
|
static bool chacha20_use_avx2;
|
|
#endif
|
|
|
|
static void chacha20_dosimd(u32 *state, u8 *dst, const u8 *src,
|
|
unsigned int bytes)
|
|
{
|
|
u8 buf[CHACHA20_BLOCK_SIZE];
|
|
|
|
#ifdef CONFIG_AS_AVX2
|
|
if (chacha20_use_avx2) {
|
|
while (bytes >= CHACHA20_BLOCK_SIZE * 8) {
|
|
chacha20_8block_xor_avx2(state, dst, src);
|
|
bytes -= CHACHA20_BLOCK_SIZE * 8;
|
|
src += CHACHA20_BLOCK_SIZE * 8;
|
|
dst += CHACHA20_BLOCK_SIZE * 8;
|
|
state[12] += 8;
|
|
}
|
|
}
|
|
#endif
|
|
while (bytes >= CHACHA20_BLOCK_SIZE * 4) {
|
|
chacha20_4block_xor_ssse3(state, dst, src);
|
|
bytes -= CHACHA20_BLOCK_SIZE * 4;
|
|
src += CHACHA20_BLOCK_SIZE * 4;
|
|
dst += CHACHA20_BLOCK_SIZE * 4;
|
|
state[12] += 4;
|
|
}
|
|
while (bytes >= CHACHA20_BLOCK_SIZE) {
|
|
chacha20_block_xor_ssse3(state, dst, src);
|
|
bytes -= CHACHA20_BLOCK_SIZE;
|
|
src += CHACHA20_BLOCK_SIZE;
|
|
dst += CHACHA20_BLOCK_SIZE;
|
|
state[12]++;
|
|
}
|
|
if (bytes) {
|
|
memcpy(buf, src, bytes);
|
|
chacha20_block_xor_ssse3(state, buf, buf);
|
|
memcpy(dst, buf, bytes);
|
|
}
|
|
}
|
|
|
|
static int chacha20_simd(struct blkcipher_desc *desc, struct scatterlist *dst,
|
|
struct scatterlist *src, unsigned int nbytes)
|
|
{
|
|
u32 *state, state_buf[16 + (CHACHA20_STATE_ALIGN / sizeof(u32)) - 1];
|
|
struct blkcipher_walk walk;
|
|
int err;
|
|
|
|
if (!may_use_simd())
|
|
return crypto_chacha20_crypt(desc, dst, src, nbytes);
|
|
|
|
state = (u32 *)roundup((uintptr_t)state_buf, CHACHA20_STATE_ALIGN);
|
|
|
|
blkcipher_walk_init(&walk, dst, src, nbytes);
|
|
err = blkcipher_walk_virt_block(desc, &walk, CHACHA20_BLOCK_SIZE);
|
|
|
|
crypto_chacha20_init(state, crypto_blkcipher_ctx(desc->tfm), walk.iv);
|
|
|
|
kernel_fpu_begin();
|
|
|
|
while (walk.nbytes >= CHACHA20_BLOCK_SIZE) {
|
|
chacha20_dosimd(state, walk.dst.virt.addr, walk.src.virt.addr,
|
|
rounddown(walk.nbytes, CHACHA20_BLOCK_SIZE));
|
|
err = blkcipher_walk_done(desc, &walk,
|
|
walk.nbytes % CHACHA20_BLOCK_SIZE);
|
|
}
|
|
|
|
if (walk.nbytes) {
|
|
chacha20_dosimd(state, walk.dst.virt.addr, walk.src.virt.addr,
|
|
walk.nbytes);
|
|
err = blkcipher_walk_done(desc, &walk, 0);
|
|
}
|
|
|
|
kernel_fpu_end();
|
|
|
|
return err;
|
|
}
|
|
|
|
static struct crypto_alg alg = {
|
|
.cra_name = "chacha20",
|
|
.cra_driver_name = "chacha20-simd",
|
|
.cra_priority = 300,
|
|
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER,
|
|
.cra_blocksize = 1,
|
|
.cra_type = &crypto_blkcipher_type,
|
|
.cra_ctxsize = sizeof(struct chacha20_ctx),
|
|
.cra_alignmask = sizeof(u32) - 1,
|
|
.cra_module = THIS_MODULE,
|
|
.cra_u = {
|
|
.blkcipher = {
|
|
.min_keysize = CHACHA20_KEY_SIZE,
|
|
.max_keysize = CHACHA20_KEY_SIZE,
|
|
.ivsize = CHACHA20_IV_SIZE,
|
|
.geniv = "seqiv",
|
|
.setkey = crypto_chacha20_setkey,
|
|
.encrypt = chacha20_simd,
|
|
.decrypt = chacha20_simd,
|
|
},
|
|
},
|
|
};
|
|
|
|
static int __init chacha20_simd_mod_init(void)
|
|
{
|
|
if (!cpu_has_ssse3)
|
|
return -ENODEV;
|
|
|
|
#ifdef CONFIG_AS_AVX2
|
|
chacha20_use_avx2 = cpu_has_avx && cpu_has_avx2 &&
|
|
cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL);
|
|
#endif
|
|
return crypto_register_alg(&alg);
|
|
}
|
|
|
|
static void __exit chacha20_simd_mod_fini(void)
|
|
{
|
|
crypto_unregister_alg(&alg);
|
|
}
|
|
|
|
module_init(chacha20_simd_mod_init);
|
|
module_exit(chacha20_simd_mod_fini);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Martin Willi <martin@strongswan.org>");
|
|
MODULE_DESCRIPTION("chacha20 cipher algorithm, SIMD accelerated");
|
|
MODULE_ALIAS_CRYPTO("chacha20");
|
|
MODULE_ALIAS_CRYPTO("chacha20-simd");
|