[PATCH 0/2] Make 'kunit.py run --alltests' run all crypto library tests

[Eric Biggers]

This series makes the KUnit all_tests.config enable all the crypto
library options that have KUnit tests, so that all these tests will be
run in testing systems use 'kunit.py run --alltests'. (For example,
KernelCI is planned to start doing that [1].) To do this easily in both
that file and in lib/crypto/.kunitconfig, introduce a kconfig option
CRYPTO_LIB_ENABLE_ALL_FOR_KUNIT for this purpose.

This series is targeting libcrypto-next.

[1] https://lore.kernel.org/kernelci/4fd302e0-ffa7-4bbf...@sirena.org.uk

Eric Biggers (2):
lib/crypto: tests: Introduce CRYPTO_LIB_ENABLE_ALL_FOR_KUNIT
kunit: configs: Enable all crypto library tests in all_tests.config

lib/crypto/.kunitconfig | 22 +-----------------
lib/crypto/tests/Kconfig | 24 ++++++++++++++++++++
tools/testing/kunit/configs/all_tests.config | 2 ++
3 files changed, 27 insertions(+), 21 deletions(-)


base-commit: ce260754bb435aea18e6a1a1ce3759249013f5a4
--
2.53.0

[Eric Biggers]

For kunit.py to run all the crypto library tests when passed the
--alltests option, tools/testing/kunit/configs/all_tests.config needs to
enable options that satisfy the test dependencies.

This is the same as what lib/crypto/.kunitconfig already does.
However, the strategy that lib/crypto/.kunitconfig currently uses to
select all the hidden library options isn't going to scale up well when
it needs to be repeated in two places.

Instead let's go ahead and introduce an option
CRYPTO_LIB_ENABLE_ALL_FOR_KUNIT that depends on KUNIT and selects all
the crypto library options that have corresponding KUnit tests.

Update lib/crypto/.kunitconfig to use this option.

Signed-off-by: Eric Biggers <ebig...@kernel.org>
---
lib/crypto/.kunitconfig | 22 +---------------------
lib/crypto/tests/Kconfig | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/lib/crypto/.kunitconfig b/lib/crypto/.kunitconfig
index 8cfd213bded9b..63a592731d1dc 100644
--- a/lib/crypto/.kunitconfig
+++ b/lib/crypto/.kunitconfig
@@ -1,28 +1,8 @@
CONFIG_KUNIT=y

-# These kconfig options select all the CONFIG_CRYPTO_LIB_* symbols that have a
-# corresponding KUnit test. Those symbols cannot be directly enabled here,
-# since they are hidden symbols.
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ADIANTUM=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_BLAKE2B=y
-CONFIG_CRYPTO_CHACHA20POLY1305=y
-CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_HCTR2=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MLDSA=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=y
-CONFIG_INET=y
-CONFIG_IPV6=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_WIREGUARD=y
+CONFIG_CRYPTO_LIB_ENABLE_ALL_FOR_KUNIT=y

CONFIG_CRYPTO_LIB_AES_CBC_MACS_KUNIT_TEST=y
CONFIG_CRYPTO_LIB_BLAKE2B_KUNIT_TEST=y
CONFIG_CRYPTO_LIB_BLAKE2S_KUNIT_TEST=y
CONFIG_CRYPTO_LIB_CURVE25519_KUNIT_TEST=y
diff --git a/lib/crypto/tests/Kconfig b/lib/crypto/tests/Kconfig
index 0d71de3da15d7..caab7fdbdfdef 100644
--- a/lib/crypto/tests/Kconfig
+++ b/lib/crypto/tests/Kconfig
@@ -114,10 +114,34 @@ config CRYPTO_LIB_SHA3_KUNIT_TEST
help
KUnit tests for the SHA3 cryptographic hash and XOF functions,
including SHA3-224, SHA3-256, SHA3-384, SHA3-512, SHAKE128 and
SHAKE256.

+config CRYPTO_LIB_ENABLE_ALL_FOR_KUNIT
+ tristate "Enable all crypto library code for KUnit tests"
+ depends on KUNIT
+ select CRYPTO_LIB_AES_CBC_MACS
+ select CRYPTO_LIB_BLAKE2B
+ select CRYPTO_LIB_CURVE25519
+ select CRYPTO_LIB_MD5
+ select CRYPTO_LIB_MLDSA
+ select CRYPTO_LIB_NH
+ select CRYPTO_LIB_POLY1305
+ select CRYPTO_LIB_POLYVAL
+ select CRYPTO_LIB_SHA1
+ select CRYPTO_LIB_SHA256
+ select CRYPTO_LIB_SHA512
+ select CRYPTO_LIB_SHA3
+ help
+ Enable all the crypto library code that has KUnit tests.
+
+ Enable this only if you'd like to test all the crypto library code,
+ even code that wouldn't otherwise need to be built.
+
+ You'll still need to enable the tests themselves, either individually
+ or using KUNIT_ALL_TESTS.
+
config CRYPTO_LIB_BENCHMARK_VISIBLE
bool

config CRYPTO_LIB_BENCHMARK
bool "Include benchmarks in KUnit tests for cryptographic functions"
--
2.53.0

[Eric Biggers]

The new option CONFIG_CRYPTO_LIB_ENABLE_ALL_FOR_KUNIT enables all the
crypto library code that has KUnit tests, causing CONFIG_KUNIT_ALL_TESTS
to enable all these tests. Add this option to all_tests.config so that
kunit.py will run them when passed the --alltests option.

Signed-off-by: Eric Biggers <ebig...@kernel.org>
---

tools/testing/kunit/configs/all_tests.config | 2 ++
1 file changed, 2 insertions(+)

diff --git a/tools/testing/kunit/configs/all_tests.config b/tools/testing/kunit/configs/all_tests.config
index 422e186cf3cf1..6910b07082da2 100644
--- a/tools/testing/kunit/configs/all_tests.config
+++ b/tools/testing/kunit/configs/all_tests.config
@@ -42,10 +42,12 @@ CONFIG_DAMON_PADDR=y

CONFIG_REGMAP_BUILD=y

CONFIG_AUDIT=y

+CONFIG_CRYPTO_LIB_ENABLE_ALL_FOR_KUNIT=y
+
CONFIG_PRIME_NUMBERS=y

CONFIG_SECURITY=y
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_LANDLOCK=y
--
2.53.0

[Eric Biggers]

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git/log/?h=libcrypto-next

- Eric