linux-kernel - Re: [PATCH] crypto - move crypto_simd_disabled_for

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAMj1kXGvh3DBGL2g-3Xnj_F1e3w+HDBxoekgiE2iJq9TsOK--g@mail.gmail.com>
Date: Fri, 25 Oct 2024 10:05:05 +0200
From: Ard Biesheuvel <ardb@...nel.org>
To: Eric Biggers <ebiggers@...nel.org>
Cc: linux-crypto@...r.kernel.org, linux-arm-kernel@...ts.infradead.org, 
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] crypto - move crypto_simd_disabled_for_test to lib

On Sat, 19 Oct 2024 at 01:54, Eric Biggers <ebiggers@...nel.org> wrote:
>
> From: Eric Biggers <ebiggers@...gle.com>
>
> Move crypto_simd_disabled_for_test to lib/ so that crypto_simd_usable()
> can be used by library code.
>
> This was discussed previously
> (https://lore.kernel.org/linux-crypto/20220716062920.210381-4-ebiggers@kernel.org/)
> but was not done because there was no use case yet.  However, this is
> now needed for the arm64 CRC32 library code.
>
> Tested with:
>     export ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-
>     echo CONFIG_CRC32=y > .config
>     echo CONFIG_MODULES=y >> .config
>     echo CONFIG_CRYPTO=m >> .config
>     echo CONFIG_DEBUG_KERNEL=y >> .config
>     echo CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=n >> .config
>     echo CONFIG_CRYPTO_MANAGER_EXTRA_TESTS=y >> .config
>     make olddefconfig
>     make -j$(nproc)
>
> Signed-off-by: Eric Biggers <ebiggers@...gle.com>

Acked-by: Ard Biesheuvel <ardb@...nel.org>


> ---
>  crypto/algapi.c     |  6 ------
>  lib/crypto/Makefile |  2 ++
>  lib/crypto/simd.c   | 11 +++++++++++
>  3 files changed, 13 insertions(+), 6 deletions(-)
>  create mode 100644 lib/crypto/simd.c
>
> diff --git a/crypto/algapi.c b/crypto/algapi.c
> index 74e2261c184ca..429a832f90fe0 100644
> --- a/crypto/algapi.c
> +++ b/crypto/algapi.c
> @@ -4,11 +4,10 @@
>   *
>   * Copyright (c) 2006 Herbert Xu <herbert@...dor.apana.org.au>
>   */
>
>  #include <crypto/algapi.h>
> -#include <crypto/internal/simd.h>
>  #include <linux/err.h>
>  #include <linux/errno.h>
>  #include <linux/fips.h>
>  #include <linux/init.h>
>  #include <linux/kernel.h>
> @@ -21,15 +20,10 @@
>
>  #include "internal.h"
>
>  static LIST_HEAD(crypto_template_list);
>
> -#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
> -DEFINE_PER_CPU(bool, crypto_simd_disabled_for_test);
> -EXPORT_PER_CPU_SYMBOL_GPL(crypto_simd_disabled_for_test);
> -#endif
> -
>  static inline void crypto_check_module_sig(struct module *mod)
>  {
>         if (fips_enabled && mod && !module_sig_ok(mod))
>                 panic("Module %s signature verification failed in FIPS mode\n",
>                       module_name(mod));
> diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
> index 969baab8c805f..01fac1cd05a19 100644
> --- a/lib/crypto/Makefile
> +++ b/lib/crypto/Makefile
> @@ -56,5 +56,7 @@ libblake2s-y                                  += blake2s-selftest.o
>  libchacha20poly1305-y                          += chacha20poly1305-selftest.o
>  libcurve25519-y                                        += curve25519-selftest.o
>  endif
>
>  obj-$(CONFIG_MPILIB) += mpi/
> +
> +obj-$(CONFIG_CRYPTO_MANAGER_EXTRA_TESTS)       += simd.o
> diff --git a/lib/crypto/simd.c b/lib/crypto/simd.c
> new file mode 100644
> index 0000000000000..9c36cb3bb49c4
> --- /dev/null
> +++ b/lib/crypto/simd.c
> @@ -0,0 +1,11 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * SIMD testing utility functions
> + *
> + * Copyright 2024 Google LLC
> + */
> +
> +#include <crypto/internal/simd.h>
> +
> +DEFINE_PER_CPU(bool, crypto_simd_disabled_for_test);
> +EXPORT_PER_CPU_SYMBOL_GPL(crypto_simd_disabled_for_test);
>
> base-commit: 5c20772738e1d1d7bec41664eb9d61497e53c10e
> --
> 2.47.0
>