From ff0f6e667ff877cd605d2b107c897b039f9829d9 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 5 Oct 2018 23:20:40 +0200 Subject: global: rename include'd C files to be .c This is done by 259 other files in the kernel tree: linux $ rg '#include.*\.c' -l | wc -l 259 Suggested-by: Sultan Alsawaf Signed-off-by: Jason A. Donenfeld --- src/crypto/zinc/blake2s/blake2s-x86_64-glue.c | 72 +++++++++++++++++++++++++++ src/crypto/zinc/blake2s/blake2s-x86_64-glue.h | 72 --------------------------- src/crypto/zinc/blake2s/blake2s.c | 4 +- 3 files changed, 74 insertions(+), 74 deletions(-) create mode 100644 src/crypto/zinc/blake2s/blake2s-x86_64-glue.c delete mode 100644 src/crypto/zinc/blake2s/blake2s-x86_64-glue.h (limited to 'src/crypto/zinc/blake2s') diff --git a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.c b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.c new file mode 100644 index 0000000..7be9809 --- /dev/null +++ b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.c @@ -0,0 +1,72 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. + */ + +#include +#include +#include +#include + +asmlinkage void blake2s_compress_avx(struct blake2s_state *state, + const u8 *block, const size_t nblocks, + const u32 inc); +asmlinkage void blake2s_compress_avx512(struct blake2s_state *state, + const u8 *block, const size_t nblocks, + const u32 inc); + +static bool blake2s_use_avx __ro_after_init; +static bool blake2s_use_avx512 __ro_after_init; + +static void __init blake2s_fpu_init(void) +{ + blake2s_use_avx = + boot_cpu_has(X86_FEATURE_AVX) && + cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL); +#ifndef COMPAT_CANNOT_USE_AVX512 + blake2s_use_avx512 = + boot_cpu_has(X86_FEATURE_AVX) && + boot_cpu_has(X86_FEATURE_AVX2) && + boot_cpu_has(X86_FEATURE_AVX512F) && + boot_cpu_has(X86_FEATURE_AVX512VL) && + cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM | + XFEATURE_MASK_AVX512, NULL); +#endif +} + +static inline bool blake2s_compress_arch(struct blake2s_state *state, + const u8 *block, size_t nblocks, + const u32 inc) +{ + simd_context_t simd_context; + bool used_arch = false; + + /* SIMD disables preemption, so relax after processing each page. */ + BUILD_BUG_ON(PAGE_SIZE / BLAKE2S_BLOCK_SIZE < 8); + + simd_get(&simd_context); + + if (!IS_ENABLED(CONFIG_AS_AVX) || !blake2s_use_avx || + !simd_use(&simd_context)) + goto out; + used_arch = true; + + for (;;) { + const size_t blocks = min_t(size_t, nblocks, + PAGE_SIZE / BLAKE2S_BLOCK_SIZE); + + if (IS_ENABLED(CONFIG_AS_AVX512) && blake2s_use_avx512) + blake2s_compress_avx512(state, block, blocks, inc); + else + blake2s_compress_avx(state, block, blocks, inc); + + nblocks -= blocks; + if (!nblocks) + break; + block += blocks * BLAKE2S_BLOCK_SIZE; + simd_relax(&simd_context); + } +out: + simd_put(&simd_context); + return used_arch; +} diff --git a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h deleted file mode 100644 index 2191e3f..0000000 --- a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h +++ /dev/null @@ -1,72 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR MIT */ -/* - * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. - */ - -#include -#include -#include -#include - -asmlinkage void blake2s_compress_avx(struct blake2s_state *state, - const u8 *block, const size_t nblocks, - const u32 inc); -asmlinkage void blake2s_compress_avx512(struct blake2s_state *state, - const u8 *block, const size_t nblocks, - const u32 inc); - -static bool blake2s_use_avx __ro_after_init; -static bool blake2s_use_avx512 __ro_after_init; - -static void __init blake2s_fpu_init(void) -{ - blake2s_use_avx = - boot_cpu_has(X86_FEATURE_AVX) && - cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL); -#ifndef COMPAT_CANNOT_USE_AVX512 - blake2s_use_avx512 = - boot_cpu_has(X86_FEATURE_AVX) && - boot_cpu_has(X86_FEATURE_AVX2) && - boot_cpu_has(X86_FEATURE_AVX512F) && - boot_cpu_has(X86_FEATURE_AVX512VL) && - cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM | - XFEATURE_MASK_AVX512, NULL); -#endif -} - -static inline bool blake2s_compress_arch(struct blake2s_state *state, - const u8 *block, size_t nblocks, - const u32 inc) -{ - simd_context_t simd_context; - bool used_arch = false; - - /* SIMD disables preemption, so relax after processing each page. */ - BUILD_BUG_ON(PAGE_SIZE / BLAKE2S_BLOCK_SIZE < 8); - - simd_get(&simd_context); - - if (!IS_ENABLED(CONFIG_AS_AVX) || !blake2s_use_avx || - !simd_use(&simd_context)) - goto out; - used_arch = true; - - for (;;) { - const size_t blocks = min_t(size_t, nblocks, - PAGE_SIZE / BLAKE2S_BLOCK_SIZE); - - if (IS_ENABLED(CONFIG_AS_AVX512) && blake2s_use_avx512) - blake2s_compress_avx512(state, block, blocks, inc); - else - blake2s_compress_avx(state, block, blocks, inc); - - nblocks -= blocks; - if (!nblocks) - break; - block += blocks * BLAKE2S_BLOCK_SIZE; - simd_relax(&simd_context); - } -out: - simd_put(&simd_context); - return used_arch; -} diff --git a/src/crypto/zinc/blake2s/blake2s.c b/src/crypto/zinc/blake2s/blake2s.c index 08d3947..fe4d4b4 100644 --- a/src/crypto/zinc/blake2s/blake2s.c +++ b/src/crypto/zinc/blake2s/blake2s.c @@ -110,7 +110,7 @@ void blake2s_init_key(struct blake2s_state *state, const size_t outlen, EXPORT_SYMBOL(blake2s_init_key); #if defined(CONFIG_ZINC_ARCH_X86_64) -#include "blake2s-x86_64-glue.h" +#include "blake2s-x86_64-glue.c" #else static void __init blake2s_fpu_init(void) { @@ -271,7 +271,7 @@ void blake2s_hmac(u8 *out, const u8 *in, const u8 *key, const size_t outlen, } EXPORT_SYMBOL(blake2s_hmac); -#include "../selftest/blake2s.h" +#include "../selftest/blake2s.c" static bool nosimd __initdata = false; -- cgit v1.2.3