Commit acd80cdc authored by Guenter Roeck's avatar Guenter Roeck Committed by Kees Cook
Browse files

Revert "kunit: memcpy: Split slow memcpy tests into MEMCPY_SLOW_KUNIT_TEST" 



This reverts commit 4acf1de3.

Commit d055c6a2 ("kunit: memcpy: Mark tests as slow using test
attributes") marks slow memcpy unit tests as slow. Since this commit,
the tests can be disabled with a module parameter, and the configuration
option to skip the slow tests is no longer needed. Revert the patch
introducing it.

Cc: David Gow <davidgow@google.com>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20240314151200.2285314-1-linux@roeck-us.net


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent c4ca2276

lib/Kconfig.debug

+0 −12
Original line number Diff line number Diff line
@@ -2703,18 +2703,6 @@ config MEMCPY_KUNIT_TEST 


	  If unsure, say N.



config MEMCPY_SLOW_KUNIT_TEST

	bool "Include exhaustive memcpy tests"

	depends on MEMCPY_KUNIT_TEST

	default y

	help

	  Some memcpy tests are quite exhaustive in checking for overlaps

	  and bit ranges. These can be very slow, so they are split out

	  as a separate config, in case they need to be disabled.



	  Note this config option will be replaced by the use of KUnit test

	  attributes.



config IS_SIGNED_TYPE_KUNIT_TEST

	tristate "Test is_signed_type() macro" if !KUNIT_ALL_TESTS

	depends on KUNIT

lib/memcpy_kunit.c

+0 −3
Original line number Diff line number Diff line
@@ -309,9 +309,6 @@ static void set_random_nonzero(struct kunit *test, u8 *byte) 


static void init_large(struct kunit *test)

{

	if (!IS_ENABLED(CONFIG_MEMCPY_SLOW_KUNIT_TEST))

		kunit_skip(test, "Slow test skipped. Enable with CONFIG_MEMCPY_SLOW_KUNIT_TEST=y");



	/* Get many bit patterns. */

	get_random_bytes(large_src, ARRAY_SIZE(large_src));