2024-03-14 15:12:28

by Guenter Roeck

Subject: [PATCH] Revert "kunit: memcpy: Split slow memcpy tests into MEMCPY_SLOW_KUNIT_TEST"

This reverts commit 4acf1de35f41549e60c3c02a8defa7cb95eabdf2.

Commit d055c6a2cc16 ("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 <[email protected]>
Cc: Kees Cook <[email protected]>
Signed-off-by: Guenter Roeck <[email protected]>
---
lib/Kconfig.debug | 12 ------------
lib/memcpy_kunit.c | 3 ---
2 files changed, 15 deletions(-)

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 2164f066e7b6..eccbc4764f3d 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -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
diff --git a/lib/memcpy_kunit.c b/lib/memcpy_kunit.c
index 30e00ef0bf2e..fd16e6ce53d1 100644
--- a/lib/memcpy_kunit.c
+++ b/lib/memcpy_kunit.c
@@ -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));

--
2.39.2

2024-03-14 16:33:38

by Kees Cook

Subject: Re: [PATCH] Revert "kunit: memcpy: Split slow memcpy tests into MEMCPY_SLOW_KUNIT_TEST"

On Thu, 14 Mar 2024 08:12:00 -0700, Guenter Roeck wrote:
> This reverts commit 4acf1de35f41549e60c3c02a8defa7cb95eabdf2.
>
> Commit d055c6a2cc16 ("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.
>
> [...]

Applied to for-next/hardening, thanks!

[1/1] Revert "kunit: memcpy: Split slow memcpy tests into MEMCPY_SLOW_KUNIT_TEST"
https://git.kernel.org/kees/c/137ef32afaa9

Take care,

--
Kees Cook