KUnit test moves / renames

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Kees Cook <[email protected]>

---
 lib/Kconfig.debug                                    | 2 +-
 lib/math/Makefile                                    | 5 ++---
 lib/math/tests/Makefile                              | 3 ++-
 lib/math/{rational-test.c => tests/rational_kunit.c} | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/math/{rational-test.c => tests/rational_kunit.c} (100%)

lib/Kconfig.debug +1 -1

index 1af972a92d06..b18dbfc53ca4 100644
@@ -3166,7 +3166,7 @@ config TEST_OBJPOOL
 
 	  If unsure, say N.
 
-config INT_POW_TEST
+config INT_POW_KUNIT_TEST
 	tristate "Integer exponentiation (int_pow) test" if !KUNIT_ALL_TESTS
 	depends on KUNIT
 	default KUNIT_ALL_TESTS

lib/math/Makefile +2 -3

index 853f023ae537..d1caba23baa0 100644
@@ -5,8 +5,7 @@ obj-$(CONFIG_CORDIC)		+= cordic.o
 obj-$(CONFIG_PRIME_NUMBERS)	+= prime_numbers.o
 obj-$(CONFIG_RATIONAL)		+= rational.o
 
-obj-$(CONFIG_INT_POW_TEST)  += tests/int_pow_kunit.o
 obj-$(CONFIG_TEST_DIV64)	+= test_div64.o
 obj-$(CONFIG_TEST_MULDIV64)	+= test_mul_u64_u64_div_u64.o
-obj-$(CONFIG_RATIONAL_KUNIT_TEST) += rational-test.o
-obj-$(CONFIG_INT_SQRT_KUNIT_TEST) += tests/int_sqrt_kunit.o
\ No newline at end of file
+
+obj-y += tests/

lib/math/tests/Makefile +2 -1

index e1a79f093b2d..66b10a7f5a84 100644
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-obj-$(CONFIG_INT_POW_TEST) += int_pow_kunit.o
+obj-$(CONFIG_INT_POW_KUNIT_TEST)  += int_pow_kunit.o
+obj-$(CONFIG_RATIONAL_KUNIT_TEST) += rational_kunit.o
 obj-$(CONFIG_INT_SQRT_KUNIT_TEST) += int_sqrt_kunit.o

lib/math/tests/rational_kunit.c renamed from lib/math/rational-test.c +0 -0

similarity index 100%
rename from lib/math/rational-test.c
rename to lib/math/tests/rational_kunit.c

Signature · 1 line

2.34.1

Kees Cook

author maintainer

2025-02-11 00:31 UTC #2 lore raw

PATCH v2 2/6 lib/math: Add int_log test suite

From: Bruno Sobreira França <[email protected]>

This commit introduces KUnit tests for the intlog2 and intlog10 functions, which compute logarithms in base 2 and base 10, respectively. The tests cover a range of inputs to ensure the correctness of these functions across common and edge cases.

Signed-off-by Bruno Sobreira França <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Kees Cook <[email protected]>

---
 lib/Kconfig.debug              | 11 +++++
 lib/math/tests/Makefile        |  1 +
 lib/math/tests/int_log_kunit.c | 74 ++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 lib/math/tests/int_log_kunit.c

lib/Kconfig.debug +11 -0

index b18dbfc53ca4..f30929ed1a84 100644
@@ -3197,6 +3197,17 @@ config INT_SQRT_KUNIT_TEST
 
 	  If unsure, say N
 
+config INT_LOG_KUNIT_TEST
+        tristate "Integer log (int_log) test" if !KUNIT_ALL_TESTS
+        depends on KUNIT
+        default KUNIT_ALL_TESTS
+        help
+          This option enables the KUnit test suite for the int_log library, which
+          provides two functions to compute the integer logarithm in base 2 and
+          base 10, called respectively as intlog2 and intlog10.
+
+          If unsure, say N
+
 endif # RUNTIME_TESTING_MENU
 
 config ARCH_USE_MEMTEST

lib/math/tests/Makefile +1 -0

index 66b10a7f5a84..f139b73c65cb 100644
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 obj-$(CONFIG_INT_POW_KUNIT_TEST)  += int_pow_kunit.o
+obj-$(CONFIG_INT_LOG_KUNIT_TEST)  += int_log_kunit.o
 obj-$(CONFIG_RATIONAL_KUNIT_TEST) += rational_kunit.o
 obj-$(CONFIG_INT_SQRT_KUNIT_TEST) += int_sqrt_kunit.o

lib/math/tests/int_log_kunit.c new file +74 -0

74 lines not on this page · raw message

Signature · 1 line

2.34.1

Kees Cook

author maintainer

2025-02-11 00:31 UTC #3 lore raw

PATCH v2 3/6 lib: Move KUnit tests into tests/ subdirectory

Following from the recent KUnit file naming discussion[1], move all KUnit tests in lib/ into lib/tests/.

Link https://lore.kernel.org/lkml/[email protected]/ [1] open here

Acked-by Steven Rostedt (Google) <[email protected]>

Acked-by Jakub Kicinski <[email protected]>

Acked-by Masami Hiramatsu (Google) <[email protected]>

Acked-by Vlastimil Babka <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Kees Cook <[email protected]>

---
 MAINTAINERS                            | 19 ++++++------
 lib/Makefile                           | 39 +------------------------
 lib/tests/Makefile                     | 40 ++++++++++++++++++++++++++
 lib/{ => tests}/bitfield_kunit.c       |  0
 lib/{ => tests}/checksum_kunit.c       |  0
 lib/{ => tests}/cmdline_kunit.c        |  0
 lib/{ => tests}/cpumask_kunit.c        |  0
 lib/{ => tests}/crc_kunit.c            |  0
 lib/{ => tests}/fortify_kunit.c        |  0
 lib/{ => tests}/hashtable_test.c       |  0
 lib/{ => tests}/is_signed_type_kunit.c |  0
 lib/{ => tests}/kunit_iov_iter.c       |  0
 lib/{ => tests}/list-test.c            |  0
 lib/{ => tests}/memcpy_kunit.c         |  0
 lib/{ => tests}/overflow_kunit.c       |  0
 lib/{ => tests}/siphash_kunit.c        |  0
 lib/{ => tests}/slub_kunit.c           |  0
 lib/{ => tests}/stackinit_kunit.c      |  0
 lib/{ => tests}/string_helpers_kunit.c |  0
 lib/{ => tests}/string_kunit.c         |  0
 lib/{ => tests}/test_bits.c            |  0
 lib/{ => tests}/test_fprobe.c          |  0
 lib/{ => tests}/test_hash.c            |  0
 lib/{ => tests}/test_kprobes.c         |  0
 lib/{ => tests}/test_linear_ranges.c   |  0
 lib/{ => tests}/test_list_sort.c       |  0
 lib/{ => tests}/test_sort.c            |  0
 lib/{ => tests}/usercopy_kunit.c       |  0
 lib/{ => tests}/util_macros_kunit.c    |  0
 29 files changed, 51 insertions(+), 47 deletions(-)
 rename lib/{ => tests}/bitfield_kunit.c (100%)
 rename lib/{ => tests}/checksum_kunit.c (100%)
 rename lib/{ => tests}/cmdline_kunit.c (100%)
 rename lib/{ => tests}/cpumask_kunit.c (100%)
 rename lib/{ => tests}/crc_kunit.c (100%)
 rename lib/{ => tests}/fortify_kunit.c (100%)
 rename lib/{ => tests}/hashtable_test.c (100%)
 rename lib/{ => tests}/is_signed_type_kunit.c (100%)
 rename lib/{ => tests}/kunit_iov_iter.c (100%)
 rename lib/{ => tests}/list-test.c (100%)
 rename lib/{ => tests}/memcpy_kunit.c (100%)
 rename lib/{ => tests}/overflow_kunit.c (100%)
 rename lib/{ => tests}/siphash_kunit.c (100%)
 rename lib/{ => tests}/slub_kunit.c (100%)
 rename lib/{ => tests}/stackinit_kunit.c (100%)
 rename lib/{ => tests}/string_helpers_kunit.c (100%)
 rename lib/{ => tests}/string_kunit.c (100%)
 rename lib/{ => tests}/test_bits.c (100%)
 rename lib/{ => tests}/test_fprobe.c (100%)
 rename lib/{ => tests}/test_hash.c (100%)
 rename lib/{ => tests}/test_kprobes.c (100%)
 rename lib/{ => tests}/test_linear_ranges.c (100%)
 rename lib/{ => tests}/test_list_sort.c (100%)
 rename lib/{ => tests}/test_sort.c (100%)
 rename lib/{ => tests}/usercopy_kunit.c (100%)
 rename lib/{ => tests}/util_macros_kunit.c (100%)

MAINTAINERS +10 -9

index 25c86f47353d..78be36fb1a74 100644
@@ -4017,10 +4017,10 @@ F:	include/vdso/bits.h
 F:	lib/bitmap-str.c
 F:	lib/bitmap.c
 F:	lib/cpumask.c
-F:	lib/cpumask_kunit.c
 F:	lib/find_bit.c
 F:	lib/find_bit_benchmark.c
 F:	lib/test_bitmap.c
+F:	lib/tests/cpumask_kunit.c
 F:	tools/include/linux/bitfield.h
 F:	tools/include/linux/bitmap.h
 F:	tools/include/linux/bits.h

@@ -9065,9 +9065,10 @@ L:	[email protected]
 S:	Supported
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
 F:	include/linux/fortify-string.h
-F:	lib/fortify_kunit.c
-F:	lib/memcpy_kunit.c
 F:	lib/test_fortify/*
+F:	lib/tests/fortify_kunit.c
+F:	lib/tests/memcpy_kunit.c
+F:	scripts/test_fortify.sh
 K:	\bunsafe_memcpy\b
 K:	\b__NO_FORTIFY\b

@@ -9755,9 +9756,9 @@ F:	include/linux/string.h
 F:	include/linux/string_choices.h
 F:	include/linux/string_helpers.h
 F:	lib/string.c
-F:	lib/string_kunit.c
 F:	lib/string_helpers.c
-F:	lib/string_helpers_kunit.c
+F:	lib/tests/string_helpers_kunit.c
+F:	lib/tests/string_kunit.c
 F:	scripts/coccinelle/api/string_choices.cocci
 
 GENERIC UIO DRIVER FOR PCI DEVICES

@@ -12985,7 +12986,7 @@ F:	Documentation/trace/kprobes.rst
 F:	include/asm-generic/kprobes.h
 F:	include/linux/kprobes.h
 F:	kernel/kprobes.c
-F:	lib/test_kprobes.c
+F:	lib/tests/test_kprobes.c
 F:	samples/kprobes
 
 KS0108 LCD CONTROLLER DRIVER

@@ -13315,7 +13316,7 @@ M:	Mark Brown <[email protected]>
 R:	Matti Vaittinen <[email protected]>
 F:	include/linux/linear_range.h
 F:	lib/linear_ranges.c
-F:	lib/test_linear_ranges.c
+F:	lib/tests/test_linear_ranges.c
 
 LINUX FOR POWER MACINTOSH
 L:	[email protected]

@@ -13443,7 +13444,7 @@ M:	David Gow <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
-F:	lib/list-test.c
+F:	lib/tests/list-test.c
 
 LITEX PLATFORM
 M:	Karol Gugala <[email protected]>

@@ -21732,7 +21733,7 @@ M:	Jason A. Donenfeld <[email protected]>
 S:	Maintained
 F:	include/linux/siphash.h
 F:	lib/siphash.c
-F:	lib/siphash_kunit.c
+F:	lib/tests/siphash_kunit.c
 
 SIS 190 ETHERNET DRIVER
 M:	Francois Romieu <[email protected]>

lib/Makefile +1 ~~-38~~

index d5cfc7afbbb8..1e886482a6a3 100644
@@ -52,9 +52,7 @@ obj-y += bcd.o sort.o parser.o debug_locks.o random32.o \
 	 percpu-refcount.o rhashtable.o base64.o \
 	 once.o refcount.o rcuref.o usercopy.o errseq.o bucket_locks.o \
 	 generic-radix-tree.o bitmap-str.o
-obj-$(CONFIG_STRING_KUNIT_TEST) += string_kunit.o
 obj-y += string_helpers.o
-obj-$(CONFIG_STRING_HELPERS_KUNIT_TEST) += string_helpers_kunit.o
 obj-y += hexdump.o
 obj-$(CONFIG_TEST_HEXDUMP) += test_hexdump.o
 obj-y += kstrtox.o

@@ -65,22 +63,17 @@ obj-$(CONFIG_TEST_DHRY) += test_dhry.o
 obj-$(CONFIG_TEST_FIRMWARE) += test_firmware.o
 obj-$(CONFIG_TEST_BITOPS) += test_bitops.o
 CFLAGS_test_bitops.o += -Werror
-obj-$(CONFIG_CPUMASK_KUNIT_TEST) += cpumask_kunit.o
 obj-$(CONFIG_TEST_SYSCTL) += test_sysctl.o
-obj-$(CONFIG_TEST_IOV_ITER) += kunit_iov_iter.o
-obj-$(CONFIG_HASH_KUNIT_TEST) += test_hash.o
 obj-$(CONFIG_TEST_IDA) += test_ida.o
 obj-$(CONFIG_TEST_UBSAN) += test_ubsan.o
 CFLAGS_test_ubsan.o += $(call cc-disable-warning, vla)
 CFLAGS_test_ubsan.o += $(call cc-disable-warning, unused-but-set-variable)
 UBSAN_SANITIZE_test_ubsan.o := y
 obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o
-obj-$(CONFIG_TEST_LIST_SORT) += test_list_sort.o
 obj-$(CONFIG_TEST_MIN_HEAP) += test_min_heap.o
 obj-$(CONFIG_TEST_LKM) += test_module.o
 obj-$(CONFIG_TEST_VMALLOC) += test_vmalloc.o
 obj-$(CONFIG_TEST_RHASHTABLE) += test_rhashtable.o
-obj-$(CONFIG_TEST_SORT) += test_sort.o
 obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_keys.o
 obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_key_base.o
 obj-$(CONFIG_TEST_DYNAMIC_DEBUG) += test_dynamic_debug.o

@@ -98,7 +91,6 @@ obj-$(CONFIG_TEST_XARRAY) += test_xarray.o
 obj-$(CONFIG_TEST_MAPLE_TREE) += test_maple_tree.o
 obj-$(CONFIG_TEST_PARMAN) += test_parman.o
 obj-$(CONFIG_TEST_KMOD) += test_kmod.o
-obj-$(CONFIG_TEST_RUNTIME) += tests/
 obj-$(CONFIG_TEST_DEBUG_VIRTUAL) += test_debug_virtual.o
 obj-$(CONFIG_TEST_MEMCAT_P) += test_memcat_p.o
 obj-$(CONFIG_TEST_OBJAGG) += test_objagg.o

@@ -107,10 +99,7 @@ obj-$(CONFIG_TEST_MEMINIT) += test_meminit.o
 obj-$(CONFIG_TEST_LOCKUP) += test_lockup.o
 obj-$(CONFIG_TEST_HMM) += test_hmm.o
 obj-$(CONFIG_TEST_FREE_PAGES) += test_free_pages.o
-obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
 obj-$(CONFIG_TEST_REF_TRACKER) += test_ref_tracker.o
-CFLAGS_test_fprobe.o += $(CC_FLAGS_FTRACE)
-obj-$(CONFIG_FPROBE_SANITY_TEST) += test_fprobe.o
 obj-$(CONFIG_TEST_OBJPOOL) += test_objpool.o
 
 obj-$(CONFIG_TEST_FPU) += test_fpu.o

@@ -132,7 +121,7 @@ endif
 obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
 CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
 
-obj-y += math/ crypto/
+obj-y += math/ crypto/ tests/
 
 obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
 obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o

@@ -368,32 +357,6 @@ obj-$(CONFIG_OBJAGG) += objagg.o
 # pldmfw library
 obj-$(CONFIG_PLDMFW) += pldmfw/
 
-# KUnit tests
-CFLAGS_bitfield_kunit.o := $(DISABLE_STRUCTLEAK_PLUGIN)
-obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o
-obj-$(CONFIG_CHECKSUM_KUNIT) += checksum_kunit.o
-obj-$(CONFIG_UTIL_MACROS_KUNIT) += util_macros_kunit.o
-obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o
-obj-$(CONFIG_HASHTABLE_KUNIT_TEST) += hashtable_test.o
-obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o
-obj-$(CONFIG_BITS_TEST) += test_bits.o
-obj-$(CONFIG_CMDLINE_KUNIT_TEST) += cmdline_kunit.o
-obj-$(CONFIG_SLUB_KUNIT_TEST) += slub_kunit.o
-obj-$(CONFIG_MEMCPY_KUNIT_TEST) += memcpy_kunit.o
-obj-$(CONFIG_IS_SIGNED_TYPE_KUNIT_TEST) += is_signed_type_kunit.o
-CFLAGS_overflow_kunit.o = $(call cc-disable-warning, tautological-constant-out-of-range-compare)
-obj-$(CONFIG_OVERFLOW_KUNIT_TEST) += overflow_kunit.o
-CFLAGS_stackinit_kunit.o += $(call cc-disable-warning, switch-unreachable)
-obj-$(CONFIG_STACKINIT_KUNIT_TEST) += stackinit_kunit.o
-CFLAGS_fortify_kunit.o += $(call cc-disable-warning, unsequenced)
-CFLAGS_fortify_kunit.o += $(call cc-disable-warning, stringop-overread)
-CFLAGS_fortify_kunit.o += $(call cc-disable-warning, stringop-truncation)
-CFLAGS_fortify_kunit.o += $(DISABLE_STRUCTLEAK_PLUGIN)
-obj-$(CONFIG_FORTIFY_KUNIT_TEST) += fortify_kunit.o
-obj-$(CONFIG_CRC_KUNIT_TEST) += crc_kunit.o
-obj-$(CONFIG_SIPHASH_KUNIT_TEST) += siphash_kunit.o
-obj-$(CONFIG_USERCOPY_KUNIT_TEST) += usercopy_kunit.o
-
 obj-$(CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED) += devmem_is_allowed.o
 
 obj-$(CONFIG_FIRMWARE_TABLE) += fw_table.o

lib/tests/Makefile +40 -0

index 8e4f42cb9c54..c7b5170359c1 100644
@@ -1 +1,41 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for tests of kernel library functions.
+
+# KUnit tests
+CFLAGS_bitfield_kunit.o := $(DISABLE_STRUCTLEAK_PLUGIN)
+obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o
+obj-$(CONFIG_BITS_TEST) += test_bits.o
+obj-$(CONFIG_CHECKSUM_KUNIT) += checksum_kunit.o
+obj-$(CONFIG_CMDLINE_KUNIT_TEST) += cmdline_kunit.o
+obj-$(CONFIG_CPUMASK_KUNIT_TEST) += cpumask_kunit.o
+obj-$(CONFIG_CRC_KUNIT_TEST) += crc_kunit.o
+CFLAGS_fortify_kunit.o += $(call cc-disable-warning, unsequenced)
+CFLAGS_fortify_kunit.o += $(call cc-disable-warning, stringop-overread)
+CFLAGS_fortify_kunit.o += $(call cc-disable-warning, stringop-truncation)
+CFLAGS_fortify_kunit.o += $(DISABLE_STRUCTLEAK_PLUGIN)
+obj-$(CONFIG_FORTIFY_KUNIT_TEST) += fortify_kunit.o
+CFLAGS_test_fprobe.o += $(CC_FLAGS_FTRACE)
+obj-$(CONFIG_FPROBE_SANITY_TEST) += test_fprobe.o
+obj-$(CONFIG_HASHTABLE_KUNIT_TEST) += hashtable_test.o
+obj-$(CONFIG_HASH_KUNIT_TEST) += test_hash.o
+obj-$(CONFIG_TEST_IOV_ITER) += kunit_iov_iter.o
+obj-$(CONFIG_IS_SIGNED_TYPE_KUNIT_TEST) += is_signed_type_kunit.o
+obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
+obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o
+obj-$(CONFIG_TEST_LIST_SORT) += test_list_sort.o
+obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o
+obj-$(CONFIG_MEMCPY_KUNIT_TEST) += memcpy_kunit.o
+CFLAGS_overflow_kunit.o = $(call cc-disable-warning, tautological-constant-out-of-range-compare)
+obj-$(CONFIG_OVERFLOW_KUNIT_TEST) += overflow_kunit.o
+obj-$(CONFIG_SIPHASH_KUNIT_TEST) += siphash_kunit.o
+obj-$(CONFIG_SLUB_KUNIT_TEST) += slub_kunit.o
+obj-$(CONFIG_TEST_SORT) += test_sort.o
+CFLAGS_stackinit_kunit.o += $(call cc-disable-warning, switch-unreachable)
+obj-$(CONFIG_STACKINIT_KUNIT_TEST) += stackinit_kunit.o
+obj-$(CONFIG_STRING_KUNIT_TEST) += string_kunit.o
+obj-$(CONFIG_STRING_HELPERS_KUNIT_TEST) += string_helpers_kunit.o
+obj-$(CONFIG_USERCOPY_KUNIT_TEST) += usercopy_kunit.o
+obj-$(CONFIG_UTIL_MACROS_KUNIT) += util_macros_kunit.o
+
 obj-$(CONFIG_TEST_RUNTIME_MODULE)		+= module/

lib/tests/bitfield_kunit.c renamed from lib/bitfield_kunit.c +0 -0

similarity index 100%
rename from lib/bitfield_kunit.c
rename to lib/tests/bitfield_kunit.c

lib/tests/checksum_kunit.c renamed from lib/checksum_kunit.c +0 -0

similarity index 100%
rename from lib/checksum_kunit.c
rename to lib/tests/checksum_kunit.c

lib/tests/cmdline_kunit.c renamed from lib/cmdline_kunit.c +0 -0

similarity index 100%
rename from lib/cmdline_kunit.c
rename to lib/tests/cmdline_kunit.c

lib/tests/cpumask_kunit.c renamed from lib/cpumask_kunit.c +0 -0

similarity index 100%
rename from lib/cpumask_kunit.c
rename to lib/tests/cpumask_kunit.c

lib/tests/crc_kunit.c renamed from lib/crc_kunit.c +0 -0

similarity index 100%
rename from lib/crc_kunit.c
rename to lib/tests/crc_kunit.c

lib/tests/fortify_kunit.c renamed from lib/fortify_kunit.c +0 -0

similarity index 100%
rename from lib/fortify_kunit.c
rename to lib/tests/fortify_kunit.c

lib/tests/hashtable_test.c renamed from lib/hashtable_test.c +0 -0

similarity index 100%
rename from lib/hashtable_test.c
rename to lib/tests/hashtable_test.c

lib/tests/is_signed_type_kunit.c renamed from lib/is_signed_type_kunit.c +0 -0

similarity index 100%
rename from lib/is_signed_type_kunit.c
rename to lib/tests/is_signed_type_kunit.c

lib/tests/kunit_iov_iter.c renamed from lib/kunit_iov_iter.c +0 -0

similarity index 100%
rename from lib/kunit_iov_iter.c
rename to lib/tests/kunit_iov_iter.c

lib/tests/list-test.c renamed from lib/list-test.c +0 -0

similarity index 100%
rename from lib/list-test.c
rename to lib/tests/list-test.c

lib/tests/memcpy_kunit.c renamed from lib/memcpy_kunit.c +0 -0

similarity index 100%
rename from lib/memcpy_kunit.c
rename to lib/tests/memcpy_kunit.c

lib/tests/overflow_kunit.c renamed from lib/overflow_kunit.c +0 -0

similarity index 100%
rename from lib/overflow_kunit.c
rename to lib/tests/overflow_kunit.c

lib/tests/siphash_kunit.c renamed from lib/siphash_kunit.c +0 -0

similarity index 100%
rename from lib/siphash_kunit.c
rename to lib/tests/siphash_kunit.c

lib/tests/slub_kunit.c renamed from lib/slub_kunit.c +0 -0

similarity index 100%
rename from lib/slub_kunit.c
rename to lib/tests/slub_kunit.c

lib/tests/stackinit_kunit.c renamed from lib/stackinit_kunit.c +0 -0

similarity index 100%
rename from lib/stackinit_kunit.c
rename to lib/tests/stackinit_kunit.c

lib/tests/string_helpers_kunit.c renamed from lib/string_helpers_kunit.c +0 -0

similarity index 100%
rename from lib/string_helpers_kunit.c
rename to lib/tests/string_helpers_kunit.c

lib/tests/string_kunit.c renamed from lib/string_kunit.c +0 -0

similarity index 100%
rename from lib/string_kunit.c
rename to lib/tests/string_kunit.c

lib/tests/test_bits.c renamed from lib/test_bits.c +0 -0

similarity index 100%
rename from lib/test_bits.c
rename to lib/tests/test_bits.c

lib/tests/test_fprobe.c renamed from lib/test_fprobe.c +0 -0

similarity index 100%
rename from lib/test_fprobe.c
rename to lib/tests/test_fprobe.c

lib/tests/test_hash.c renamed from lib/test_hash.c +0 -0

similarity index 100%
rename from lib/test_hash.c
rename to lib/tests/test_hash.c

lib/tests/test_kprobes.c renamed from lib/test_kprobes.c +0 -0

similarity index 100%
rename from lib/test_kprobes.c
rename to lib/tests/test_kprobes.c

lib/tests/test_linear_ranges.c renamed from lib/test_linear_ranges.c +0 -0

similarity index 100%
rename from lib/test_linear_ranges.c
rename to lib/tests/test_linear_ranges.c

lib/tests/test_list_sort.c renamed from lib/test_list_sort.c +0 -0

similarity index 100%
rename from lib/test_list_sort.c
rename to lib/tests/test_list_sort.c

lib/tests/test_sort.c renamed from lib/test_sort.c +0 -0

similarity index 100%
rename from lib/test_sort.c
rename to lib/tests/test_sort.c

lib/tests/usercopy_kunit.c renamed from lib/usercopy_kunit.c +0 -0

similarity index 100%
rename from lib/usercopy_kunit.c
rename to lib/tests/usercopy_kunit.c

lib/tests/util_macros_kunit.c renamed from lib/util_macros_kunit.c +0 -0

similarity index 100%
rename from lib/util_macros_kunit.c
rename to lib/tests/util_macros_kunit.c

Signature · 1 line

2.34.1

Kees Cook

author maintainer

2025-02-11 00:31 UTC #4 lore raw

PATCH v2 4/6 lib/tests/kfifo_kunit.c: add tests for the kfifo structure

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/lib/list-test.c?h=v6.11-rc6
[2] https://lore.kernel.org/all/[email protected]/

From: Diego Vieira <[email protected]>

Add KUnit tests for the kfifo data structure. They test the vast majority of macros defined in the kfifo header (include/linux/kfifo.h).

These are inspired by the existing tests for the doubly linked list in lib/tests/list-test.c (previously at lib/list-test.c) [1].

Note that this patch depends on the patch that moves the KUnit tests on lib/ into lib/tests/ [2].

Signed-off-by Diego Vieira <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Kees Cook <[email protected]>

---
 lib/Kconfig.debug       |  14 +++
 lib/tests/Makefile      |   1 +
 lib/tests/kfifo_kunit.c | 224 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 239 insertions(+)
 create mode 100644 lib/tests/kfifo_kunit.c

lib/Kconfig.debug +14 -0

index f30929ed1a84..86ddf568cbca 100644
@@ -2691,6 +2691,20 @@ config SYSCTL_KUNIT_TEST
 
 	  If unsure, say N.
 
+config KFIFO_KUNIT_TEST
+	tristate "KUnit Test for the generic kernel FIFO implementation" if !KUNIT_ALL_TESTS
+	depends on KUNIT
+	default KUNIT_ALL_TESTS
+	help
+	  This builds the generic FIFO implementation KUnit test suite.
+	  It tests that the API and basic functionality of the kfifo type
+	  and associated macros.
+
+	  For more information on KUnit and unit tests in general please refer
+	  to the KUnit documentation in Documentation/dev-tools/kunit/.
+
+	  If unsure, say N.
+
 config LIST_KUNIT_TEST
 	tristate "KUnit Test for Kernel Linked-list structures" if !KUNIT_ALL_TESTS
 	depends on KUNIT

lib/tests/Makefile +1 -0

index c7b5170359c1..8696d778d92f 100644
@@ -23,6 +23,7 @@ obj-$(CONFIG_TEST_IOV_ITER) += kunit_iov_iter.o
 obj-$(CONFIG_IS_SIGNED_TYPE_KUNIT_TEST) += is_signed_type_kunit.o
 obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
 obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o
+obj-$(CONFIG_KFIFO_KUNIT_TEST) += kfifo_kunit.o
 obj-$(CONFIG_TEST_LIST_SORT) += test_list_sort.o
 obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o
 obj-$(CONFIG_MEMCPY_KUNIT_TEST) += memcpy_kunit.o

lib/tests/kfifo_kunit.c new file +224 -0

224 lines not on this page · raw message

Signature · 1 line

2.34.1

Kees Cook

author maintainer

2025-02-11 00:31 UTC #5 lore raw

PATCH v2 5/6 unicode: kunit: refactor selftest to kunit tests

From: Gabriela Bittencourt <[email protected]>

Refactoring 'test' functions into kunit tests, to test utf-8 support in unicode subsystem.

This allows the utf8 tests to be run alongside the KUnit test suite using kunit-tool, quickly compiling and running all desired tests as part of the KUnit test suite, instead of compiling the selftest module and loading it.

The refactoring kept the original testing logic intact, while adopting a testing pattern across different kernel modules and leveraging KUnit's benefits.

Co-developed-by Pedro Orlando <[email protected]>

Signed-off-by Pedro Orlando <[email protected]>

Co-developed-by Danilo Pereira <[email protected]>

Signed-off-by Danilo Pereira <[email protected]>

Signed-off-by Gabriela Bittencourt <[email protected]>

Acked-by Gabriel Krisman Bertazi <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Kees Cook <[email protected]>

---
 fs/unicode/.kunitconfig    |   3 +
 fs/unicode/Kconfig         |   5 +-
 fs/unicode/Makefile        |   2 +-
 fs/unicode/utf8-norm.c     |   2 +-
 fs/unicode/utf8-selftest.c | 149 +++++++++++++++++--------------------
 5 files changed, 77 insertions(+), 84 deletions(-)
 create mode 100644 fs/unicode/.kunitconfig

fs/unicode/.kunitconfig new file +3 -0

new file mode 100644
index 000000000000..62dd5c171f9c
@@ -0,0 +1,3 @@
+CONFIG_KUNIT=y
+CONFIG_UNICODE=y
+CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST=y

fs/unicode/Kconfig +3 -2

index da786a687fdc..4ad2c36550f1 100644
@@ -10,6 +10,7 @@ config UNICODE
 	  be a separate loadable module that gets requested only when a file
 	  system actually use it.
 
-config UNICODE_NORMALIZATION_SELFTEST
+config UNICODE_NORMALIZATION_KUNIT_TEST
 	tristate "Test UTF-8 normalization support"
-	depends on UNICODE
+	depends on UNICODE && KUNIT
+	default KUNIT_ALL_TESTS

fs/unicode/Makefile +1 -1

index e309afe2b2bb..37bbcbc628a1 100644
@@ -4,7 +4,7 @@ ifneq ($(CONFIG_UNICODE),)
 obj-y			+= unicode.o
 endif
 obj-$(CONFIG_UNICODE)	+= utf8data.o
-obj-$(CONFIG_UNICODE_NORMALIZATION_SELFTEST) += utf8-selftest.o
+obj-$(CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST) += utf8-selftest.o
 
 unicode-y := utf8-norm.o utf8-core.o

fs/unicode/utf8-norm.c +1 -1

index 768f8ab448b8..7b998c99c88d 100644
@@ -586,7 +586,7 @@ int utf8byte(struct utf8cursor *u8c)
 	}
 }
 
-#ifdef CONFIG_UNICODE_NORMALIZATION_SELFTEST_MODULE
+#if IS_MODULE(CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST)
 EXPORT_SYMBOL_GPL(utf8version_is_supported);
 EXPORT_SYMBOL_GPL(utf8nlen);
 EXPORT_SYMBOL_GPL(utf8ncursor);

fs/unicode/utf8-selftest.c +69 ~~-80~~

243 lines not on this page · raw message

Signature · 1 line

2.34.1

Kees Cook

author maintainer

2025-02-11 00:31 UTC #6 lore raw

PATCH v2 6/6 unicode: kunit: change tests filename and path

From: Gabriela Bittencourt <[email protected]>

Change utf8 kunit test filename and path to follow the style convention on Documentation/dev-tools/kunit/style.rst

Co-developed-by Pedro Orlando <[email protected]>

Signed-off-by Pedro Orlando <[email protected]>

Co-developed-by Danilo Pereira <[email protected]>

Signed-off-by Danilo Pereira <[email protected]>

Signed-off-by Gabriela Bittencourt <[email protected]>

Acked-by Gabriel Krisman Bertazi <[email protected]>

Reviewed-by Shuah Khan <[email protected]>

https://lore.kernel.org/lkml/[email protected]/T/#m2e2ddb3b2600274e5eae50b93ea821914dc85f20

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Kees Cook <[email protected]>

---
 fs/unicode/Makefile                                | 2 +-
 fs/unicode/{ => tests}/.kunitconfig                | 0
 fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename fs/unicode/{ => tests}/.kunitconfig (100%)
 rename fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} (100%)

fs/unicode/Makefile +1 -1

index 37bbcbc628a1..d95be7fb9f6b 100644
@@ -4,7 +4,7 @@ ifneq ($(CONFIG_UNICODE),)
 obj-y			+= unicode.o
 endif
 obj-$(CONFIG_UNICODE)	+= utf8data.o
-obj-$(CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST) += utf8-selftest.o
+obj-$(CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST) += tests/utf8_kunit.o
 
 unicode-y := utf8-norm.o utf8-core.o

fs/unicode/tests/.kunitconfig renamed from fs/unicode/.kunitconfig +0 -0

similarity index 100%
rename from fs/unicode/.kunitconfig
rename to fs/unicode/tests/.kunitconfig

fs/unicode/tests/utf8_kunit.c renamed from fs/unicode/utf8-selftest.c +0 -0

similarity index 100%
rename from fs/unicode/utf8-selftest.c
rename to fs/unicode/tests/utf8_kunit.c

Signature · 1 line

2.34.1

Gabriel Krisman Bertazi

2025-02-12 15:40 UTC #7 lore raw

Re: [PATCH v2 6/6] unicode: kunit: change tests filename and path

Quoted 5 lines · Kees Cook

From: Gabriela Bittencourt <[email protected]>
Change utf8 kunit test filename and path to follow the style convention on Documentation/dev-tools/kunit/style.rst

Quoted 11 lines

Co-developed-by Pedro Orlando <[email protected]>
Signed-off-by Pedro Orlando <[email protected]>
Co-developed-by Danilo Pereira <[email protected]>
Signed-off-by Danilo Pereira <[email protected]>
Signed-off-by Gabriela Bittencourt <[email protected]>
Reviewed-by David Gow <[email protected]>
Acked-by Gabriel Krisman Bertazi <[email protected]>
Reviewed-by Shuah Khan <[email protected]>
Reviewed-by Rae Moar <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Kees Cook <[email protected]>

Hi Kees,

Last time this was submitted, I have reported this patch breaks the build when the kunit is built as a module, and it wasn't fixed before resubmission. Thorsten Leemhuis just reported the same issue is now on linux-next and I confirmed it is still there.

The build error is:

fs/unicode/tests/utf8_kunit.c:11:10: fatal error: utf8n.h: No such file or directory
11 | #include "utf8n.h"

      |          ^~~~~~~~~

The problem is that the patch moves utf8_kunit.c into tests/ but doesn't fix the include line above. Can you fix it in your tree since it is already merged?

Thanks,

Quoted 29 lines

---
 fs/unicode/Makefile                                | 2 +-
 fs/unicode/{ => tests}/.kunitconfig                | 0
 fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename fs/unicode/{ => tests}/.kunitconfig (100%)
 rename fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} (100%)

fs/unicode/Makefile +1 -1

index 37bbcbc628a1..d95be7fb9f6b 100644
@@ -4,7 +4,7 @@ ifneq ($(CONFIG_UNICODE),)
 obj-y			+= unicode.o
 endif
 obj-$(CONFIG_UNICODE)	+= utf8data.o
-obj-$(CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST) += utf8-selftest.o
+obj-$(CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST) += tests/utf8_kunit.o
 
 unicode-y := utf8-norm.o utf8-core.o

fs/unicode/tests/.kunitconfig renamed from fs/unicode/.kunitconfig +0 -0

similarity index 100%
rename from fs/unicode/.kunitconfig
rename to fs/unicode/tests/.kunitconfig

fs/unicode/tests/utf8_kunit.c renamed from fs/unicode/utf8-selftest.c +0 -0

similarity index 100%
rename from fs/unicode/utf8-selftest.c
rename to fs/unicode/tests/utf8_kunit.c

Signature · 1 line

Gabriel Krisman Bertazi

Kees Cook

author maintainer

2025-02-12 22:01 UTC #8 lore raw

Re: [PATCH v2 6/6] unicode: kunit: change tests filename and path

Quoted 30 lines · Gabriel Krisman Bertazi

Quoted 5 lines · Kees Cook
From: Gabriela Bittencourt <[email protected]>
Change utf8 kunit test filename and path to follow the style convention on Documentation/dev-tools/kunit/style.rst
Quoted 11 lines
Co-developed-by Pedro Orlando <[email protected]>
Signed-off-by Pedro Orlando <[email protected]>
Co-developed-by Danilo Pereira <[email protected]>
Signed-off-by Danilo Pereira <[email protected]>
Signed-off-by Gabriela Bittencourt <[email protected]>
Reviewed-by David Gow <[email protected]>
Acked-by Gabriel Krisman Bertazi <[email protected]>
Reviewed-by Shuah Khan <[email protected]>
Reviewed-by Rae Moar <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Kees Cook <[email protected]>
Hi Kees,
Last time this was submitted, I have reported this patch breaks the build when the kunit is built as a module, and it wasn't fixed before resubmission. Thorsten Leemhuis just reported the same issue is now on linux-next and I confirmed it is still there.
https://lore.kernel.org/lkml/[email protected]/T/#m2e2ddb3b2600274e5eae50b93ea821914dc85f20
The build error is:

Quoted 7 lines

fs/unicode/tests/utf8_kunit.c:11:10: fatal error: utf8n.h: No such file or directory
11 | #include "utf8n.h"
      |          ^~~~~~~~~
The problem is that the patch moves utf8_kunit.c into tests/ but doesn't fix the include line above. Can you fix it in your tree since it is already merged?

Ah-ha! Thanks. Yes, I've updated this now.

-Kees

Quoted 35 lines

Thanks,

Quoted 29 lines

---
 fs/unicode/Makefile                                | 2 +-
 fs/unicode/{ => tests}/.kunitconfig                | 0
 fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename fs/unicode/{ => tests}/.kunitconfig (100%)
 rename fs/unicode/{utf8-selftest.c => tests/utf8_kunit.c} (100%)

fs/unicode/Makefile +1 -1

index 37bbcbc628a1..d95be7fb9f6b 100644
@@ -4,7 +4,7 @@ ifneq ($(CONFIG_UNICODE),)
 obj-y			+= unicode.o
 endif
 obj-$(CONFIG_UNICODE)	+= utf8data.o
-obj-$(CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST) += utf8-selftest.o
+obj-$(CONFIG_UNICODE_NORMALIZATION_KUNIT_TEST) += tests/utf8_kunit.o
 
 unicode-y := utf8-norm.o utf8-core.o

fs/unicode/tests/.kunitconfig renamed from fs/unicode/.kunitconfig +0 -0

similarity index 100%
rename from fs/unicode/.kunitconfig
rename to fs/unicode/tests/.kunitconfig

fs/unicode/tests/utf8_kunit.c renamed from fs/unicode/utf8-selftest.c +0 -0

similarity index 100%
rename from fs/unicode/utf8-selftest.c
rename to fs/unicode/tests/utf8_kunit.c

Signature · 1 line

Gabriel Krisman Bertazi

Signature · 1 line

Kees Cook

Andrew Morton

maintainer

2025-02-11 01:11 UTC #9 lore raw

Quoted 2 lines · On Mon, 10 Feb 2025 16:31:28 -0800 Kees Cook <[email protected]> wrote:

This is rebased to v6.14-rc2. I'll carry it and folks can send me new tests, etc, as needed to minimize future collisions.

Actually seems designed to maximize collisions.

I'll drop ("lib/math: add Kunit test suite for gcd()")
https://lore.kernel.org/all/0eaf6b69aeb2fe35092a633fed12537efe645303.1727332572.git.zhengqi.arch@bytedance.com/T/#u.

Kees Cook

author maintainer

2025-02-11 02:05 UTC #10 lore raw

Quoted 6 lines · Andrew Morton

Quoted 2 lines · On Mon, 10 Feb 2025 16:31:28 -0800 Kees Cook <[email protected]> wrote:
This is rebased to v6.14-rc2. I'll carry it and folks can send me new tests, etc, as needed to minimize future collisions.
Actually seems designed to maximize collisions.

Eek, that's not my intent!

Quoted 2 lines

I'll drop ("lib/math: add Kunit test suite for gcd()")
https://lore.kernel.org/all/0eaf6b69aeb2fe35092a633fed12537efe645303.1727332572.git.zhengqi.arch@bytedance.com/T/#u.

I will pick that up?

Signature · 1 line

Kees Cook

David Gow

2025-02-11 07:16 UTC #11 lore raw