mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
13cecc526d
Consolidate the ChaCha code into a single module (excluding chacha-block-generic.c which remains always built-in for random.c), similar to various other algorithms: - Each arch now provides a header file lib/crypto/$(SRCARCH)/chacha.h, replacing lib/crypto/$(SRCARCH)/chacha*.c. The header defines chacha_crypt_arch() and hchacha_block_arch(). It is included by lib/crypto/chacha.c, and thus the code gets built into the single libchacha module, with improved inlining in some cases. - Whether arch-optimized ChaCha is buildable is now controlled centrally by lib/crypto/Kconfig instead of by lib/crypto/$(SRCARCH)/Kconfig. The conditions for enabling it remain the same as before, and it remains enabled by default. - Any additional arch-specific translation units for the optimized ChaCha code, such as assembly files, are now compiled by lib/crypto/Makefile instead of lib/crypto/$(SRCARCH)/Makefile. This removes the last use for the Makefile and Kconfig files in the arm64, mips, powerpc, riscv, and s390 subdirectories of lib/crypto/. So also remove those files and the references to them. Reviewed-by: Ard Biesheuvel <ardb@kernel.org> Link: https://lore.kernel.org/r/20250827151131.27733-7-ebiggers@kernel.org Signed-off-by: Eric Biggers <ebiggers@kernel.org>
37 lines
1.0 KiB
C
37 lines
1.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* ChaCha stream cipher (s390 optimized)
|
|
*
|
|
* Copyright IBM Corp. 2021
|
|
*/
|
|
|
|
#include <linux/cpufeature.h>
|
|
#include <linux/export.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/sizes.h>
|
|
#include <asm/fpu.h>
|
|
#include "chacha-s390.h"
|
|
|
|
#define hchacha_block_arch hchacha_block_generic /* not implemented yet */
|
|
|
|
static void chacha_crypt_arch(struct chacha_state *state, u8 *dst,
|
|
const u8 *src, unsigned int bytes, int nrounds)
|
|
{
|
|
/* s390 chacha20 implementation has 20 rounds hard-coded,
|
|
* it cannot handle a block of data or less, but otherwise
|
|
* it can handle data of arbitrary size
|
|
*/
|
|
if (bytes <= CHACHA_BLOCK_SIZE || nrounds != 20 || !cpu_has_vx()) {
|
|
chacha_crypt_generic(state, dst, src, bytes, nrounds);
|
|
} else {
|
|
DECLARE_KERNEL_FPU_ONSTACK32(vxstate);
|
|
|
|
kernel_fpu_begin(&vxstate, KERNEL_VXR);
|
|
chacha20_vx(dst, src, bytes, &state->x[4], &state->x[12]);
|
|
kernel_fpu_end(&vxstate, KERNEL_VXR);
|
|
|
|
state->x[12] += round_up(bytes, CHACHA_BLOCK_SIZE) /
|
|
CHACHA_BLOCK_SIZE;
|
|
}
|
|
}
|