kunit: memcpy: Split slow memcpy tests into MEMCPY_SLOW_KUNIT_TEST
PATCH v3 1/1 kunit: memcpy: Split slow memcpy tests into MEMCPY_SLOW_KUNIT_TEST
Since the long memcpy tests may stall a system for tens of seconds in virtualized architecture environments, split those tests off under CONFIG_MEMCPY_SLOW_KUNIT_TEST so they can be separately disabled.
---
v3: fix defaults, avoid redundant returns.
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/lkml/[email protected]
--- lib/Kconfig.debug | 9 +++++++++ lib/memcpy_kunit.c | 3 +++ 2 files changed, 12 insertions(+)
lib/Kconfig.debug +9 -0
@@ -2566,6 +2566,15 @@ 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. + config IS_SIGNED_TYPE_KUNIT_TEST tristate "Test is_signed_type() macro" if !KUNIT_ALL_TESTS depends on KUNIT
lib/memcpy_kunit.c +3 -0
@@ -309,6 +309,8 @@ 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));
@@ -327,6 +329,7 @@ static void init_large(struct kunit *test)*/ static void copy_large_test (struct kunit *test,bool use_memmove) { +init_large (test);/* Copy a growing number of non-overlapping bytes ... */
Signature · 1 line
2.34.1
Quoted 56 lines · Kees Cook
Since the long memcpy tests may stall a system for tens of seconds in virtualized architecture environments, split those tests off under
CONFIG_MEMCPY_SLOW_KUNIT_TESTso they can be separately disabled.Reported-by Guenter Roeck <[email protected]>Reviewed-by Nick Desaulniers <[email protected]>Reviewed-and-tested-by Guenter Roeck <[email protected]>Reviewed-by David Gow <[email protected]>Cc Andrew Morton <[email protected]>Cc Nathan Chancellor <[email protected]>Signed-off-by Kees Cook <[email protected]>---
v3: fix defaults, avoid redundant returns.
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/lkml/[email protected]--- lib/Kconfig.debug | 9 +++++++++ lib/memcpy_kunit.c | 3 +++ 2 files changed, 12 insertions(+)lib/Kconfig.debug +9
-0@@ -2566,6 +2566,15 @@ 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. + config IS_SIGNED_TYPE_KUNIT_TEST tristate "Test is_signed_type() macro" if !KUNIT_ALL_TESTS depends on KUNITlib/memcpy_kunit.c +2
-0@@ -309,6 +309,8 @@ 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));
lib/memcpy_kunit.c static void init_large(struct kunit *test) · line 332
Quoted 4 lines
lib/memcpy_kunit.c +1
-0@@ -327,6 +329,7 @@ static void init_large(struct kunit *test)*/ static void copy_large_test (struct kunit *test,bool use_memmove) { +
Some whitespace noise slipped in here.
Guenter
Quoted 6 lines
lib/memcpy_kunit.c +0
-0init_large (test);/* Copy a growing number of non-overlapping bytes ... */ Signature · 1 line
2.34.1
Quoted 54 lines · Guenter Roeck
Quoted 53 lines · Kees Cook
Since the long memcpy tests may stall a system for tens of seconds in virtualized architecture environments, split those tests off under
CONFIG_MEMCPY_SLOW_KUNIT_TESTso they can be separately disabled.Reported-by Guenter Roeck <[email protected]>Reviewed-by Nick Desaulniers <[email protected]>Reviewed-and-tested-by Guenter Roeck <[email protected]>Reviewed-by David Gow <[email protected]>Cc Andrew Morton <[email protected]>Cc Nathan Chancellor <[email protected]>Signed-off-by Kees Cook <[email protected]>---
v3: fix defaults, avoid redundant returns.
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/lkml/[email protected]--- lib/Kconfig.debug | 9 +++++++++ lib/memcpy_kunit.c | 3 +++ 2 files changed, 12 insertions(+)lib/Kconfig.debug +9
-0@@ -2566,6 +2566,15 @@ 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. + config IS_SIGNED_TYPE_KUNIT_TEST tristate "Test is_signed_type() macro" if !KUNIT_ALL_TESTS depends on KUNITlib/memcpy_kunit.c +2
-0@@ -309,6 +309,8 @@ 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" );
Quoted 9 lines
lib/memcpy_kunit.c static void init_large(struct kunit *test) · line 332
Quoted 7 lines
lib/memcpy_kunit.c +1
-0/* Get many bit patterns. */ get_random_bytes (large_src,ARRAY_SIZE (large_src));@@ -327,6 +329,7 @@ static void init_large(struct kunit *test)*/ static void copy_large_test (struct kunit *test,bool use_memmove) { +Some whitespace noise slipped in here.
Ah-ha; thanks! I'll fix this in my tree.
Signature · 1 line
Kees Cook