Commit 6a42ff33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux 

Pull crypto library fixes from Eric Biggers:

 - Several test fixes:

    - Fix flakiness in the interrupt context tests in certain VMs

    - Make the lib/crypto/ KUnit tests depend on the corresponding
      library options rather than selecting them. This follows the
      standard KUnit convention, and it fixes an issue where enabling
      CONFIG_KUNIT_ALL_TESTS pulled in all the crypto library code

    - Add a kunitconfig file for lib/crypto/

    - Fix a couple stale references to "aes-generic" that made it in
      concurrently with the rename to "aes-lib"

 - Update the help text for several CRYPTO kconfig options to remove
   outdated information about users that now use the library instead

* tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
  crypto: testmgr - Fix stale references to aes-generic
  crypto: Clean up help text for CRYPTO_CRC32
  crypto: Clean up help text for CRYPTO_CRC32C
  crypto: Clean up help text for CRYPTO_XXHASH
  crypto: Clean up help text for CRYPTO_SHA256
  crypto: Clean up help text for CRYPTO_BLAKE2B
  lib/crypto: tests: Add a .kunitconfig file
  lib/crypto: tests: Depend on library options rather than selecting them
  kunit: irq: Ensure timer doesn't fire too frequently
parents 39887161 3875ceb5

crypto/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -876,8 +876,6 @@ config CRYPTO_BLAKE2B 
	  - blake2b-384

	  - blake2b-512



	  Used by the btrfs filesystem.



	  See https://blake2.net for further information.



config CRYPTO_CMAC
@@ -965,7 +963,6 @@ config CRYPTO_SHA256 
	  10118-3), including HMAC support.



	  This is required for IPsec AH (XFRM_AH) and IPsec ESP (XFRM_ESP).

	  Used by the btrfs filesystem, Ceph, NFS, and SMB.



config CRYPTO_SHA512

	tristate "SHA-384 and SHA-512"
@@ -1039,8 +1036,6 @@ config CRYPTO_XXHASH 


	  Extremely fast, working at speeds close to RAM limits.



	  Used by the btrfs filesystem.



endmenu



menu "CRCs (cyclic redundancy checks)"
@@ -1058,8 +1053,6 @@ config CRYPTO_CRC32C 
	  on Communications, Vol. 41, No. 6, June 1993, selected for use with

	  iSCSI.



	  Used by btrfs, ext4, jbd2, NVMeoF/TCP, and iSCSI.



config CRYPTO_CRC32

	tristate "CRC32"

	select CRYPTO_HASH
@@ -1067,8 +1060,6 @@ config CRYPTO_CRC32 
	help

	  CRC32 CRC algorithm (IEEE 802.3)



	  Used by RoCEv2 and f2fs.



endmenu



menu "Compression"

crypto/testmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -4132,7 +4132,7 @@ static const struct alg_test_desc alg_test_descs[] = { 
		.fips_allowed = 1,

	}, {

		.alg = "authenc(hmac(sha224),cbc(aes))",

		.generic_driver = "authenc(hmac-sha224-lib,cbc(aes-generic))",

		.generic_driver = "authenc(hmac-sha224-lib,cbc(aes-lib))",

		.test = alg_test_aead,

		.suite = {

			.aead = __VECS(hmac_sha224_aes_cbc_tv_temp)
@@ -4194,7 +4194,7 @@ static const struct alg_test_desc alg_test_descs[] = { 
		.fips_allowed = 1,

	}, {

		.alg = "authenc(hmac(sha384),cbc(aes))",

		.generic_driver = "authenc(hmac-sha384-lib,cbc(aes-generic))",

		.generic_driver = "authenc(hmac-sha384-lib,cbc(aes-lib))",

		.test = alg_test_aead,

		.suite = {

			.aead = __VECS(hmac_sha384_aes_cbc_tv_temp)

include/kunit/run-in-irq-context.h

+28 −16
Original line number Diff line number Diff line
@@ -12,16 +12,16 @@ 
#include <linux/hrtimer.h>

#include <linux/workqueue.h>



#define KUNIT_IRQ_TEST_HRTIMER_INTERVAL us_to_ktime(5)



struct kunit_irq_test_state {

	bool (*func)(void *test_specific_state);

	void *test_specific_state;

	bool task_func_reported_failure;

	bool hardirq_func_reported_failure;

	bool softirq_func_reported_failure;

	atomic_t task_func_calls;

	atomic_t hardirq_func_calls;

	atomic_t softirq_func_calls;

	ktime_t interval;

	struct hrtimer timer;

	struct work_struct bh_work;

};
@@ -30,14 +30,25 @@ static enum hrtimer_restart kunit_irq_test_timer_func(struct hrtimer *timer) 
{

	struct kunit_irq_test_state *state =

		container_of(timer, typeof(*state), timer);

	int task_calls, hardirq_calls, softirq_calls;



	WARN_ON_ONCE(!in_hardirq());

	atomic_inc(&state->hardirq_func_calls);

	task_calls = atomic_read(&state->task_func_calls);

	hardirq_calls = atomic_inc_return(&state->hardirq_func_calls);

	softirq_calls = atomic_read(&state->softirq_func_calls);



	/*

	 * If the timer is firing too often for the softirq or task to ever have

	 * a chance to run, increase the timer interval.  This is needed on very

	 * slow systems.

	 */

	if (hardirq_calls >= 20 && (softirq_calls == 0 || task_calls == 0))

		state->interval = ktime_add_ns(state->interval, 250);



	if (!state->func(state->test_specific_state))

		state->hardirq_func_reported_failure = true;



	hrtimer_forward_now(&state->timer, KUNIT_IRQ_TEST_HRTIMER_INTERVAL);

	hrtimer_forward_now(&state->timer, state->interval);

	queue_work(system_bh_wq, &state->bh_work);

	return HRTIMER_RESTART;

}
@@ -86,10 +97,14 @@ static inline void kunit_run_irq_test(struct kunit *test, bool (*func)(void *), 
	struct kunit_irq_test_state state = {

		.func = func,

		.test_specific_state = test_specific_state,

		/*

		 * Start with a 5us timer interval.  If the system can't keep

		 * up, kunit_irq_test_timer_func() will increase it.

		 */

		.interval = us_to_ktime(5),

	};

	unsigned long end_jiffies;

	int hardirq_calls, softirq_calls;

	bool allctx = false;

	int task_calls, hardirq_calls, softirq_calls;



	/*

	 * Set up a hrtimer (the way we access hardirq context) and a work
@@ -104,21 +119,18 @@ static inline void kunit_run_irq_test(struct kunit *test, bool (*func)(void *), 
	 * and hardirq), or 1 second, whichever comes first.

	 */

	end_jiffies = jiffies + HZ;

	hrtimer_start(&state.timer, KUNIT_IRQ_TEST_HRTIMER_INTERVAL,

		      HRTIMER_MODE_REL_HARD);

	for (int task_calls = 0, calls = 0;

	     ((calls < max_iterations) || !allctx) &&

	     !time_after(jiffies, end_jiffies);

	     task_calls++) {

	hrtimer_start(&state.timer, state.interval, HRTIMER_MODE_REL_HARD);

	do {

		if (!func(test_specific_state))

			state.task_func_reported_failure = true;



		task_calls = atomic_inc_return(&state.task_func_calls);

		hardirq_calls = atomic_read(&state.hardirq_func_calls);

		softirq_calls = atomic_read(&state.softirq_func_calls);

		calls = task_calls + hardirq_calls + softirq_calls;

		allctx = (task_calls > 0) && (hardirq_calls > 0) &&

			 (softirq_calls > 0);

	}

	} while ((task_calls + hardirq_calls + softirq_calls < max_iterations ||

		  (task_calls == 0 || hardirq_calls == 0 ||

		   softirq_calls == 0)) &&

		 !time_after(jiffies, end_jiffies));



	/* Cancel the timer and work. */

	hrtimer_cancel(&state.timer);

lib/crypto/.kunitconfig

0 → 100644
+34 −0
Original line number Diff line number Diff line 
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_BLAKE2B=y

CONFIG_CRYPTO_CHACHA20POLY1305=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_BLAKE2B_KUNIT_TEST=y

CONFIG_CRYPTO_LIB_BLAKE2S_KUNIT_TEST=y

CONFIG_CRYPTO_LIB_CURVE25519_KUNIT_TEST=y

CONFIG_CRYPTO_LIB_MD5_KUNIT_TEST=y

CONFIG_CRYPTO_LIB_MLDSA_KUNIT_TEST=y

CONFIG_CRYPTO_LIB_NH_KUNIT_TEST=y

CONFIG_CRYPTO_LIB_POLY1305_KUNIT_TEST=y

CONFIG_CRYPTO_LIB_POLYVAL_KUNIT_TEST=y

CONFIG_CRYPTO_LIB_SHA1_KUNIT_TEST=y

CONFIG_CRYPTO_LIB_SHA256_KUNIT_TEST=y

CONFIG_CRYPTO_LIB_SHA512_KUNIT_TEST=y

CONFIG_CRYPTO_LIB_SHA3_KUNIT_TEST=y

lib/crypto/tests/Kconfig

+12 −23
Original line number Diff line number Diff line
@@ -2,10 +2,9 @@ 


config CRYPTO_LIB_BLAKE2B_KUNIT_TEST

	tristate "KUnit tests for BLAKE2b" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && CRYPTO_LIB_BLAKE2B

	default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS

	select CRYPTO_LIB_BENCHMARK_VISIBLE

	select CRYPTO_LIB_BLAKE2B

	help

	  KUnit tests for the BLAKE2b cryptographic hash function.
@@ -14,71 +13,64 @@ config CRYPTO_LIB_BLAKE2S_KUNIT_TEST 
	depends on KUNIT

	default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS

	select CRYPTO_LIB_BENCHMARK_VISIBLE

	# No need to select CRYPTO_LIB_BLAKE2S here, as that option doesn't

	# No need to depend on CRYPTO_LIB_BLAKE2S here, as that option doesn't

	# exist; the BLAKE2s code is always built-in for the /dev/random driver.

	help

	  KUnit tests for the BLAKE2s cryptographic hash function.



config CRYPTO_LIB_CURVE25519_KUNIT_TEST

	tristate "KUnit tests for Curve25519" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && CRYPTO_LIB_CURVE25519

	default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS

	select CRYPTO_LIB_BENCHMARK_VISIBLE

	select CRYPTO_LIB_CURVE25519

	help

	  KUnit tests for the Curve25519 Diffie-Hellman function.



config CRYPTO_LIB_MD5_KUNIT_TEST

	tristate "KUnit tests for MD5" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && CRYPTO_LIB_MD5

	default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS

	select CRYPTO_LIB_BENCHMARK_VISIBLE

	select CRYPTO_LIB_MD5

	help

	  KUnit tests for the MD5 cryptographic hash function and its

	  corresponding HMAC.



config CRYPTO_LIB_MLDSA_KUNIT_TEST

	tristate "KUnit tests for ML-DSA" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && CRYPTO_LIB_MLDSA

	default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS

	select CRYPTO_LIB_BENCHMARK_VISIBLE

	select CRYPTO_LIB_MLDSA

	help

	  KUnit tests for the ML-DSA digital signature algorithm.



config CRYPTO_LIB_NH_KUNIT_TEST

	tristate "KUnit tests for NH" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && CRYPTO_LIB_NH

	default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS

	select CRYPTO_LIB_NH

	help

	  KUnit tests for the NH almost-universal hash function.



config CRYPTO_LIB_POLY1305_KUNIT_TEST

	tristate "KUnit tests for Poly1305" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && CRYPTO_LIB_POLY1305

	default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS

	select CRYPTO_LIB_BENCHMARK_VISIBLE

	select CRYPTO_LIB_POLY1305

	help

	  KUnit tests for the Poly1305 library functions.



config CRYPTO_LIB_POLYVAL_KUNIT_TEST

	tristate "KUnit tests for POLYVAL" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && CRYPTO_LIB_POLYVAL

	default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS

	select CRYPTO_LIB_BENCHMARK_VISIBLE

	select CRYPTO_LIB_POLYVAL

	help

	  KUnit tests for the POLYVAL library functions.



config CRYPTO_LIB_SHA1_KUNIT_TEST

	tristate "KUnit tests for SHA-1" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && CRYPTO_LIB_SHA1

	default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS

	select CRYPTO_LIB_BENCHMARK_VISIBLE

	select CRYPTO_LIB_SHA1

	help

	  KUnit tests for the SHA-1 cryptographic hash function and its

	  corresponding HMAC.
@@ -87,10 +79,9 @@ config CRYPTO_LIB_SHA1_KUNIT_TEST 
# included, for consistency with the naming used elsewhere (e.g. CRYPTO_SHA256).

config CRYPTO_LIB_SHA256_KUNIT_TEST

	tristate "KUnit tests for SHA-224 and SHA-256" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && CRYPTO_LIB_SHA256

	default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS

	select CRYPTO_LIB_BENCHMARK_VISIBLE

	select CRYPTO_LIB_SHA256

	help

	  KUnit tests for the SHA-224 and SHA-256 cryptographic hash functions

	  and their corresponding HMACs.
@@ -99,20 +90,18 @@ config CRYPTO_LIB_SHA256_KUNIT_TEST 
# included, for consistency with the naming used elsewhere (e.g. CRYPTO_SHA512).

config CRYPTO_LIB_SHA512_KUNIT_TEST

	tristate "KUnit tests for SHA-384 and SHA-512" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && CRYPTO_LIB_SHA512

	default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS

	select CRYPTO_LIB_BENCHMARK_VISIBLE

	select CRYPTO_LIB_SHA512

	help

	  KUnit tests for the SHA-384 and SHA-512 cryptographic hash functions

	  and their corresponding HMACs.



config CRYPTO_LIB_SHA3_KUNIT_TEST

	tristate "KUnit tests for SHA-3" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && CRYPTO_LIB_SHA3

	default KUNIT_ALL_TESTS || CRYPTO_SELFTESTS

	select CRYPTO_LIB_BENCHMARK_VISIBLE

	select CRYPTO_LIB_SHA3

	help

	  KUnit tests for the SHA3 cryptographic hash and XOF functions,

	  including SHA3-224, SHA3-256, SHA3-384, SHA3-512, SHAKE128 and