Re: [PATCH] crypto: aegis128 - Move simd prototypes into aegis.h

From: Ard Biesheuvel
Date: Mon Mar 08 2021 - 04:38:29 EST

On Mon, 8 Mar 2021 at 06:42, Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> wrote:
>
> On Sun, Feb 28, 2021 at 03:14:55AM +0800, kernel test robot wrote:
> > tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
> > head: 5695e51619745d4fe3ec2506a2f0cd982c5e27a4
> > commit: a4397635afea5d127548d64e0055ed471ef2d5be crypto: aegis128 - provide a SIMD implementation based on NEON intrinsics
> > date: 1 year, 6 months ago
> > config: arm64-randconfig-r035-20210226 (attached as .config)
> > compiler: aarch64-linux-gcc (GCC) 9.3.0
> > reproduce (this is a W=1 build):
> > wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
> > chmod +x ~/bin/make.cross
> > # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a4397635afea5d127548d64e0055ed471ef2d5be
> > git remote add linus https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> > git fetch --no-tags linus master
> > git checkout a4397635afea5d127548d64e0055ed471ef2d5be
> > # save the attached .config to linux build tree
> > COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm64
> >
> > If you fix the issue, kindly add following tag as appropriate
> > Reported-by: kernel test robot <lkp@xxxxxxxxx>
> >
> > All warnings (new ones prefixed by >>):
> >
> > >> crypto/aegis128-neon.c:17:6: warning: no previous prototype for 'crypto_aegis128_have_simd' [-Wmissing-prototypes]
> > 17 | bool crypto_aegis128_have_simd(void)
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~
>
> ---8<---
> This patch fixes missing prototype warnings in crypto/aegis128-neon.c.
>
> Fixes: a4397635afea ("crypto: aegis128 - provide a SIMD...")
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>

Acked-by: Ard Biesheuvel <ardb@xxxxxxxxxx>

>
> diff --git a/crypto/aegis.h b/crypto/aegis.h
> index 6920ebe77679..6ef9c174c973 100644
> --- a/crypto/aegis.h
> +++ b/crypto/aegis.h
> @@ -21,9 +21,28 @@ union aegis_block {
> u8 bytes[AEGIS_BLOCK_SIZE];
> };
>
> +struct aegis_state;
> +
> +extern int aegis128_have_aes_insn;
> +
> #define AEGIS_BLOCK_ALIGN (__alignof__(union aegis_block))
> #define AEGIS_ALIGNED(p) IS_ALIGNED((uintptr_t)p, AEGIS_BLOCK_ALIGN)
>
> +bool crypto_aegis128_have_simd(void);
> +void crypto_aegis128_update_simd(struct aegis_state *state, const void *msg);
> +void crypto_aegis128_init_simd(struct aegis_state *state,
> + const union aegis_block *key,
> + const u8 *iv);
> +void crypto_aegis128_encrypt_chunk_simd(struct aegis_state *state, u8 *dst,
> + const u8 *src, unsigned int size);
> +void crypto_aegis128_decrypt_chunk_simd(struct aegis_state *state, u8 *dst,
> + const u8 *src, unsigned int size);
> +int crypto_aegis128_final_simd(struct aegis_state *state,
> + union aegis_block *tag_xor,
> + unsigned int assoclen,
> + unsigned int cryptlen,
> + unsigned int authsize);
> +
> static __always_inline void crypto_aegis_block_xor(union aegis_block *dst,
> const union aegis_block *src)
> {
> diff --git a/crypto/aegis128-core.c b/crypto/aegis128-core.c
> index 89dc1c559689..c4f1bfa1d04f 100644
> --- a/crypto/aegis128-core.c
> +++ b/crypto/aegis128-core.c
> @@ -58,21 +58,6 @@ static bool aegis128_do_simd(void)
> return false;
> }
>
> -bool crypto_aegis128_have_simd(void);
> -void crypto_aegis128_update_simd(struct aegis_state *state, const void *msg);
> -void crypto_aegis128_init_simd(struct aegis_state *state,
> - const union aegis_block *key,
> - const u8 *iv);
> -void crypto_aegis128_encrypt_chunk_simd(struct aegis_state *state, u8 *dst,
> - const u8 *src, unsigned int size);
> -void crypto_aegis128_decrypt_chunk_simd(struct aegis_state *state, u8 *dst,
> - const u8 *src, unsigned int size);
> -int crypto_aegis128_final_simd(struct aegis_state *state,
> - union aegis_block *tag_xor,
> - unsigned int assoclen,
> - unsigned int cryptlen,
> - unsigned int authsize);
> -
> static void crypto_aegis128_update(struct aegis_state *state)
> {
> union aegis_block tmp;
> diff --git a/crypto/aegis128-neon.c b/crypto/aegis128-neon.c
> index 94d591a002a4..a7856915ec85 100644
> --- a/crypto/aegis128-neon.c
> +++ b/crypto/aegis128-neon.c
> @@ -30,7 +30,7 @@ bool crypto_aegis128_have_simd(void)
> return IS_ENABLED(CONFIG_ARM64);
> }
>
> -void crypto_aegis128_init_simd(union aegis_block *state,
> +void crypto_aegis128_init_simd(struct aegis_state *state,
> const union aegis_block *key,
> const u8 *iv)
> {
> @@ -39,14 +39,14 @@ void crypto_aegis128_init_simd(union aegis_block *state,
> kernel_neon_end();
> }
>
> -void crypto_aegis128_update_simd(union aegis_block *state, const void *msg)
> +void crypto_aegis128_update_simd(struct aegis_state *state, const void *msg)
> {
> kernel_neon_begin();
> crypto_aegis128_update_neon(state, msg);
> kernel_neon_end();
> }
>
> -void crypto_aegis128_encrypt_chunk_simd(union aegis_block *state, u8 *dst,
> +void crypto_aegis128_encrypt_chunk_simd(struct aegis_state *state, u8 *dst,
> const u8 *src, unsigned int size)
> {
> kernel_neon_begin();
> @@ -54,7 +54,7 @@ void crypto_aegis128_encrypt_chunk_simd(union aegis_block *state, u8 *dst,
> kernel_neon_end();
> }
>
> -void crypto_aegis128_decrypt_chunk_simd(union aegis_block *state, u8 *dst,
> +void crypto_aegis128_decrypt_chunk_simd(struct aegis_state *state, u8 *dst,
> const u8 *src, unsigned int size)
> {
> kernel_neon_begin();
> @@ -62,7 +62,7 @@ void crypto_aegis128_decrypt_chunk_simd(union aegis_block *state, u8 *dst,
> kernel_neon_end();
> }
>
> -int crypto_aegis128_final_simd(union aegis_block *state,
> +int crypto_aegis128_final_simd(struct aegis_state *state,
> union aegis_block *tag_xor,
> unsigned int assoclen,
> unsigned int cryptlen,
> --
> Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
> Home Page: http://gondor.apana.org.au/~herbert/
> PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt