- Linux-kselftest-mirror - lists.linaro.org

[GIT PULL] Kselftest next update for Linux 5.10-rc1

by Shuah Khan

Hi Linus, Please pull the following Kselftest next update for Linux 5.10-rc1 This kselftest update for Linux 5.10-rc1 consists of enhancements to -- speed up headers_install done during selftest build -- add generic make nesting support -- add support to select individual tests: - Selftests build/install generates run_kselftest.sh script to run selftests on a target system. Currently the script doesn't have support for selecting individual tests. Add support for it. With this enhancement, user can select test collections (or tests) individually. e.g: run_kselftest.sh -c seccomp -t timers:posix_timers -t timers:nanosleep Additionally adds a way to list all known tests with "-l", usage with "-h", and perform a dry run without running tests with "-n". diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5: Linux 5.9-rc1 (2020-08-16 13:04:57 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-next-5.10-rc1 for you to fetch changes up to 4c8511317b4ec75cc3868f80a7b9fddb8322e512: doc: dev-tools: kselftest.rst: Update examples and paths (2020-10-07 07:59:24 -0600) ---------------------------------------------------------------- linux-kselftest-next-5.10-rc1 This kselftest update for Linux 5.10-rc1 consists of enhancements to -- speed up headers_install done during selftest build -- add generic make nesting support -- add support to select individual tests: - Selftests build/install generates run_kselftest.sh script to run selftests on a target system. Currently the script doesn't have support for selecting individual tests. Add support for it. With this enhancement, user can select test collections (or tests) individually. e.g: run_kselftest.sh -c seccomp -t timers:posix_timers -t timers:nanosleep Additionally adds a way to list all known tests with "-l", usage with "-h", and perform a dry run without running tests with "-n". ---------------------------------------------------------------- Denys Vlasenko (1): selftests: use "$(MAKE)" instead of "make" for headers_install Gabriel Krisman Bertazi (1): selftests: Add missing gitignore entries Greg Thelen (1): selftests: more general make nesting support Kees Cook (3): selftests: Extract run_kselftest.sh and generate stand-alone test list selftests/run_kselftest.sh: Make each test individually selectable doc: dev-tools: kselftest.rst: Update examples and paths Documentation/dev-tools/kselftest.rst | 35 +++++++---- tools/testing/selftests/Makefile | 34 ++++------ tools/testing/selftests/firmware/.gitignore | 2 + tools/testing/selftests/lib.mk | 9 ++- tools/testing/selftests/netfilter/.gitignore | 2 + tools/testing/selftests/ptrace/.gitignore | 1 + tools/testing/selftests/run_kselftest.sh | 93 ++++++++++++++++++++++++++++ 7 files changed, 135 insertions(+), 41 deletions(-) create mode 100644 tools/testing/selftests/firmware/.gitignore create mode 100644 tools/testing/selftests/netfilter/.gitignore create mode 100755 tools/testing/selftests/run_kselftest.sh ----------------------------------------------------------------

4 years, 6 months

2
1
0 0

[PATCH v2 0/3] Extract run_kselftest.sh and generate stand-alone test list

by Kees Cook

v2: - update documentation - include SPDX line in extracted script v1: https://lore.kernel.org/linux-kselftest/20200925234527.1885234-1-keescook@c… Hi! I really like Hangbin Liu's intent[1] but I think we need to be a little more clean about the implementation. This extracts run_kselftest.sh from the Makefile so it can actually be changed without embeds, etc. Instead, generate the test list into a text file. Everything gets much simpler. :) And in patch 2, I add back Hangbin Liu's new options (with some extra added) with knowledge of "collections" (i.e. Makefile TARGETS) and subtests. This should work really well with LAVA too, which needs to manipulate the lists of tests being run. Thoughts? -Kees [1] https://lore.kernel.org/lkml/20200914022227.437143-1-liuhangbin@gmail.com/ Kees Cook (3): selftests: Extract run_kselftest.sh and generate stand-alone test list selftests/run_kselftest.sh: Make each test individually selectable doc: dev-tools: kselftest.rst: Update examples and paths Documentation/dev-tools/kselftest.rst | 35 +++++---- tools/testing/selftests/Makefile | 26 ++----- tools/testing/selftests/lib.mk | 5 +- tools/testing/selftests/run_kselftest.sh | 93 ++++++++++++++++++++++++ 4 files changed, 124 insertions(+), 35 deletions(-) create mode 100755 tools/testing/selftests/run_kselftest.sh -- 2.25.1

4 years, 6 months

3
11
0 0

[PATCH v1] lib/test_list: Follow existing pattern for a file name

by Andy Shevchenko

Test in lib/ either KUnit or not are named in the same pattern, i.e. test_*.c, except few ones. Rename list-test.c to test_list.c to follow this pattern. Note, current documentation doesn't specify any file name conventions, and we glad to stick with a current one in the subsystem. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- lib/Makefile | 4 ++-- lib/{list-test.c => test_list.c} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename lib/{list-test.c => test_list.c} (100%) diff --git a/lib/Makefile b/lib/Makefile index 5ca03ba6ee45..e71abeea4a3e 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -350,6 +350,6 @@ obj-$(CONFIG_PLDMFW) += pldmfw/ # KUnit tests obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o -obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o -obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o obj-$(CONFIG_BITS_TEST) += test_bits.o +obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o +obj-$(CONFIG_LIST_KUNIT_TEST) += test_list.o diff --git a/lib/list-test.c b/lib/test_list.c similarity index 100% rename from lib/list-test.c rename to lib/test_list.c -- 2.28.0

4 years, 6 months

1
1
0 0

[PATCH v2] lib: kunit: add list_sort test conversion to KUnit

by Vitor Massaru Iha

This adds the conversion of the runtime tests of test_list_sort, from `lib/test_list_sort.c` to KUnit tests. Signed-off-by: Vitor Massaru Iha <vitor(a)massaru.org> --- v2: * fix KUNIT_TEST sufix; * make kconfig help more concise; * remove obsolete commit comments; * change Kconfig entries to be more adherent to KUnit documentation; --- lib/Kconfig.debug | 24 ++++--- lib/Makefile | 2 +- lib/{test_list_sort.c => list_sort_kunit.c} | 73 +++++++++++---------- 3 files changed, 53 insertions(+), 46 deletions(-) rename lib/{test_list_sort.c => list_sort_kunit.c} (62%) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 4f09c6505a2e..b4b1338c523a 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1905,16 +1905,6 @@ config LKDTM Documentation on how to use the module can be found in Documentation/fault-injection/provoke-crashes.rst -config TEST_LIST_SORT - tristate "Linked list sorting test" - depends on DEBUG_KERNEL || m - help - Enable this to turn on 'list_sort()' function test. This test is - executed only once during system boot (so affects only boot time), - or at module load time. - - If unsure, say N. - config TEST_MIN_HEAP tristate "Min heap test" depends on DEBUG_KERNEL || m @@ -2233,6 +2223,20 @@ config LIST_KUNIT_TEST If unsure, say N. +config LIST_SORT_KUNIT_TEST + tristate "KUnit Linked list sorting test" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + help + Enable this to turn on 'list_sort()' function test. This test is + executed only once during system boot (so affects only boot time), + or at module load time. + + 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 LINEAR_RANGES_TEST tristate "KUnit test for linear_ranges" depends on KUNIT diff --git a/lib/Makefile b/lib/Makefile index d862d41fdc3d..a00e26d34263 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -67,7 +67,6 @@ obj-$(CONFIG_TEST_UBSAN) += test_ubsan.o CFLAGS_test_ubsan.o += $(call cc-disable-warning, vla) 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 @@ -341,5 +340,6 @@ obj-$(CONFIG_PLDMFW) += pldmfw/ # KUnit tests obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o +obj-$(CONFIG_LIST_SORT_KUNIT_TEST) += list_sort_kunit.o obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o obj-$(CONFIG_BITS_TEST) += test_bits.o diff --git a/lib/test_list_sort.c b/lib/list_sort_kunit.c similarity index 62% rename from lib/test_list_sort.c rename to lib/list_sort_kunit.c index 1f017d3b610e..20cbacbb7d6c 100644 --- a/lib/test_list_sort.c +++ b/lib/list_sort_kunit.c @@ -1,13 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-only -#define pr_fmt(fmt) "list_sort_test: " fmt +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#include <linux/kernel.h> #include <linux/list_sort.h> #include <linux/list.h> -#include <linux/module.h> -#include <linux/printk.h> -#include <linux/slab.h> #include <linux/random.h> +#include <kunit/test.h> /* * The pattern of set bits in the list length determines which cases @@ -29,28 +26,28 @@ struct debug_el { /* Array, containing pointers to all elements in the test list */ static struct debug_el **elts __initdata; -static int __init check(struct debug_el *ela, struct debug_el *elb) +static int __init check(struct kunit *context, struct debug_el *ela, struct debug_el *elb) { if (ela->serial >= TEST_LIST_LEN) { - pr_err("error: incorrect serial %d\n", ela->serial); + KUNIT_FAIL(context, "incorrect serial %d", ela->serial); return -EINVAL; } if (elb->serial >= TEST_LIST_LEN) { - pr_err("error: incorrect serial %d\n", elb->serial); + KUNIT_FAIL(context, "incorrect serial %d", elb->serial); return -EINVAL; } if (elts[ela->serial] != ela || elts[elb->serial] != elb) { - pr_err("error: phantom element\n"); + KUNIT_FAIL(context, "phantom element"); return -EINVAL; } if (ela->poison1 != TEST_POISON1 || ela->poison2 != TEST_POISON2) { - pr_err("error: bad poison: %#x/%#x\n", - ela->poison1, ela->poison2); + KUNIT_FAIL(context, "bad poison: %#x/%#x", + ela->poison1, ela->poison2); return -EINVAL; } if (elb->poison1 != TEST_POISON1 || elb->poison2 != TEST_POISON2) { - pr_err("error: bad poison: %#x/%#x\n", - elb->poison1, elb->poison2); + KUNIT_FAIL(context, "bad poison: %#x/%#x", + elb->poison1, elb->poison2); return -EINVAL; } return 0; @@ -63,27 +60,26 @@ static int __init cmp(void *priv, struct list_head *a, struct list_head *b) ela = container_of(a, struct debug_el, list); elb = container_of(b, struct debug_el, list); - check(ela, elb); + check(priv, ela, elb); return ela->value - elb->value; } -static int __init list_sort_test(void) +static void __init test_list_sort(struct kunit *context) { - int i, count = 1, err = -ENOMEM; + int i, count = 1; struct debug_el *el; struct list_head *cur; LIST_HEAD(head); - pr_debug("start testing list_sort()\n"); - elts = kcalloc(TEST_LIST_LEN, sizeof(*elts), GFP_KERNEL); - if (!elts) - return err; + KUNIT_ASSERT_FALSE_MSG(context, elts == NULL, "kcalloc failed"); for (i = 0; i < TEST_LIST_LEN; i++) { el = kmalloc(sizeof(*el), GFP_KERNEL); - if (!el) + if (!el) { + KUNIT_FAIL(context, "kmalloc failed"); goto exit; + } /* force some equivalencies */ el->value = prandom_u32() % (TEST_LIST_LEN / 3); @@ -94,55 +90,62 @@ static int __init list_sort_test(void) list_add_tail(&el->list, &head); } - list_sort(NULL, &head, cmp); + list_sort(context, &head, cmp); - err = -EINVAL; for (cur = head.next; cur->next != &head; cur = cur->next) { struct debug_el *el1; int cmp_result; if (cur->next->prev != cur) { - pr_err("error: list is corrupted\n"); + KUNIT_FAIL(context, "list is corrupted"); goto exit; } - cmp_result = cmp(NULL, cur, cur->next); + cmp_result = cmp(context, cur, cur->next); if (cmp_result > 0) { - pr_err("error: list is not sorted\n"); + KUNIT_FAIL(context, "list is not sorted"); goto exit; } el = container_of(cur, struct debug_el, list); el1 = container_of(cur->next, struct debug_el, list); if (cmp_result == 0 && el->serial >= el1->serial) { - pr_err("error: order of equivalent elements not " - "preserved\n"); + KUNIT_FAIL(context, "order of equivalent elements not preserved"); goto exit; } - if (check(el, el1)) { - pr_err("error: element check failed\n"); + if (check(context, el, el1)) { goto exit; } count++; } if (head.prev != cur) { - pr_err("error: list is corrupted\n"); + KUNIT_FAIL(context, "list is corrupted"); goto exit; } if (count != TEST_LIST_LEN) { - pr_err("error: bad list length %d", count); + KUNIT_FAIL(context, "bad list length %d", count); goto exit; } - err = 0; exit: for (i = 0; i < TEST_LIST_LEN; i++) kfree(elts[i]); kfree(elts); - return err; } -module_init(list_sort_test); + +static struct kunit_case __refdata list_sort_test_cases[] = { + KUNIT_CASE(test_list_sort), + {} +}; + +static struct kunit_suite list_sort_test_suite = { + .name = "list-sort", + .test_cases = list_sort_test_cases, +}; + +kunit_test_suites(&list_sort_test_suite); + MODULE_LICENSE("GPL"); base-commit: d2585f5164c298aaaed14c2c8d313cbe7bd5b253 -- 2.26.2

4 years, 6 months

2
6
0 0

[PATCH] lib: kunit: add test_min_heap test conversion to KUnit

by Vitor Massaru Iha

This adds the conversion of the runtime tests of test_min_heap, from `lib/test_min_heap.c` to KUnit tests. Please apply this commit first (linux-kselftest/kunit-fixes): 3f37d14b8a3152441f36b6bc74000996679f0998 kunit: kunit_config: Fix parsing of CONFIG options with space Signed-off-by: Vitor Massaru Iha <vitor(a)massaru.org> --- lib/Kconfig.debug | 29 ++++-- lib/Makefile | 2 +- lib/{test_min_heap.c => min_heap_kunit.c} | 117 ++++++++++++---------- 3 files changed, 83 insertions(+), 65 deletions(-) rename lib/{test_min_heap.c => min_heap_kunit.c} (60%) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 9ad9210d70a1..46674fc4972c 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1864,16 +1864,6 @@ config TEST_LIST_SORT If unsure, say N. -config TEST_MIN_HEAP - tristate "Min heap test" - depends on DEBUG_KERNEL || m - help - Enable this to turn on min heap function tests. This test is - executed only once during system boot (so affects only boot time), - or at module load time. - - If unsure, say N. - config TEST_SORT tristate "Array-based sort test" depends on DEBUG_KERNEL || m @@ -2185,6 +2175,25 @@ config LINEAR_RANGES_TEST If unsure, say N. +config MIN_HEAP_KUNIT + tristate "KUnit test for Min heap" + depends on KUNIT + depends on DEBUG_KERNEL || m + help + Enable this to turn on min heap function tests. This test is + executed only once during system boot (so affects only boot time), + or at module load time. + + KUnit tests run during boot and output the results to the debug log + in TAP format (http://testanything.org/). Only useful for kernel devs + running the KUnit test harness, and not intended for inclusion into a + production build. + + 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 TEST_UDELAY tristate "udelay test driver" help diff --git a/lib/Makefile b/lib/Makefile index b1c42c10073b..748f57063160 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -72,7 +72,6 @@ CFLAGS_test_ubsan.o += $(call cc-disable-warning, vla) 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_OVERFLOW) += test_overflow.o @@ -318,3 +317,4 @@ obj-$(CONFIG_OBJAGG) += objagg.o # KUnit tests obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o +obj-$(CONFIG_MIN_HEAP_KUNIT) += min_heap_kunit.o diff --git a/lib/test_min_heap.c b/lib/min_heap_kunit.c similarity index 60% rename from lib/test_min_heap.c rename to lib/min_heap_kunit.c index d19c8080fd4d..398db1c63146 100644 --- a/lib/test_min_heap.c +++ b/lib/min_heap_kunit.c @@ -7,9 +7,8 @@ #include <linux/log2.h> #include <linux/min_heap.h> -#include <linux/module.h> -#include <linux/printk.h> #include <linux/random.h> +#include <kunit/test.h> static __init bool less_than(const void *lhs, const void *rhs) { @@ -29,37 +28,34 @@ static __init void swap_ints(void *lhs, void *rhs) *(int *)rhs = temp; } -static __init int pop_verify_heap(bool min_heap, +static __init void pop_verify_heap(struct kunit *context, + bool min_heap, struct min_heap *heap, const struct min_heap_callbacks *funcs) { int *values = heap->data; - int err = 0; int last; last = values[0]; min_heap_pop(heap, funcs); while (heap->nr > 0) { if (min_heap) { - if (last > values[0]) { - pr_err("error: expected %d <= %d\n", last, - values[0]); - err++; - } + KUNIT_EXPECT_FALSE_MSG(context, + last > values[0], + "expected %d <= %d\n", + last, values[0]); } else { - if (last < values[0]) { - pr_err("error: expected %d >= %d\n", last, - values[0]); - err++; - } + KUNIT_EXPECT_FALSE_MSG(context, + last < values[0], + "expected %d >= %d\n", + last, values[0]); } last = values[0]; min_heap_pop(heap, funcs); } - return err; } -static __init int test_heapify_all(bool min_heap) +static __init void test_heapify_all(struct kunit *context, bool min_heap) { int values[] = { 3, 1, 2, 4, 0x8000000, 0x7FFFFFF, 0, -3, -1, -2, -4, 0x8000000, 0x7FFFFFF }; @@ -73,12 +69,11 @@ static __init int test_heapify_all(bool min_heap) .less = min_heap ? less_than : greater_than, .swp = swap_ints, }; - int i, err; + int i; /* Test with known set of values. */ min_heapify_all(&heap, &funcs); - err = pop_verify_heap(min_heap, &heap, &funcs); - + pop_verify_heap(context, min_heap, &heap, &funcs); /* Test with randomly generated values. */ heap.nr = ARRAY_SIZE(values); @@ -86,12 +81,10 @@ static __init int test_heapify_all(bool min_heap) values[i] = get_random_int(); min_heapify_all(&heap, &funcs); - err += pop_verify_heap(min_heap, &heap, &funcs); - - return err; + pop_verify_heap(context, min_heap, &heap, &funcs); } -static __init int test_heap_push(bool min_heap) +static __init void test_heap_push(struct kunit *context, bool min_heap) { const int data[] = { 3, 1, 2, 4, 0x80000000, 0x7FFFFFFF, 0, -3, -1, -2, -4, 0x80000000, 0x7FFFFFFF }; @@ -106,25 +99,22 @@ static __init int test_heap_push(bool min_heap) .less = min_heap ? less_than : greater_than, .swp = swap_ints, }; - int i, temp, err; + int i, temp; /* Test with known set of values copied from data. */ for (i = 0; i < ARRAY_SIZE(data); i++) min_heap_push(&heap, &data[i], &funcs); - - err = pop_verify_heap(min_heap, &heap, &funcs); + pop_verify_heap(context, min_heap, &heap, &funcs); /* Test with randomly generated values. */ while (heap.nr < heap.size) { temp = get_random_int(); min_heap_push(&heap, &temp, &funcs); } - err += pop_verify_heap(min_heap, &heap, &funcs); - - return err; + pop_verify_heap(context, min_heap, &heap, &funcs); } -static __init int test_heap_pop_push(bool min_heap) +static __init void test_heap_pop_push(struct kunit *context, bool min_heap) { const int data[] = { 3, 1, 2, 4, 0x80000000, 0x7FFFFFFF, 0, -3, -1, -2, -4, 0x80000000, 0x7FFFFFFF }; @@ -139,7 +129,7 @@ static __init int test_heap_pop_push(bool min_heap) .less = min_heap ? less_than : greater_than, .swp = swap_ints, }; - int i, temp, err; + int i, temp; /* Fill values with data to pop and replace. */ temp = min_heap ? 0x80000000 : 0x7FFFFFFF; @@ -149,8 +139,7 @@ static __init int test_heap_pop_push(bool min_heap) /* Test with known set of values copied from data. */ for (i = 0; i < ARRAY_SIZE(data); i++) min_heap_pop_push(&heap, &data[i], &funcs); - - err = pop_verify_heap(min_heap, &heap, &funcs); + pop_verify_heap(context, min_heap, &heap, &funcs); heap.nr = 0; for (i = 0; i < ARRAY_SIZE(data); i++) @@ -161,34 +150,54 @@ static __init int test_heap_pop_push(bool min_heap) temp = get_random_int(); min_heap_pop_push(&heap, &temp, &funcs); } - err += pop_verify_heap(min_heap, &heap, &funcs); + pop_verify_heap(context, min_heap, &heap, &funcs); +} - return err; +static void __init test_heapify_all_true(struct kunit *context) +{ + test_heapify_all(context, true); } -static int __init test_min_heap_init(void) +static void __init test_heapify_all_false(struct kunit *context) { - int err = 0; - - err += test_heapify_all(true); - err += test_heapify_all(false); - err += test_heap_push(true); - err += test_heap_push(false); - err += test_heap_pop_push(true); - err += test_heap_pop_push(false); - if (err) { - pr_err("test failed with %d errors\n", err); - return -EINVAL; - } - pr_info("test passed\n"); - return 0; + test_heapify_all(context, true); +} + +static void __init test_heap_push_true(struct kunit *context) +{ + test_heap_push(context, true); +} + +static void __init test_heap_push_false(struct kunit *context) +{ + test_heap_push(context, false); } -module_init(test_min_heap_init); -static void __exit test_min_heap_exit(void) +static void __init test_heap_pop_push_true(struct kunit *context) { - /* do nothing */ + test_heap_pop_push(context, true); } -module_exit(test_min_heap_exit); + +static void __init test_heap_pop_push_false(struct kunit *context) +{ + test_heap_pop_push(context, false); +} + +static struct kunit_case __refdata min_heap_test_cases[] = { + KUNIT_CASE(test_heapify_all_true), + KUNIT_CASE(test_heapify_all_false), + KUNIT_CASE(test_heap_push_true), + KUNIT_CASE(test_heap_push_false), + KUNIT_CASE(test_heap_pop_push_true), + KUNIT_CASE(test_heap_pop_push_false), + {} +}; + +static struct kunit_suite min_heap_test_suite = { + .name = "min-heap", + .test_cases = min_heap_test_cases, +}; + +kunit_test_suites(&min_heap_test_suite); MODULE_LICENSE("GPL"); base-commit: d43c7fb05765152d4d4a39a8ef957c4ea14d8847 -- 2.26.2

4 years, 6 months

6
15
0 0

[PATCH v21 00/12] Landlock LSM

by Mickaël Salaün

Hi, This new patch series mainly simplifies the syscalls thanks to Arnd Bergmann at LPC. The SLOC count is 1188 for security/landlock/ and 1673 for tools/testing/selftest/landlock/ . Test coverage for security/landlock/ is 95.4% of lines. The code not covered only deals with internal kernel errors (e.g. memory allocation) and race conditions. The compiled documentation is available here: https://landlock.io/linux-doc/landlock-v21/security/landlock/index.html This series can be applied on top of v5.9-rc8 . This can be tested with CONFIG_SECURITY_LANDLOCK and CONFIG_SAMPLE_LANDLOCK. This patch series can be found in a Git repository here: https://github.com/landlock-lsm/linux/commits/landlock-v21 I would really appreciate constructive comments on this patch series. # Landlock LSM The goal of Landlock is to enable to restrict ambient rights (e.g. global filesystem access) for a set of processes. Because Landlock is a stackable LSM [1], it makes possible to create safe security sandboxes as new security layers in addition to the existing system-wide access-controls. This kind of sandbox is expected to help mitigate the security impact of bugs or unexpected/malicious behaviors in user-space applications. Landlock empowers any process, including unprivileged ones, to securely restrict themselves. Landlock is inspired by seccomp-bpf but instead of filtering syscalls and their raw arguments, a Landlock rule can restrict the use of kernel objects like file hierarchies, according to the kernel semantic. Landlock also takes inspiration from other OS sandbox mechanisms: XNU Sandbox, FreeBSD Capsicum or OpenBSD Pledge/Unveil. In this current form, Landlock misses some access-control features. This enables to minimize this patch series and ease review. This series still addresses multiple use cases, especially with the combined use of seccomp-bpf: applications with built-in sandboxing, init systems, security sandbox tools and security-oriented APIs [2]. Previous version: https://lore.kernel.org/lkml/20200802215903.91936-1-mic@digikod.net/ [1] https://lore.kernel.org/lkml/50db058a-7dde-441b-a7f9-f6837fe8b69f@schaufler… [2] https://lore.kernel.org/lkml/f646e1c7-33cf-333f-070c-0a40ad0468cd@digikod.n… Casey Schaufler (1): LSM: Infrastructure management of the superblock Mickaël Salaün (11): landlock: Add object management landlock: Add ruleset and domain management landlock: Set up the security framework and manage credentials landlock: Add ptrace restrictions fs,security: Add sb_delete hook landlock: Support filesystem access-control landlock: Add syscall implementations arch: Wire up Landlock syscalls selftests/landlock: Add initial tests samples/landlock: Add a sandbox manager example landlock: Add user and kernel documentation Documentation/security/index.rst | 1 + Documentation/security/landlock/index.rst | 18 + Documentation/security/landlock/kernel.rst | 69 + Documentation/security/landlock/user.rst | 242 +++ MAINTAINERS | 11 + arch/Kconfig | 7 + arch/alpha/kernel/syscalls/syscall.tbl | 3 + arch/arm/tools/syscall.tbl | 3 + arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 6 + arch/ia64/kernel/syscalls/syscall.tbl | 3 + arch/m68k/kernel/syscalls/syscall.tbl | 3 + arch/microblaze/kernel/syscalls/syscall.tbl | 3 + arch/mips/kernel/syscalls/syscall_n32.tbl | 3 + arch/mips/kernel/syscalls/syscall_n64.tbl | 3 + arch/mips/kernel/syscalls/syscall_o32.tbl | 3 + arch/parisc/kernel/syscalls/syscall.tbl | 3 + arch/powerpc/kernel/syscalls/syscall.tbl | 3 + arch/s390/kernel/syscalls/syscall.tbl | 3 + arch/sh/kernel/syscalls/syscall.tbl | 3 + arch/sparc/kernel/syscalls/syscall.tbl | 3 + arch/um/Kconfig | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 3 + arch/x86/entry/syscalls/syscall_64.tbl | 3 + arch/xtensa/kernel/syscalls/syscall.tbl | 3 + fs/super.c | 1 + include/linux/lsm_hook_defs.h | 1 + include/linux/lsm_hooks.h | 3 + include/linux/security.h | 4 + include/linux/syscalls.h | 7 + include/uapi/asm-generic/unistd.h | 8 +- include/uapi/linux/landlock.h | 131 ++ kernel/sys_ni.c | 5 + samples/Kconfig | 7 + samples/Makefile | 1 + samples/landlock/.gitignore | 1 + samples/landlock/Makefile | 15 + samples/landlock/sandboxer.c | 220 +++ security/Kconfig | 11 +- security/Makefile | 2 + security/landlock/Kconfig | 18 + security/landlock/Makefile | 4 + security/landlock/common.h | 20 + security/landlock/cred.c | 46 + security/landlock/cred.h | 58 + security/landlock/fs.c | 609 ++++++ security/landlock/fs.h | 60 + security/landlock/object.c | 66 + security/landlock/object.h | 91 + security/landlock/ptrace.c | 120 ++ security/landlock/ptrace.h | 14 + security/landlock/ruleset.c | 342 ++++ security/landlock/ruleset.h | 157 ++ security/landlock/setup.c | 40 + security/landlock/setup.h | 18 + security/landlock/syscall.c | 427 +++++ security/security.c | 51 +- security/selinux/hooks.c | 58 +- security/selinux/include/objsec.h | 6 + security/selinux/ss/services.c | 3 +- security/smack/smack.h | 6 + security/smack/smack_lsm.c | 35 +- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/landlock/.gitignore | 2 + tools/testing/selftests/landlock/Makefile | 24 + tools/testing/selftests/landlock/base_test.c | 117 ++ tools/testing/selftests/landlock/common.h | 113 ++ tools/testing/selftests/landlock/config | 5 + tools/testing/selftests/landlock/fs_test.c | 1695 +++++++++++++++++ .../testing/selftests/landlock/ptrace_test.c | 307 +++ tools/testing/selftests/landlock/true.c | 5 + 71 files changed, 5263 insertions(+), 77 deletions(-) create mode 100644 Documentation/security/landlock/index.rst create mode 100644 Documentation/security/landlock/kernel.rst create mode 100644 Documentation/security/landlock/user.rst create mode 100644 include/uapi/linux/landlock.h create mode 100644 samples/landlock/.gitignore create mode 100644 samples/landlock/Makefile create mode 100644 samples/landlock/sandboxer.c create mode 100644 security/landlock/Kconfig create mode 100644 security/landlock/Makefile create mode 100644 security/landlock/common.h create mode 100644 security/landlock/cred.c create mode 100644 security/landlock/cred.h create mode 100644 security/landlock/fs.c create mode 100644 security/landlock/fs.h create mode 100644 security/landlock/object.c create mode 100644 security/landlock/object.h create mode 100644 security/landlock/ptrace.c create mode 100644 security/landlock/ptrace.h create mode 100644 security/landlock/ruleset.c create mode 100644 security/landlock/ruleset.h create mode 100644 security/landlock/setup.c create mode 100644 security/landlock/setup.h create mode 100644 security/landlock/syscall.c create mode 100644 tools/testing/selftests/landlock/.gitignore create mode 100644 tools/testing/selftests/landlock/Makefile create mode 100644 tools/testing/selftests/landlock/base_test.c create mode 100644 tools/testing/selftests/landlock/common.h create mode 100644 tools/testing/selftests/landlock/config create mode 100644 tools/testing/selftests/landlock/fs_test.c create mode 100644 tools/testing/selftests/landlock/ptrace_test.c create mode 100644 tools/testing/selftests/landlock/true.c -- 2.28.0

4 years, 6 months

2
17
0 0

selftests: netfilter: nft_nat.sh: /dev/stdin:2:9-15: Error: syntax error, unexpected counter

by Naresh Kamboju

While running kselftest netfilter test on x86_64 devices linux next tag 20201013 kernel these errors are noticed. This not specific to kernel version we have noticed these errors earlier also. Am I missing configs ? Please refer to the config file we are using. We are using the minimal busybox shell. BusyBox v1.27.2 (2020-07-17 18:42:50 UTC) multi-call binary. metadata: git branch: master git repo: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git git commit: f2fb1afc57304f9dd68c20a08270e287470af2eb git describe: next-20201013 make_kernelversion: 5.9.0 kernel-config: http://snapshots.linaro.org/openembedded/lkft/lkft/sumo/intel-corei7-64/lkf… Test output log: -------------------- selftests: netfilter: nft_nat.sh [ 1207.251385] IPv6: ADDRCONF(NETDEV_CHANGE): veth0: link becomes ready [ 1207.342479] IPv6: ADDRCONF(NETDEV_CHANGE): veth1: link becomes ready # /dev/stdin:2:9-15: Error: syntax error, unexpected counter # counter ns0in {} # ^^^^^^^ # /dev/stdin:3:9-15: Error: syntax error, unexpected counter # counter ns1in {} # ^^^^^^^ # /dev/stdin:4:9-15: Error: syntax error, unexpected counter # counter ns2in {} # ^^^^^^^ # /dev/stdin:6:9-15: Error: syntax error, unexpected counter # counter ns0out {} # ^^^^^^^ <trim> # /dev/stdin:12:9-15: Error: syntax error, unexpected counter # counter ns2in6 {} # ^^^^^^^ # /dev/stdin:14:9-15: Error: syntax error, unexpected counter # counter ns0out6 {} # ^^^^^^^ [ 1208.229989] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready # <cmdline>:1:6-12: Error: syntax error, unexpected counter # list counter inet filter ns0in # ^^^^^^^ # ERROR: ns0in counter in ns1-loU9Vlmj has unexpected value (expected packets 1 bytes 84) at check_counters 1 # <cmdline>:1:6-12: Error: syntax error, unexpected counter # list counter inet filter ns0in # ^^^^^^^ # <cmdline>:1:6-12: Error: syntax error, unexpected counter # list counter inet filter ns0out # ^^^^^^^ # ERROR: ns0out counter in ns1-loU9Vlmj has unexpected value (expected packets 1 bytes 84) at check_counters 2 # <cmdline>:1:6-12: Error: syntax error, unexpected counter # list counter inet filter ns0out # ^^^^^^^ # <cmdline>:1:6-12: Error: syntax error, unexpected counter # list counter inet filter ns0in6 # ERROR: ns1 counter in ns0-loU9Vlmj has unexpected value (expected packets 1 bytes 104) at check_ns0_counters 5 # <cmdline>:1:6-12: Error: syntax error, unexpected counter # list counter inet filter ns1 # ^^^^^^^ <trim> # <cmdline>:1:16-19: Error: syntax error, unexpected inet # reset counters inet # ^^^^ # <cmdline>:1:16-19: Error: syntax error, unexpected inet # reset counters inet # ^^^^ # FAIL: nftables v0.7 (Scrooge McDuck) not ok 2 selftests: netfilter: nft_nat.sh # exit=1 # selftests: netfilter: bridge_brouter.sh # SKIP: Could not run test without ebtables ok 3 selftests: netfilter: bridge_brouter.sh # SKIP # selftests: netfilter: conntrack_icmp_related.sh [ 1215.679815] IPv6: ADDRCONF(NETDEV_CHANGE): veth0: link becomes ready [ 1215.698932] IPv6: ADDRCONF(NETDEV_CHANGE): veth0: link becomes ready [ 1215.711612] IPv6: ADDRCONF(NETDEV_CHANGE): veth0: link becomes ready [ 1216.678043] IPv6: ADDRCONF(NETDEV_CHANGE): eth1: link becomes ready # internal:0:0-0: Error: Could not open file \"-\": No such file or directory # # # internal:0:0-0: Error: Could not open file \"-\": No such file or directory # # # internal:0:0-0: Error: Could not open file \"-\": No such file or directory # # # internal:0:0-0: Error: Could not open file \"-\": No such file or directory # # # internal:0:0-0: Error: Could not open file \"-\": No such file or directory # # # <cmdline>:1:6-12: Error: syntax error, unexpected counter # list counter inet filter unknown # ^^^^^^^ # ERROR: counter unknown in nsclient1 has unexpected value (expected packets 0 bytes 0) # <cmdline>:1:6-12: Error: syntax error, unexpected counter # list counter inet filter unknown # ^^^^^^^ <trim> # ERROR: counter related in nsclient1 has unexpected value (expected packets 2 bytes 1856) # <cmdline>:1:6-12: Error: syntax error, unexpected counter # list counter inet filter related # ^^^^^^^ # ERROR: icmp error RELATED state test has failed not ok 4 selftests: netfilter: conntrack_icmp_related.sh # exit=1 # selftests: netfilter: nft_flowtable.sh # Cannot create namespace file \"/var/run/netns/ns1\": File exists [ 1230.570705] IPv6: ADDRCONF(NETDEV_CHANGE): veth0: link becomes ready [ 1230.757525] IPv6: ADDRCONF(NETDEV_CHANGE): veth0: link becomes ready [ 1230.843221] IPv6: ADDRCONF(NETDEV_CHANGE): veth1: link becomes ready # internal:0:0-0: Error: Could not open file \"-\": No such file or directory # # # PASS: netns routing/connectivity: ns1 can reach ns2 # BusyBox v1.27.2 (2020-07-17 18:42:50 UTC) multi-call binary. # # Usage: nc [IPADDR PORT] # BusyBox v1.27.2 (2020-07-17 18:42:50 UTC) multi-call binary. # # Usage: nc [IPADDR PORT] # FAIL: file mismatch for ns1 -> ns2 # -rw------- 1 root root 1079296 Oct 13 09:54 /tmp/tmp.EyNCJDBncG # -rw------- 1 root root 0 Oct 13 09:54 /tmp/tmp.CR5cdEqIHB # FAIL: file mismatch for ns1 <- ns2 # -rw------- 1 root root 4677632 Oct 13 09:54 /tmp/tmp.NkSMo4ZijB # -rw------- 1 root root 0 Oct 13 09:54 /tmp/tmp.irBE9wPUAV # FAIL: flow offload for ns1/ns2: # internal:0:0-0: Error: Could not open file \"-\": No such file or directory # # # BusyBox v1.27.2 (2020-07-17 18:42:50 UTC) multi-call binary. # # Usage: nc [IPADDR PORT] # BusyBox v1.27.2 (2020-07-17 18:42:50 UTC) multi-call binary. # # Usage: nc [IPADDR PORT] # FAIL: file mismatch for ns1 -> ns2 # -rw------- 1 root root 1079296 Oct 13 09:54 /tmp/tmp.EyNCJDBncG # -rw------- 1 root root 0 Oct 13 09:54 /tmp/tmp.CR5cdEqIHB # FAIL: file mismatch for ns1 <- ns2 # -rw------- 1 root root 4677632 Oct 13 09:54 /tmp/tmp.NkSMo4ZijB # -rw------- 1 root root 0 Oct 13 09:54 /tmp/tmp.irBE9wPUAV # FAIL: flow offload for ns1/ns2 with NAT # <cmdline>:1:1-23: Error: Could not process rule: Table 'filter' does not exist # list table inet filter # ^^^^^^^^^^^^^^^^^^^^^^^ # <cmdline>:1:32-32: Error: syntax error, unexpected newline, expecting handle # delete rule inet filter forward # ^ # FAIL: Could not delete large-packet accept rule not ok 5 selftests: netfilter: nft_flowtable.sh # exit=1 # selftests: netfilter: ipvs.sh # skip: could not run test without ipvs module ok 6 selftests: netfilter: ipvs.sh # SKIP # selftests: netfilter: nft_concat_range.sh # TEST: reported issues # Add two elements, flush, re-add [ 1240.096121] kauditd_printk_skb: 40 callbacks suppressed [ 1240.096124] audit: type=1325 audit(1602582894.032:87830): table=t:72;?:0 family=2 entries=1 op=nft_register_table pid=9084 subj=kernel comm=\"nft\" [ 1240.114551] audit: type=1325 audit(1602582894.032:87830): table=t:72;s:1 family=2 entries=0 op=nft_register_set pid=9084 subj=kernel comm=\"nft\" [ 1240.127450] audit: type=1325 audit(1602582894.032:87830): table=?:0;?:0 family=0 entries=2 op=nft_register_gen pid=9084 subj=kernel comm=\"nft\" [FAIL] [ 1240.169015] audit: type=1325 audit(1602582894.105:87831): table=t:72;s:1 family=2 entries=0 op=nft_unregister_set pid=9087 subj=kernel comm=\"nft\" [ 1240.182153] audit: type=1325 audit(1602582894.105:87831): table=t:72;?:0 family=2 entries=0 op=nft_unregister_table pid=9087 subj=kernel comm=\"nft\" [ 1240.195412] audit: type=1325 audit(1602582894.105:87831): table=?:0;?:0 family=0 entries=3 op=nft_register_gen pid=9087 subj=kernel comm=\"nft\" not ok 7 selftests: netfilter: nft_concat_range.sh # exit=1 # selftests: netfilter: nft_conntrack_helper.sh # SKIP: Could not run test without conntrack tool ok 8 selftests: netfilter: nft_conntrack_helper.sh # SKIP # selftests: netfilter: nft_queue.sh [ 1242.587245] IPv6: ADDRCONF(NETDEV_CHANGE): veth0: link becomes ready [ 1242.605473] IPv6: ADDRCONF(NETDEV_CHANGE): veth1: link becomes ready # internal:0:0-0: Error: Could not open file \"-\": No such file or directory # # [ 1243.557996] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready # PASS: ns1-4ngWFkmc can reach ns2-4ngWFkmc # internal:0:0-0: Error: Could not open file \"-\": No such file or directory # # # FAIL: ip expected failure, got 0 not ok 9 selftests: netfilter: nft_queue.sh # exit=1 # selftests: netfilter: nft_meta.sh # /dev/stdin:2:9-15: Error: syntax error, unexpected counter # counter iifcount {} # ^^^^^^^ # /dev/stdin:3:9-15: Error: syntax error, [ 1245.942205] kselftest: Running tests in nsfs unexpected counter # counter iifnamecount {} # ^^^^^^^ # /dev/stdin:4:9-15: Error: syntax error, unexpected counter # counter iifgroupcount {} # ^^^^^^^ <trim> # /dev/stdin:11:9-15: Error: syntax error, unexpected counter # counter icurrentyearc[ 1246.027275] kselftest: Running tests in pidfd ounter {} # ^^^^^^^ # SKIP: Could not add test ruleset Reported-by: Naresh Kamboju <naresh.kamboju(a)linaro.org> Full test log link, https://lkft.validation.linaro.org/scheduler/job/1839013#L12339 -- Linaro LKFT https://lkft.linaro.org

4 years, 6 months

2
3
0 0

[PATCH 1/2] kunit: Support for Parameterized Testing

by Arpitha Raghunandan

Implementation of support for parameterized testing in KUnit. Signed-off-by: Arpitha Raghunandan <98.arpi(a)gmail.com> --- include/kunit/test.h | 29 +++++++++++++++++++++++++++++ lib/kunit/test.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/include/kunit/test.h b/include/kunit/test.h index 59f3144f009a..4740d66269b4 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -140,10 +140,14 @@ struct kunit; struct kunit_case { void (*run_case)(struct kunit *test); const char *name; + void* (*get_params)(void); + int max_parameters_count; + int parameter_size; /* private: internal use only. */ bool success; char *log; + bool parameterized; }; static inline char *kunit_status_to_string(bool status) @@ -162,6 +166,11 @@ static inline char *kunit_status_to_string(bool status) */ #define KUNIT_CASE(test_name) { .run_case = test_name, .name = #test_name } +#define KUNIT_CASE_PARAM(test_name, getparams, count, size) \ + { .run_case = test_name, .name = #test_name, \ + .parameterized = true, .get_params = (void* (*)(void))getparams, \ + .max_parameters_count = count, .parameter_size = size } + /** * struct kunit_suite - describes a related collection of &struct kunit_case * @@ -206,6 +215,23 @@ struct kunit { /* private: internal use only. */ const char *name; /* Read only after initialization! */ char *log; /* Points at case log after initialization */ + bool parameterized; /* True for parameterized tests */ + /* param_values stores the test parameters + * for parameterized tests. + */ + void *param_values; + /* max_parameters_count indicates maximum number of + * parameters for parameterized tests. + */ + int max_parameters_count; + /* iterator_count is used by the iterator method + * for parameterized tests. + */ + int iterator_count; + /* parameter_size indicates size of a single test case + * for parameterized tests. + */ + int parameter_size; struct kunit_try_catch try_catch; /* * success starts as true, and may only be set to false during a @@ -225,6 +251,7 @@ struct kunit { }; void kunit_init_test(struct kunit *test, const char *name, char *log); +void kunit_init_param_test(struct kunit *test, struct kunit_case *test_case); int kunit_run_tests(struct kunit_suite *suite); @@ -237,6 +264,8 @@ int __kunit_test_suites_init(struct kunit_suite **suites); void __kunit_test_suites_exit(struct kunit_suite **suites); +void *get_test_case_parameters(struct kunit *test); + /** * kunit_test_suites() - used to register one or more &struct kunit_suite * with KUnit. diff --git a/lib/kunit/test.c b/lib/kunit/test.c index c36037200310..ab9e13c81d4a 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -142,6 +142,11 @@ unsigned int kunit_test_case_num(struct kunit_suite *suite, } EXPORT_SYMBOL_GPL(kunit_test_case_num); +static void kunit_print_failed_param(struct kunit *test) +{ + kunit_err(test, "\n\tTest failed at parameter: %d\n", test->iterator_count); +} + static void kunit_print_string_stream(struct kunit *test, struct string_stream *stream) { @@ -182,6 +187,9 @@ static void kunit_fail(struct kunit *test, struct kunit_assert *assert) assert->format(assert, stream); + if (test->parameterized) + kunit_print_failed_param(test); + kunit_print_string_stream(test, stream); WARN_ON(string_stream_destroy(stream)); @@ -236,6 +244,18 @@ void kunit_init_test(struct kunit *test, const char *name, char *log) } EXPORT_SYMBOL_GPL(kunit_init_test); +void kunit_init_param_test(struct kunit *test, struct kunit_case *test_case) +{ + spin_lock_init(&test->lock); + INIT_LIST_HEAD(&test->resources); + test->parameterized = true; + test->param_values = (void *)(test_case->get_params()); + test->max_parameters_count = test_case->max_parameters_count; + test->parameter_size = test_case->parameter_size; + test->iterator_count = 0; +} +EXPORT_SYMBOL_GPL(kunit_init_param_test); + /* * Initializes and runs test case. Does not clean up or do post validations. */ @@ -254,7 +274,14 @@ static void kunit_run_case_internal(struct kunit *test, } } - test_case->run_case(test); + if (!test->parameterized) { + test_case->run_case(test); + } else { + int i; + + for (i = 0; i < test->max_parameters_count; i++) + test_case->run_case(test); + } } static void kunit_case_internal_cleanup(struct kunit *test) @@ -343,6 +370,8 @@ static void kunit_run_case_catch_errors(struct kunit_suite *suite, struct kunit test; kunit_init_test(&test, test_case->name, test_case->log); + if (test_case->parameterized) + kunit_init_param_test(&test, test_case); try_catch = &test.try_catch; kunit_try_catch_init(try_catch, @@ -407,6 +436,19 @@ void __kunit_test_suites_exit(struct kunit_suite **suites) } EXPORT_SYMBOL_GPL(__kunit_test_suites_exit); +/* + * Iterator method for the parameterized test cases + */ +void *get_test_case_parameters(struct kunit *test) +{ + int index = test->iterator_count * test->parameter_size; + + if (test->iterator_count != test->max_parameters_count) + test->iterator_count++; + return (test->param_values + index); +} +EXPORT_SYMBOL_GPL(get_test_case_parameters); + /* * Used for static resources and when a kunit_resource * has been created by * kunit_alloc_resource(). When an init function is supplied, @data is passed -- 2.25.1

4 years, 6 months

3
4
0 0

[RESEND PATCH v2] lib: kunit: add test_min_heap test conversion to KUnit

by Vitor Massaru Iha

This adds the conversion of the runtime tests of test_min_heap, from `lib/test_min_heap.c` to KUnit tests. Signed-off-by: Vitor Massaru Iha <vitor(a)massaru.org> --- v2: * change Kconfig entries to be more adherent to KUnit documentation, min_heap test runs when enabling full test coverage (KUNIT_ALL_TESTS). * make kconfig help more concise; * fix KUNIT_TEST sufix; --- lib/Kconfig.debug | 24 +++-- lib/Makefile | 2 +- lib/{test_min_heap.c => min_heap_kunit.c} | 117 ++++++++++++---------- 3 files changed, 78 insertions(+), 65 deletions(-) rename lib/{test_min_heap.c => min_heap_kunit.c} (60%) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 4f09c6505a2e..0e10ef1176de 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1915,16 +1915,6 @@ config TEST_LIST_SORT If unsure, say N. -config TEST_MIN_HEAP - tristate "Min heap test" - depends on DEBUG_KERNEL || m - help - Enable this to turn on min heap function tests. This test is - executed only once during system boot (so affects only boot time), - or at module load time. - - If unsure, say N. - config TEST_SORT tristate "Array-based sort test" depends on DEBUG_KERNEL || m @@ -2256,6 +2246,20 @@ config BITS_TEST If unsure, say N. +config MIN_HEAP_KUNIT_TEST + tristate "KUnit test for Min heap" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + help + Enable this to turn on min heap function tests. This test is + executed only once during system boot (so affects only boot time), + or at module load time. + + 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 TEST_UDELAY tristate "udelay test driver" help diff --git a/lib/Makefile b/lib/Makefile index d862d41fdc3d..03d12e672cf8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -68,7 +68,6 @@ CFLAGS_test_ubsan.o += $(call cc-disable-warning, vla) 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_OVERFLOW) += test_overflow.o @@ -343,3 +342,4 @@ obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o obj-$(CONFIG_BITS_TEST) += test_bits.o +obj-$(CONFIG_MIN_HEAP_KUNIT_TEST) += min_heap_kunit.o diff --git a/lib/test_min_heap.c b/lib/min_heap_kunit.c similarity index 60% rename from lib/test_min_heap.c rename to lib/min_heap_kunit.c index d19c8080fd4d..398db1c63146 100644 --- a/lib/test_min_heap.c +++ b/lib/min_heap_kunit.c @@ -7,9 +7,8 @@ #include <linux/log2.h> #include <linux/min_heap.h> -#include <linux/module.h> -#include <linux/printk.h> #include <linux/random.h> +#include <kunit/test.h> static __init bool less_than(const void *lhs, const void *rhs) { @@ -29,37 +28,34 @@ static __init void swap_ints(void *lhs, void *rhs) *(int *)rhs = temp; } -static __init int pop_verify_heap(bool min_heap, +static __init void pop_verify_heap(struct kunit *context, + bool min_heap, struct min_heap *heap, const struct min_heap_callbacks *funcs) { int *values = heap->data; - int err = 0; int last; last = values[0]; min_heap_pop(heap, funcs); while (heap->nr > 0) { if (min_heap) { - if (last > values[0]) { - pr_err("error: expected %d <= %d\n", last, - values[0]); - err++; - } + KUNIT_EXPECT_FALSE_MSG(context, + last > values[0], + "expected %d <= %d\n", + last, values[0]); } else { - if (last < values[0]) { - pr_err("error: expected %d >= %d\n", last, - values[0]); - err++; - } + KUNIT_EXPECT_FALSE_MSG(context, + last < values[0], + "expected %d >= %d\n", + last, values[0]); } last = values[0]; min_heap_pop(heap, funcs); } - return err; } -static __init int test_heapify_all(bool min_heap) +static __init void test_heapify_all(struct kunit *context, bool min_heap) { int values[] = { 3, 1, 2, 4, 0x8000000, 0x7FFFFFF, 0, -3, -1, -2, -4, 0x8000000, 0x7FFFFFF }; @@ -73,12 +69,11 @@ static __init int test_heapify_all(bool min_heap) .less = min_heap ? less_than : greater_than, .swp = swap_ints, }; - int i, err; + int i; /* Test with known set of values. */ min_heapify_all(&heap, &funcs); - err = pop_verify_heap(min_heap, &heap, &funcs); - + pop_verify_heap(context, min_heap, &heap, &funcs); /* Test with randomly generated values. */ heap.nr = ARRAY_SIZE(values); @@ -86,12 +81,10 @@ static __init int test_heapify_all(bool min_heap) values[i] = get_random_int(); min_heapify_all(&heap, &funcs); - err += pop_verify_heap(min_heap, &heap, &funcs); - - return err; + pop_verify_heap(context, min_heap, &heap, &funcs); } -static __init int test_heap_push(bool min_heap) +static __init void test_heap_push(struct kunit *context, bool min_heap) { const int data[] = { 3, 1, 2, 4, 0x80000000, 0x7FFFFFFF, 0, -3, -1, -2, -4, 0x80000000, 0x7FFFFFFF }; @@ -106,25 +99,22 @@ static __init int test_heap_push(bool min_heap) .less = min_heap ? less_than : greater_than, .swp = swap_ints, }; - int i, temp, err; + int i, temp; /* Test with known set of values copied from data. */ for (i = 0; i < ARRAY_SIZE(data); i++) min_heap_push(&heap, &data[i], &funcs); - - err = pop_verify_heap(min_heap, &heap, &funcs); + pop_verify_heap(context, min_heap, &heap, &funcs); /* Test with randomly generated values. */ while (heap.nr < heap.size) { temp = get_random_int(); min_heap_push(&heap, &temp, &funcs); } - err += pop_verify_heap(min_heap, &heap, &funcs); - - return err; + pop_verify_heap(context, min_heap, &heap, &funcs); } -static __init int test_heap_pop_push(bool min_heap) +static __init void test_heap_pop_push(struct kunit *context, bool min_heap) { const int data[] = { 3, 1, 2, 4, 0x80000000, 0x7FFFFFFF, 0, -3, -1, -2, -4, 0x80000000, 0x7FFFFFFF }; @@ -139,7 +129,7 @@ static __init int test_heap_pop_push(bool min_heap) .less = min_heap ? less_than : greater_than, .swp = swap_ints, }; - int i, temp, err; + int i, temp; /* Fill values with data to pop and replace. */ temp = min_heap ? 0x80000000 : 0x7FFFFFFF; @@ -149,8 +139,7 @@ static __init int test_heap_pop_push(bool min_heap) /* Test with known set of values copied from data. */ for (i = 0; i < ARRAY_SIZE(data); i++) min_heap_pop_push(&heap, &data[i], &funcs); - - err = pop_verify_heap(min_heap, &heap, &funcs); + pop_verify_heap(context, min_heap, &heap, &funcs); heap.nr = 0; for (i = 0; i < ARRAY_SIZE(data); i++) @@ -161,34 +150,54 @@ static __init int test_heap_pop_push(bool min_heap) temp = get_random_int(); min_heap_pop_push(&heap, &temp, &funcs); } - err += pop_verify_heap(min_heap, &heap, &funcs); + pop_verify_heap(context, min_heap, &heap, &funcs); +} - return err; +static void __init test_heapify_all_true(struct kunit *context) +{ + test_heapify_all(context, true); } -static int __init test_min_heap_init(void) +static void __init test_heapify_all_false(struct kunit *context) { - int err = 0; - - err += test_heapify_all(true); - err += test_heapify_all(false); - err += test_heap_push(true); - err += test_heap_push(false); - err += test_heap_pop_push(true); - err += test_heap_pop_push(false); - if (err) { - pr_err("test failed with %d errors\n", err); - return -EINVAL; - } - pr_info("test passed\n"); - return 0; + test_heapify_all(context, true); +} + +static void __init test_heap_push_true(struct kunit *context) +{ + test_heap_push(context, true); +} + +static void __init test_heap_push_false(struct kunit *context) +{ + test_heap_push(context, false); } -module_init(test_min_heap_init); -static void __exit test_min_heap_exit(void) +static void __init test_heap_pop_push_true(struct kunit *context) { - /* do nothing */ + test_heap_pop_push(context, true); } -module_exit(test_min_heap_exit); + +static void __init test_heap_pop_push_false(struct kunit *context) +{ + test_heap_pop_push(context, false); +} + +static struct kunit_case __refdata min_heap_test_cases[] = { + KUNIT_CASE(test_heapify_all_true), + KUNIT_CASE(test_heapify_all_false), + KUNIT_CASE(test_heap_push_true), + KUNIT_CASE(test_heap_push_false), + KUNIT_CASE(test_heap_pop_push_true), + KUNIT_CASE(test_heap_pop_push_false), + {} +}; + +static struct kunit_suite min_heap_test_suite = { + .name = "min-heap", + .test_cases = min_heap_test_cases, +}; + +kunit_test_suites(&min_heap_test_suite); MODULE_LICENSE("GPL"); base-commit: d2585f5164c298aaaed14c2c8d313cbe7bd5b253 -- 2.26.2

4 years, 6 months

1
0
0 0

[PATCH v2] lib: kunit: add test_min_heap test conversion to KUnit

by Vitor Massaru Iha

This adds the conversion of the runtime tests of test_min_heap, from `lib/test_min_heap.c` to KUnit tests. Signed-off-by: Vitor Massaru Iha <vitor(a)massaru.org> --- v2: * min_heap test now runs when enabling full test coverage (KUNIT_ALL_TESTS). --- lib/Kconfig.debug | 29 ++++-- lib/Makefile | 2 +- lib/{test_min_heap.c => min_heap_kunit.c} | 117 ++++++++++++---------- 3 files changed, 83 insertions(+), 65 deletions(-) rename lib/{test_min_heap.c => min_heap_kunit.c} (60%) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 4f09c6505a2e..b75f4541e7d2 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1915,16 +1915,6 @@ config TEST_LIST_SORT If unsure, say N. -config TEST_MIN_HEAP - tristate "Min heap test" - depends on DEBUG_KERNEL || m - help - Enable this to turn on min heap function tests. This test is - executed only once during system boot (so affects only boot time), - or at module load time. - - If unsure, say N. - config TEST_SORT tristate "Array-based sort test" depends on DEBUG_KERNEL || m @@ -2256,6 +2246,25 @@ config BITS_TEST If unsure, say N. +config MIN_HEAP_KUNIT + tristate "KUnit test for Min heap" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + help + Enable this to turn on min heap function tests. This test is + executed only once during system boot (so affects only boot time), + or at module load time. + + KUnit tests run during boot and output the results to the debug log + in TAP format (http://testanything.org/). Only useful for kernel devs + running the KUnit test harness, and not intended for inclusion into a + production build. + + 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 TEST_UDELAY tristate "udelay test driver" help diff --git a/lib/Makefile b/lib/Makefile index d862d41fdc3d..c88ade843502 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -68,7 +68,6 @@ CFLAGS_test_ubsan.o += $(call cc-disable-warning, vla) 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_OVERFLOW) += test_overflow.o @@ -343,3 +342,4 @@ obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o obj-$(CONFIG_BITS_TEST) += test_bits.o +obj-$(CONFIG_MIN_HEAP_KUNIT) += min_heap_kunit.o diff --git a/lib/test_min_heap.c b/lib/min_heap_kunit.c similarity index 60% rename from lib/test_min_heap.c rename to lib/min_heap_kunit.c index d19c8080fd4d..398db1c63146 100644 --- a/lib/test_min_heap.c +++ b/lib/min_heap_kunit.c @@ -7,9 +7,8 @@ #include <linux/log2.h> #include <linux/min_heap.h> -#include <linux/module.h> -#include <linux/printk.h> #include <linux/random.h> +#include <kunit/test.h> static __init bool less_than(const void *lhs, const void *rhs) { @@ -29,37 +28,34 @@ static __init void swap_ints(void *lhs, void *rhs) *(int *)rhs = temp; } -static __init int pop_verify_heap(bool min_heap, +static __init void pop_verify_heap(struct kunit *context, + bool min_heap, struct min_heap *heap, const struct min_heap_callbacks *funcs) { int *values = heap->data; - int err = 0; int last; last = values[0]; min_heap_pop(heap, funcs); while (heap->nr > 0) { if (min_heap) { - if (last > values[0]) { - pr_err("error: expected %d <= %d\n", last, - values[0]); - err++; - } + KUNIT_EXPECT_FALSE_MSG(context, + last > values[0], + "expected %d <= %d\n", + last, values[0]); } else { - if (last < values[0]) { - pr_err("error: expected %d >= %d\n", last, - values[0]); - err++; - } + KUNIT_EXPECT_FALSE_MSG(context, + last < values[0], + "expected %d >= %d\n", + last, values[0]); } last = values[0]; min_heap_pop(heap, funcs); } - return err; } -static __init int test_heapify_all(bool min_heap) +static __init void test_heapify_all(struct kunit *context, bool min_heap) { int values[] = { 3, 1, 2, 4, 0x8000000, 0x7FFFFFF, 0, -3, -1, -2, -4, 0x8000000, 0x7FFFFFF }; @@ -73,12 +69,11 @@ static __init int test_heapify_all(bool min_heap) .less = min_heap ? less_than : greater_than, .swp = swap_ints, }; - int i, err; + int i; /* Test with known set of values. */ min_heapify_all(&heap, &funcs); - err = pop_verify_heap(min_heap, &heap, &funcs); - + pop_verify_heap(context, min_heap, &heap, &funcs); /* Test with randomly generated values. */ heap.nr = ARRAY_SIZE(values); @@ -86,12 +81,10 @@ static __init int test_heapify_all(bool min_heap) values[i] = get_random_int(); min_heapify_all(&heap, &funcs); - err += pop_verify_heap(min_heap, &heap, &funcs); - - return err; + pop_verify_heap(context, min_heap, &heap, &funcs); } -static __init int test_heap_push(bool min_heap) +static __init void test_heap_push(struct kunit *context, bool min_heap) { const int data[] = { 3, 1, 2, 4, 0x80000000, 0x7FFFFFFF, 0, -3, -1, -2, -4, 0x80000000, 0x7FFFFFFF }; @@ -106,25 +99,22 @@ static __init int test_heap_push(bool min_heap) .less = min_heap ? less_than : greater_than, .swp = swap_ints, }; - int i, temp, err; + int i, temp; /* Test with known set of values copied from data. */ for (i = 0; i < ARRAY_SIZE(data); i++) min_heap_push(&heap, &data[i], &funcs); - - err = pop_verify_heap(min_heap, &heap, &funcs); + pop_verify_heap(context, min_heap, &heap, &funcs); /* Test with randomly generated values. */ while (heap.nr < heap.size) { temp = get_random_int(); min_heap_push(&heap, &temp, &funcs); } - err += pop_verify_heap(min_heap, &heap, &funcs); - - return err; + pop_verify_heap(context, min_heap, &heap, &funcs); } -static __init int test_heap_pop_push(bool min_heap) +static __init void test_heap_pop_push(struct kunit *context, bool min_heap) { const int data[] = { 3, 1, 2, 4, 0x80000000, 0x7FFFFFFF, 0, -3, -1, -2, -4, 0x80000000, 0x7FFFFFFF }; @@ -139,7 +129,7 @@ static __init int test_heap_pop_push(bool min_heap) .less = min_heap ? less_than : greater_than, .swp = swap_ints, }; - int i, temp, err; + int i, temp; /* Fill values with data to pop and replace. */ temp = min_heap ? 0x80000000 : 0x7FFFFFFF; @@ -149,8 +139,7 @@ static __init int test_heap_pop_push(bool min_heap) /* Test with known set of values copied from data. */ for (i = 0; i < ARRAY_SIZE(data); i++) min_heap_pop_push(&heap, &data[i], &funcs); - - err = pop_verify_heap(min_heap, &heap, &funcs); + pop_verify_heap(context, min_heap, &heap, &funcs); heap.nr = 0; for (i = 0; i < ARRAY_SIZE(data); i++) @@ -161,34 +150,54 @@ static __init int test_heap_pop_push(bool min_heap) temp = get_random_int(); min_heap_pop_push(&heap, &temp, &funcs); } - err += pop_verify_heap(min_heap, &heap, &funcs); + pop_verify_heap(context, min_heap, &heap, &funcs); +} - return err; +static void __init test_heapify_all_true(struct kunit *context) +{ + test_heapify_all(context, true); } -static int __init test_min_heap_init(void) +static void __init test_heapify_all_false(struct kunit *context) { - int err = 0; - - err += test_heapify_all(true); - err += test_heapify_all(false); - err += test_heap_push(true); - err += test_heap_push(false); - err += test_heap_pop_push(true); - err += test_heap_pop_push(false); - if (err) { - pr_err("test failed with %d errors\n", err); - return -EINVAL; - } - pr_info("test passed\n"); - return 0; + test_heapify_all(context, true); +} + +static void __init test_heap_push_true(struct kunit *context) +{ + test_heap_push(context, true); +} + +static void __init test_heap_push_false(struct kunit *context) +{ + test_heap_push(context, false); } -module_init(test_min_heap_init); -static void __exit test_min_heap_exit(void) +static void __init test_heap_pop_push_true(struct kunit *context) { - /* do nothing */ + test_heap_pop_push(context, true); } -module_exit(test_min_heap_exit); + +static void __init test_heap_pop_push_false(struct kunit *context) +{ + test_heap_pop_push(context, false); +} + +static struct kunit_case __refdata min_heap_test_cases[] = { + KUNIT_CASE(test_heapify_all_true), + KUNIT_CASE(test_heapify_all_false), + KUNIT_CASE(test_heap_push_true), + KUNIT_CASE(test_heap_push_false), + KUNIT_CASE(test_heap_pop_push_true), + KUNIT_CASE(test_heap_pop_push_false), + {} +}; + +static struct kunit_suite min_heap_test_suite = { + .name = "min-heap", + .test_cases = min_heap_test_cases, +}; + +kunit_test_suites(&min_heap_test_suite); MODULE_LICENSE("GPL"); base-commit: d2585f5164c298aaaed14c2c8d313cbe7bd5b253 -- 2.26.2

4 years, 6 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror