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

[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

5 years

1
0
0 0

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

by Shuah Khan

Hi Linus, Please pull the following Kselftest fixes update for Linux 5.10-rc1. This kselftest fixes update consists of a selftests harness fix to flush stdout before forking to avoid parent and child printing duplicates messages. This is evident when test output is redirected to a file. The second fix is a tools/ wide change to avoid comma separated statements from Joe Perches. This fix spans tools/lib, tools/power/cpupower, and selftests. diff is attached Please note that there is a conflict in tools/testing/selftests/vm/gup_test.c between commit: aa803771a80a ("tools: Avoid comma separated statements") from the kselftest-fixes tree and commit: 5c64830675a6 ("mm/gup_benchmark: rename to mm/gup_test") from the akpm tree. tools/testing/selftests/vm/gup_benchmark.c has been renamed in 5c64830675a6 from akpm tree. Stephen fixed this up in linux-next. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 5c1e4f7e9e49b6925b1fb5c507d2c614f3edb292: selftests/timers: Turn off timeout setting (2020-08-20 15:49:28 -0600) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-fixes-5.10-rc1 for you to fetch changes up to aa803771a80aa2aa2d5cdd38434b369066fbb8fc: tools: Avoid comma separated statements (2020-10-02 10:36:36 -0600) ---------------------------------------------------------------- linux-kselftest-fixes-5.10-rc1 This kselftest fixes update consists of a selftests harness fix to flush stdout before forking to avoid parent and child printing duplicates messages. This is evident when test output is redirected to a file. The second fix is a tools/ wide change to avoid comma separated statements from Joe Perches. This fix spans tools/lib, tools/power/cpupower, and selftests. ---------------------------------------------------------------- Joe Perches (1): tools: Avoid comma separated statements Michael Ellerman (1): selftests/harness: Flush stdout before forking tools/lib/subcmd/help.c | 10 +- tools/power/cpupower/utils/cpufreq-set.c | 14 +- tools/testing/selftests/kselftest_harness.h | 5 + tools/testing/selftests/vm/gup_benchmark.c | 18 +- tools/testing/selftests/vm/userfaultfd.c | 296 +++++++++++++++++----------- 5 files changed, 215 insertions(+), 128 deletions(-) ----------------------------------------------------------------

5 years

2
1
0 0

WARNING: at net/netfilter/nf_tables_api.c:622 lockdep_nfnl_nft_mutex_not_held+0x28/0x38 [nf_tables]

by Naresh Kamboju

While running kselftest netfilter on arm64 hikey device on Linux next 20201013 the following kernel warning noticed. 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/hikey/lkft/linux-ne… steps to reproduce: --------------------------- # cd /opt/kselftests/default-in-kernel/ # ./run_kselftest.sh -c netfilter crash log: ---------------- # selftests: netfilter: nft_trans_stress.sh [ 1913.862919] ------------[ cut here ]------------ [ 1913.869773] WARNING: CPU: 2 PID: 31416 at /usr/src/kernel/net/netfilter/nf_tables_api.c:622 lockdep_nfnl_nft_mutex_not_held+0x28/0x38 [nf_tables] [ 1913.885399] Modules linked in: nf_tables nfnetlink act_mirred cls_u32 sch_etf xt_conntrack nf_conntrack nf_defrag_ipv4 libcrc32c ip6_tables nf_defrag_ipv6 ip_tables x_tables netdevsim 8021q garp mrp bridge stp llc sch_fq sch_ingress veth algif_hash wl18xx wlcore mac80211 cfg80211 snd_soc_hdmi_codec hci_uart btqca btbcm crct10dif_ce snd_soc_audio_graph_card snd_soc_simple_card_utils adv7511 wlcore_sdio cec bluetooth kirin_drm lima rfkill dw_drm_dsi gpu_sched drm_kms_helper drm fuse [last unloaded: test_blackhole_dev] [ 1913.941924] CPU: 2 PID: 31416 Comm: nft Tainted: G W 5.9.0-next-20201013 #1 [ 1913.954131] Hardware name: HiKey Development Board (DT) [ 1913.963342] pstate: 00000005 (nzcv daif -PAN -UAO -TCO BTYPE=--) [ 1913.973483] pc : lockdep_nfnl_nft_mutex_not_held+0x28/0x38 [nf_tables] [ 1913.984271] lr : lockdep_nfnl_nft_mutex_not_held+0x18/0x38 [nf_tables] [ 1913.995018] sp : ffff800013bc3550 [ 1914.002559] x29: ffff800013bc3550 x28: ffff800013bc3930 [ 1914.012197] x27: 0000000000000001 x26: ffff000045dc4e00 [ 1914.021880] x25: 0000000000000001 x24: ffff000045dc4e00 [ 1914.031565] x23: ffff800013bc3930 x22: 0000000000000001 [ 1914.041298] x21: ffff800012750000 x20: ffff800013bc3668 [ 1914.051068] x19: ffff800012750000 x18: 0000000000000000 [ 1914.060876] x17: 0000000000000000 x16: 0000000000000000 [ 1914.070699] x15: 0000000000000000 x14: ffff800009996d48 [ 1914.080534] x13: ffffffffff000000 x12: 0000000000000028 [ 1914.090418] x11: 0101010101010101 x10: 7f7f7f7f7f7f7f7f [ 1914.100355] x9 : fefefefefefefeff x8 : 7f7f7f7f7f7f7f7f [ 1914.110325] x7 : fefeff53544f4d48 x6 : 0000000000007ab8 [ 1914.120339] x5 : 0000000000000005 x4 : 0000000000000001 [ 1914.130388] x3 : 0000000000000001 x2 : 0000000000000000 [ 1914.140454] x1 : 00000000ffffffff x0 : 0000000000000001 [ 1914.150529] Call trace: [ 1914.157789] lockdep_nfnl_nft_mutex_not_held+0x28/0x38 [nf_tables] [ 1914.168967] nft_chain_parse_hook+0x58/0x320 [nf_tables] [ 1914.179342] nf_tables_addchain.isra.66+0xb8/0x510 [nf_tables] [ 1914.190340] nf_tables_newchain+0x408/0x618 [nf_tables] [ 1914.200734] nfnetlink_rcv_batch+0x4a0/0x610 [nfnetlink] [ 1914.211284] nfnetlink_rcv+0x174/0x1a8 [nfnetlink] [ 1914.221351] netlink_unicast+0x1dc/0x290 [ 1914.230589] netlink_sendmsg+0x2b8/0x3f8 [ 1914.239840] ____sys_sendmsg+0x288/0x2d0 [ 1914.249117] ___sys_sendmsg+0x90/0xd0 [ 1914.258154] __sys_sendmsg+0x78/0xd0 [ 1914.267140] __arm64_sys_sendmsg+0x2c/0x38 [ 1914.276705] el0_svc_common.constprop.3+0x7c/0x198 [ 1914.287041] do_el0_svc+0x34/0xa0 [ 1914.295928] el0_sync_handler+0x128/0x190 [ 1914.305567] el0_sync+0x140/0x180 [ 1914.314535] CPU: 2 PID: 31416 Comm: nft Tainted: G W 5.9.0-next-20201013 #1 [ 1914.328670] Hardware name: HiKey Development Board (DT) [ 1914.339812] Call trace: [ 1914.348184] dump_backtrace+0x0/0x1f0 [ 1914.357841] show_stack+0x2c/0x80 [ 1914.367181] dump_stack+0xf8/0x160 [ 1914.376615] __warn+0xac/0x168 [ 1914.385732] report_bug+0xcc/0x180 [ 1914.395242] bug_handler+0x24/0x78 [ 1914.404783] call_break_hook+0x80/0xa0 [ 1914.414725] brk_handler+0x28/0x68 [ 1914.424358] do_debug_exception+0xbc/0x128 [ 1914.434744] el1_sync_handler+0x7c/0x128 [ 1914.445017] el1_sync+0x7c/0x100 [ 1914.454625] lockdep_nfnl_nft_mutex_not_held+0x28/0x38 [nf_tables] [ 1914.467351] nft_chain_parse_hook+0x58/0x320 [nf_tables] [ 1914.479276] nf_tables_addchain.isra.66+0xb8/0x510 [nf_tables] [ 1914.491818] nf_tables_newchain+0x408/0x618 [nf_tables] [ 1914.503774] nfnetlink_rcv_batch+0x4a0/0x610 [nfnetlink] [ 1914.515899] nfnetlink_rcv+0x174/0x1a8 [nfnetlink] [ 1914.527525] netlink_unicast+0x1dc/0x290 [ 1914.538318] netlink_sendmsg+0x2b8/0x3f8 [ 1914.549125] ____sys_sendmsg+0x288/0x2d0 [ 1914.559959] ___sys_sendmsg+0x90/0xd0 [ 1914.570557] __sys_sendmsg+0x78/0xd0 [ 1914.581111] __arm64_sys_sendmsg+0x2c/0x38 [ 1914.592241] el0_svc_common.constprop.3+0x7c/0x198 [ 1914.604152] do_el0_svc+0x34/0xa0 [ 1914.614497] el0_sync_handler+0x128/0x190 [ 1914.625540] el0_sync+0x140/0x180 [ 1914.635652] irq event stamp: 0 [ 1914.645091] hardirqs last enabled at (0): [<0000000000000000>] 0x0 [ 1914.657471] hardirqs last disabled at (0): [<ffff80001008975c>] copy_process+0x68c/0x1910 [ 1914.671402] softirqs last enabled at (0): [<ffff80001008975c>] copy_process+0x68c/0x1910 [ 1914.685201] softirqs last disabled at (0): [<0000000000000000>] 0x0 [ 1914.696977] ---[ end trace 180274a5ab806f4e ]--- [ 1917.244483] hisi_thermal f7030700.tsensor: sensor <2> THERMAL ALARM: 66385 > 65000 Full test log link, https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20201013/te… -- Linaro LKFT https://lkft.linaro.org

5 years

1
1
0 0

[PATCH v6 64/80] kunit: test.h: fix a bad kernel-doc markup

by Mauro Carvalho Chehab

As warned by: ./include/kunit/test.h:504: WARNING: Block quote ends without a blank line; unexpected unindent. The right way to describe a function is: name - description Instead, kunit_remove_resource was using: name: description Causing it to be improperly parsed. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei(a)kernel.org> --- include/kunit/test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/kunit/test.h b/include/kunit/test.h index 41b3a266bf8c..5c5ed262a950 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -498,8 +498,8 @@ static inline int kunit_destroy_named_resource(struct kunit *test, } /** - * kunit_remove_resource: remove resource from resource list associated with - * test. + * kunit_remove_resource() - remove resource from resource list associated with + * test. * @test: The test context object. * @res: The resource to be removed. * -- 2.26.2

5 years

1
0
0 0

[PATCH v6 61/80] kunit: test.h: solve kernel-doc warnings

by Mauro Carvalho Chehab

There are some warnings there: ./include/kunit/test.h:90: warning: Function parameter or member 'name' not described in 'kunit_resource' ./include/kunit/test.h:353: warning: Function parameter or member 'res' not described in 'kunit_add_resource' ./include/kunit/test.h:367: warning: Function parameter or member 'res' not described in 'kunit_add_named_resource' ./include/kunit/test.h:367: warning: Function parameter or member 'name' not described in 'kunit_add_named_resource' ./include/kunit/test.h:367: warning: Function parameter or member 'data' not described in 'kunit_add_named_resource' ./include/kunit/test.h:367: warning: Excess function parameter 'name_data' description in 'kunit_add_named_resource' Address them, ensuring that all non-private arguments will be properly described. With that regards, at struct kunit_resource, the free argument is described as user-provided. So, this doesn't seem to belong to the "private" part of the struct. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei(a)kernel.org> --- include/kunit/test.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/kunit/test.h b/include/kunit/test.h index 59f3144f009a..41b3a266bf8c 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -25,6 +25,7 @@ typedef void (*kunit_resource_free_t)(struct kunit_resource *); /** * struct kunit_resource - represents a *test managed resource* * @data: for the user to store arbitrary data. + * @name: optional name * @free: a user supplied function to free the resource. Populated by * kunit_resource_alloc(). * @@ -80,10 +81,10 @@ typedef void (*kunit_resource_free_t)(struct kunit_resource *); */ struct kunit_resource { void *data; - const char *name; /* optional name */ - - /* private: internal use only. */ + const char *name; kunit_resource_free_t free; + + /* private: internal use only. */ struct kref refcount; struct list_head node; }; @@ -343,6 +344,7 @@ static inline void kunit_put_resource(struct kunit_resource *res) * none is supplied, the resource data value is simply set to @data. * If an init function is supplied, @data is passed to it instead. * @free: a user-supplied function to free the resource (if needed). + * @res: The resource. * @data: value to pass to init function or set in resource data field. */ int kunit_add_resource(struct kunit *test, @@ -356,7 +358,9 @@ int kunit_add_resource(struct kunit *test, * @test: The test context object. * @init: a user-supplied function to initialize the resource data, if needed. * @free: a user-supplied function to free the resource data, if needed. - * @name_data: name and data to be set for resource. + * @res: The resource. + * @name: name to be set for resource. + * @data: value to pass to init function or set in resource data field. */ int kunit_add_named_resource(struct kunit *test, kunit_resource_init_t init, -- 2.26.2

5 years

1
0
0 0

[PATCH v6 0/5] kunit: create a centralized executor to dispatch all KUnit tests

by Brendan Higgins

## TL;DR This patchset adds a centralized executor to dispatch tests rather than relying on late_initcall to schedule each test suite separately along with a couple of new features that depend on it. ## What am I trying to do? Conceptually, I am trying to provide a mechanism by which test suites can be grouped together so that they can be reasoned about collectively. The second to last patch in this series add features which depend on this: PATCH 04/05 Prints out a test plan[1] right before KUnit tests are run; this is valuable because it makes it possible for a test harness to detect whether the number of tests run matches the number of tests expected to be run, ensuring that no tests silently failed. The test plan includes a count of tests that will run. With the centralized executor, the tests are located in a single data structure and thus can be counted. In addition, by dispatching tests from a single location, we can guarantee that all KUnit tests run after late_init is complete, which was a concern during the initial KUnit patchset review (this has not been a problem in practice, but resolving with certainty is nevertheless desirable). Other use cases for this exist, but the above features should provide an idea of the value that this could provide. ## Changes since last revision: - Renamed the KUNIT_TEST_SUITES the KUNIT_TABLE section and moved it from INIT_DATA_SECTION to INIT_DATA; this had the additional consequence of making the first several architecture specific patches unnecessary - suggested by Kees. - Dropped the kunit_shutdown patches; I think it makes more sense to reintroduce them in a later patchset. Alan Maguire (1): kunit: test: create a single centralized executor for all tests Brendan Higgins (4): vmlinux.lds.h: add linker section for KUnit test suites init: main: add KUnit to kernel init kunit: test: add test plan to KUnit TAP format Documentation: kunit: add a brief blurb about kunit_test_suite Documentation/dev-tools/kunit/usage.rst | 5 ++ include/asm-generic/vmlinux.lds.h | 10 ++- include/kunit/test.h | 76 +++++++++++++----- init/main.c | 4 + lib/kunit/Makefile | 3 +- lib/kunit/executor.c | 43 ++++++++++ lib/kunit/test.c | 13 +-- tools/testing/kunit/kunit_parser.py | 76 ++++++++++++++---- .../test_is_test_passed-all_passed.log | Bin 1562 -> 1567 bytes .../test_data/test_is_test_passed-crash.log | Bin 3016 -> 3021 bytes .../test_data/test_is_test_passed-failure.log | Bin 1700 -> 1705 bytes 11 files changed, 180 insertions(+), 50 deletions(-) create mode 100644 lib/kunit/executor.c base-commit: 145ff1ec090dce9beb5a9590b5dc288e7bb2e65d -- 2.28.0.163.g6104cc2f0b6-goog

5 years

3
7
0 0

[PATCH] lib: Convert test_printf.c to KUnit

by Arpitha Raghunandan

Converts test lib/test_printf.c to KUnit. More information about KUnit can be found at https://www.kernel.org/doc/html/latest/dev-tools/kunit/index.html. KUnit provides a common framework for unit tests in the kernel. Signed-off-by: Arpitha Raghunandan <98.arpi(a)gmail.com> --- lib/Kconfig.debug | 7 +- lib/Makefile | 2 +- lib/{test_printf.c => printf_kunit.c} | 498 +++++++++++++------------- 3 files changed, 246 insertions(+), 261 deletions(-) rename lib/{test_printf.c => printf_kunit.c} (45%) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index e068c3c7189a..7454258cf57a 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -2027,9 +2027,6 @@ config TEST_STRSCPY config TEST_KSTRTOX tristate "Test kstrto*() family of functions at runtime" -config TEST_PRINTF - tristate "Test printf() family of functions at runtime" - config TEST_BITMAP tristate "Test bitmap_*() family of functions at runtime" help @@ -2247,6 +2244,10 @@ config BITS_TEST If unsure, say N. +config PRINTF_KUNIT_TEST + tristate "KUnit tests for printf() family of functions at runtime" + depends on KUNIT + config TEST_UDELAY tristate "udelay test driver" help diff --git a/lib/Makefile b/lib/Makefile index e290fc5707ea..68e5b32a185f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -77,7 +77,6 @@ obj-$(CONFIG_TEST_SORT) += test_sort.o obj-$(CONFIG_TEST_USER_COPY) += test_user_copy.o obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_keys.o obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_key_base.o -obj-$(CONFIG_TEST_PRINTF) += test_printf.o obj-$(CONFIG_TEST_BITMAP) += test_bitmap.o obj-$(CONFIG_TEST_STRSCPY) += test_strscpy.o obj-$(CONFIG_TEST_BITFIELD) += test_bitfield.o @@ -343,3 +342,4 @@ obj-$(CONFIG_PLDMFW) += pldmfw/ 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_PRINTF_KUNIT_TEST) += printf_kunit.o diff --git a/lib/test_printf.c b/lib/printf_kunit.c similarity index 45% rename from lib/test_printf.c rename to lib/printf_kunit.c index 7ac87f18a10f..68ac5f9b8d28 100644 --- a/lib/test_printf.c +++ b/lib/printf_kunit.c @@ -5,6 +5,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <kunit/test.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> @@ -30,79 +31,61 @@ #define PAD_SIZE 16 #define FILL_CHAR '$' -static unsigned total_tests __initdata; -static unsigned failed_tests __initdata; -static char *test_buffer __initdata; -static char *alloced_buffer __initdata; +static char *test_buffer; +static char *alloced_buffer; -static int __printf(4, 0) __init -do_test(int bufsize, const char *expect, int elen, +static void __printf(5, 0) +do_test(struct kunit *kunittest, int bufsize, const char *expect, int elen, const char *fmt, va_list ap) { va_list aq; int ret, written; - total_tests++; - memset(alloced_buffer, FILL_CHAR, BUF_SIZE + 2*PAD_SIZE); va_copy(aq, ap); ret = vsnprintf(test_buffer, bufsize, fmt, aq); va_end(aq); - if (ret != elen) { - pr_warn("vsnprintf(buf, %d, \"%s\", ...) returned %d, expected %d\n", + KUNIT_EXPECT_EQ_MSG(kunittest, ret, elen, + "vsnprintf(buf, %d, \"%s\", ...) returned %d, expected %d\n", bufsize, fmt, ret, elen); - return 1; - } - if (memchr_inv(alloced_buffer, FILL_CHAR, PAD_SIZE)) { - pr_warn("vsnprintf(buf, %d, \"%s\", ...) wrote before buffer\n", bufsize, fmt); - return 1; - } + KUNIT_EXPECT_EQ_MSG(kunittest, memchr_inv(alloced_buffer, FILL_CHAR, PAD_SIZE), NULL, + "vsnprintf(buf, %d, \"%s\", ...) wrote before buffer\n", + bufsize, fmt); if (!bufsize) { - if (memchr_inv(test_buffer, FILL_CHAR, BUF_SIZE + PAD_SIZE)) { - pr_warn("vsnprintf(buf, 0, \"%s\", ...) wrote to buffer\n", - fmt); - return 1; - } - return 0; + KUNIT_EXPECT_FALSE_MSG(kunittest, + memchr_inv(test_buffer, FILL_CHAR, BUF_SIZE + PAD_SIZE), + "vsnprintf(buf, 0, \"%s\", ...) wrote to buffer\n", fmt); + return; } written = min(bufsize-1, elen); - if (test_buffer[written]) { - pr_warn("vsnprintf(buf, %d, \"%s\", ...) did not nul-terminate buffer\n", + KUNIT_EXPECT_FALSE_MSG(kunittest, test_buffer[written], + "vsnprintf(buf, %d, \"%s\", ...) did not nul-terminate buffer\n", bufsize, fmt); - return 1; - } - if (memchr_inv(test_buffer + written + 1, FILL_CHAR, BUF_SIZE + PAD_SIZE - (written + 1))) { - pr_warn("vsnprintf(buf, %d, \"%s\", ...) wrote beyond the nul-terminator\n", + KUNIT_EXPECT_FALSE_MSG(kunittest, + memchr_inv(test_buffer + written + 1, FILL_CHAR, BUF_SIZE + PAD_SIZE - (written + 1)), + "vsnprintf(buf, %d, \"%s\", ...) wrote beyond the nul-terminator\n", bufsize, fmt); - return 1; - } - if (memcmp(test_buffer, expect, written)) { - pr_warn("vsnprintf(buf, %d, \"%s\", ...) wrote '%s', expected '%.*s'\n", + KUNIT_EXPECT_EQ_MSG(kunittest, memcmp(test_buffer, expect, written), 0, + "vsnprintf(buf, %d, \"%s\", ...) wrote '%s', expected '%.*s'\n", bufsize, fmt, test_buffer, written, expect); - return 1; - } - return 0; } -static void __printf(3, 4) __init -__test(const char *expect, int elen, const char *fmt, ...) +static void __printf(4, 5) +__test(struct kunit *kunittest, const char *expect, int elen, const char *fmt, ...) { va_list ap; int rand; char *p; - if (elen >= BUF_SIZE) { - pr_err("error in test suite: expected output length %d too long. Format was '%s'.\n", - elen, fmt); - failed_tests++; - return; - } + KUNIT_EXPECT_LT_MSG(kunittest, elen, BUF_SIZE, + "error in test suite: expected output length %d too long. Format was '%s'.\n", + elen, fmt); va_start(ap, fmt); @@ -112,49 +95,46 @@ __test(const char *expect, int elen, const char *fmt, ...) * enough and 0), and then we also test that kvasprintf would * be able to print it as expected. */ - failed_tests += do_test(BUF_SIZE, expect, elen, fmt, ap); + do_test(kunittest, BUF_SIZE, expect, elen, fmt, ap); rand = 1 + prandom_u32_max(elen+1); /* Since elen < BUF_SIZE, we have 1 <= rand <= BUF_SIZE. */ - failed_tests += do_test(rand, expect, elen, fmt, ap); - failed_tests += do_test(0, expect, elen, fmt, ap); + do_test(kunittest, rand, expect, elen, fmt, ap); + do_test(kunittest, 0, expect, elen, fmt, ap); p = kvasprintf(GFP_KERNEL, fmt, ap); if (p) { - total_tests++; - if (memcmp(p, expect, elen+1)) { - pr_warn("kvasprintf(..., \"%s\", ...) returned '%s', expected '%s'\n", + KUNIT_EXPECT_EQ_MSG(kunittest, memcmp(p, expect, elen+1), 0, + "kvasprintf(..., \"%s\", ...) returned '%s', expected '%s'\n", fmt, p, expect); - failed_tests++; - } kfree(p); } va_end(ap); } -#define test(expect, fmt, ...) \ - __test(expect, strlen(expect), fmt, ##__VA_ARGS__) +#define test(kunittest, expect, fmt, ...) \ + __test(kunittest, expect, strlen(expect), fmt, ##__VA_ARGS__) -static void __init -test_basic(void) +static void +test_basic(struct kunit *kunittest) { /* Work around annoying "warning: zero-length gnu_printf format string". */ char nul = '\0'; - test("", &nul); - test("100%", "100%%"); - test("xxx%yyy", "xxx%cyyy", '%'); - __test("xxx\0yyy", 7, "xxx%cyyy", '\0'); + test(kunittest, "", &nul); + test(kunittest, "100%", "100%%"); + test(kunittest, "xxx%yyy", "xxx%cyyy", '%'); + __test(kunittest, "xxx\0yyy", 7, "xxx%cyyy", '\0'); } -static void __init -test_number(void) +static void +test_number(struct kunit *kunittest) { - test("0x1234abcd ", "%#-12x", 0x1234abcd); - test(" 0x1234abcd", "%#12x", 0x1234abcd); - test("0|001| 12|+123| 1234|-123|-1234", "%d|%03d|%3d|%+d|% d|%+d|% d", 0, 1, 12, 123, 1234, -123, -1234); - test("0|1|1|128|255", "%hhu|%hhu|%hhu|%hhu|%hhu", 0, 1, 257, 128, -1); - test("0|1|1|-128|-1", "%hhd|%hhd|%hhd|%hhd|%hhd", 0, 1, 257, 128, -1); - test("2015122420151225", "%ho%ho%#ho", 1037, 5282, -11627); + test(kunittest, "0x1234abcd ", "%#-12x", 0x1234abcd); + test(kunittest, " 0x1234abcd", "%#12x", 0x1234abcd); + test(kunittest, "0|001| 12|+123| 1234|-123|-1234", "%d|%03d|%3d|%+d|% d|%+d|% d", 0, 1, 12, 123, 1234, -123, -1234); + test(kunittest, "0|1|1|128|255", "%hhu|%hhu|%hhu|%hhu|%hhu", 0, 1, 257, 128, -1); + test(kunittest, "0|1|1|-128|-1", "%hhd|%hhd|%hhd|%hhd|%hhd", 0, 1, 257, 128, -1); + test(kunittest, "2015122420151225", "%ho%ho%#ho", 1037, 5282, -11627); /* * POSIX/C99: »The result of converting zero with an explicit * precision of zero shall be no characters.« Hence the output @@ -163,7 +143,7 @@ test_number(void) * case. This test case simply documents the current * behaviour. */ - test("00|0|0|0|0", "%.2d|%.1d|%.0d|%.*d|%1.0d", 0, 0, 0, 0, 0, 0); + test(kunittest, "00|0|0|0|0", "%.2d|%.1d|%.0d|%.*d|%1.0d", 0, 0, 0, 0, 0, 0); #ifndef __CHAR_UNSIGNED__ { /* @@ -173,19 +153,19 @@ test_number(void) * with 0xff or cast to u8. */ char val = -16; - test("0xfffffff0|0xf0|0xf0", "%#02x|%#02x|%#02x", val, val & 0xff, (u8)val); + test(kunittest, "0xfffffff0|0xf0|0xf0", "%#02x|%#02x|%#02x", val, val & 0xff, (u8)val); } #endif } -static void __init -test_string(void) +static void +test_string(struct kunit *kunittest) { - test("", "%s%.0s", "", "123"); - test("ABCD|abc|123", "%s|%.3s|%.*s", "ABCD", "abcdef", 3, "123456"); - test("1 | 2|3 | 4|5 ", "%-3s|%3s|%-*s|%*s|%*s", "1", "2", 3, "3", 3, "4", -3, "5"); - test("1234 ", "%-10.4s", "123456"); - test(" 1234", "%10.4s", "123456"); + test(kunittest, "", "%s%.0s", "", "123"); + test(kunittest, "ABCD|abc|123", "%s|%.3s|%.*s", "ABCD", "abcdef", 3, "123456"); + test(kunittest, "1 | 2|3 | 4|5 ", "%-3s|%3s|%-*s|%*s|%*s", "1", "2", 3, "3", 3, "4", -3, "5"); + test(kunittest, "1234 ", "%-10.4s", "123456"); + test(kunittest, " 1234", "%10.4s", "123456"); /* * POSIX and C99 say that a negative precision (which is only * possible to pass via a * argument) should be treated as if @@ -199,10 +179,10 @@ test_string(void) * anyone ever feel the need to follow the standards more * closely, this can be revisited. */ - test(" ", "%4.*s", -5, "123456"); - test("123456", "%.s", "123456"); - test("a||", "%.s|%.0s|%.*s", "a", "b", 0, "c"); - test("a | | ", "%-3.s|%-3.0s|%-3.*s", "a", "b", 0, "c"); + test(kunittest, " ", "%4.*s", -5, "123456"); + test(kunittest, "123456", "%.s", "123456"); + test(kunittest, "a||", "%.s|%.0s|%.*s", "a", "b", 0, "c"); + test(kunittest, "a | | ", "%-3.s|%-3.0s|%-3.*s", "a", "b", 0, "c"); } #define PLAIN_BUF_SIZE 64 /* leave some space so we don't oops */ @@ -216,7 +196,7 @@ test_string(void) #define ZEROS "00000000" /* hex 32 zero bits */ #define ONES "ffffffff" /* hex 32 one bits */ -static int __init +static int plain_format(void) { char buf[PLAIN_BUF_SIZE]; @@ -248,7 +228,7 @@ plain_format(void) #define ZEROS "" #define ONES "" -static int __init +static int plain_format(void) { /* Format is implicitly tested for 32 bit machines by plain_hash() */ @@ -257,7 +237,7 @@ plain_format(void) #endif /* BITS_PER_LONG == 64 */ -static int __init +static int plain_hash_to_buffer(const void *p, char *buf, size_t len) { int nchars; @@ -276,7 +256,7 @@ plain_hash_to_buffer(const void *p, char *buf, size_t len) return 0; } -static int __init +static int plain_hash(void) { char buf[PLAIN_BUF_SIZE]; @@ -296,27 +276,20 @@ plain_hash(void) * We can't use test() to test %p because we don't know what output to expect * after an address is hashed. */ -static void __init -plain(void) +static void +plain(struct kunit *kunittest) { int err; err = plain_hash(); - if (err) { - pr_warn("plain 'p' does not appear to be hashed\n"); - failed_tests++; - return; - } + KUNIT_EXPECT_EQ_MSG(kunittest, err, 0, "plain 'p' does not appear to be hashed\n"); err = plain_format(); - if (err) { - pr_warn("hashing plain 'p' has unexpected format\n"); - failed_tests++; - } + KUNIT_EXPECT_EQ_MSG(kunittest, err, 0, "hashing plain 'p' has unexpected format\n"); } -static void __init -test_hashed(const char *fmt, const void *p) +static void +test_hashed(struct kunit *kunittest, const char *fmt, const void *p) { char buf[PLAIN_BUF_SIZE]; int ret; @@ -329,92 +302,92 @@ test_hashed(const char *fmt, const void *p) if (ret) return; - test(buf, fmt, p); + test(kunittest, buf, fmt, p); } /* * NULL pointers aren't hashed. */ -static void __init -null_pointer(void) +static void +null_pointer(struct kunit *kunittest) { - test(ZEROS "00000000", "%p", NULL); - test(ZEROS "00000000", "%px", NULL); - test("(null)", "%pE", NULL); + test(kunittest, ZEROS "00000000", "%p", NULL); + test(kunittest, ZEROS "00000000", "%px", NULL); + test(kunittest, "(null)", "%pE", NULL); } /* * Error pointers aren't hashed. */ -static void __init -error_pointer(void) +static void +error_pointer(struct kunit *kunittest) { - test(ONES "fffffff5", "%p", ERR_PTR(-11)); - test(ONES "fffffff5", "%px", ERR_PTR(-11)); - test("(efault)", "%pE", ERR_PTR(-11)); + test(kunittest, ONES "fffffff5", "%p", ERR_PTR(-11)); + test(kunittest, ONES "fffffff5", "%px", ERR_PTR(-11)); + test(kunittest, "(efault)", "%pE", ERR_PTR(-11)); } #define PTR_INVALID ((void *)0x000000ab) -static void __init -invalid_pointer(void) +static void +invalid_pointer(struct kunit *kunittest) { - test_hashed("%p", PTR_INVALID); - test(ZEROS "000000ab", "%px", PTR_INVALID); - test("(efault)", "%pE", PTR_INVALID); + test_hashed(kunittest, "%p", PTR_INVALID); + test(kunittest, ZEROS "000000ab", "%px", PTR_INVALID); + test(kunittest, "(efault)", "%pE", PTR_INVALID); } -static void __init -symbol_ptr(void) +static void +symbol_ptr(struct kunit *kunittest) { } -static void __init -kernel_ptr(void) +static void +kernel_ptr(struct kunit *kunittest) { /* We can't test this without access to kptr_restrict. */ } -static void __init -struct_resource(void) +static void +struct_resource(struct kunit *kunittest) { } -static void __init -addr(void) +static void +addr(struct kunit *kunittest) { } -static void __init -escaped_str(void) +static void +escaped_str(struct kunit *kunittest) { } -static void __init -hex_string(void) +static void +hex_string(struct kunit *kunittest) { const char buf[3] = {0xc0, 0xff, 0xee}; - test("c0 ff ee|c0:ff:ee|c0-ff-ee|c0ffee", + test(kunittest, "c0 ff ee|c0:ff:ee|c0-ff-ee|c0ffee", "%3ph|%3phC|%3phD|%3phN", buf, buf, buf, buf); - test("c0 ff ee|c0:ff:ee|c0-ff-ee|c0ffee", + test(kunittest, "c0 ff ee|c0:ff:ee|c0-ff-ee|c0ffee", "%*ph|%*phC|%*phD|%*phN", 3, buf, 3, buf, 3, buf, 3, buf); } -static void __init -mac(void) +static void +mac(struct kunit *kunittest) { const u8 addr[6] = {0x2d, 0x48, 0xd6, 0xfc, 0x7a, 0x05}; - test("2d:48:d6:fc:7a:05", "%pM", addr); - test("05:7a:fc:d6:48:2d", "%pMR", addr); - test("2d-48-d6-fc-7a-05", "%pMF", addr); - test("2d48d6fc7a05", "%pm", addr); - test("057afcd6482d", "%pmR", addr); + test(kunittest, "2d:48:d6:fc:7a:05", "%pM", addr); + test(kunittest, "05:7a:fc:d6:48:2d", "%pMR", addr); + test(kunittest, "2d-48-d6-fc-7a-05", "%pMF", addr); + test(kunittest, "2d48d6fc7a05", "%pm", addr); + test(kunittest, "057afcd6482d", "%pmR", addr); } -static void __init -ip4(void) +static void +ip4(struct kunit *kunittest) { struct sockaddr_in sa; @@ -422,34 +395,34 @@ ip4(void) sa.sin_port = cpu_to_be16(12345); sa.sin_addr.s_addr = cpu_to_be32(0x7f000001); - test("127.000.000.001|127.0.0.1", "%pi4|%pI4", &sa.sin_addr, &sa.sin_addr); - test("127.000.000.001|127.0.0.1", "%piS|%pIS", &sa, &sa); + test(kunittest, "127.000.000.001|127.0.0.1", "%pi4|%pI4", &sa.sin_addr, &sa.sin_addr); + test(kunittest, "127.000.000.001|127.0.0.1", "%piS|%pIS", &sa, &sa); sa.sin_addr.s_addr = cpu_to_be32(0x01020304); - test("001.002.003.004:12345|1.2.3.4:12345", "%piSp|%pISp", &sa, &sa); + test(kunittest, "001.002.003.004:12345|1.2.3.4:12345", "%piSp|%pISp", &sa, &sa); } -static void __init -ip6(void) +static void +ip6(struct kunit *kunittest) { } -static void __init -ip(void) +static void +ip(struct kunit *kunittest) { - ip4(); - ip6(); + ip4(kunittest); + ip6(kunittest); } -static void __init -uuid(void) +static void +uuid(struct kunit *kunittest) { const char uuid[16] = {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf}; - test("00010203-0405-0607-0809-0a0b0c0d0e0f", "%pUb", uuid); - test("00010203-0405-0607-0809-0A0B0C0D0E0F", "%pUB", uuid); - test("03020100-0504-0706-0809-0a0b0c0d0e0f", "%pUl", uuid); - test("03020100-0504-0706-0809-0A0B0C0D0E0F", "%pUL", uuid); + test(kunittest, "00010203-0405-0607-0809-0a0b0c0d0e0f", "%pUb", uuid); + test(kunittest, "00010203-0405-0607-0809-0A0B0C0D0E0F", "%pUB", uuid); + test(kunittest, "03020100-0504-0706-0809-0a0b0c0d0e0f", "%pUl", uuid); + test(kunittest, "03020100-0504-0706-0809-0A0B0C0D0E0F", "%pUL", uuid); } static struct dentry test_dentry[4] __initdata = { @@ -467,34 +440,34 @@ static struct dentry test_dentry[4] __initdata = { .d_iname = "romeo" }, }; -static void __init -dentry(void) +static void +dentry(struct kunit *kunittest) { - test("foo", "%pd", &test_dentry[0]); - test("foo", "%pd2", &test_dentry[0]); + test(kunittest, "foo", "%pd", &test_dentry[0]); + test(kunittest, "foo", "%pd2", &test_dentry[0]); - test("(null)", "%pd", NULL); - test("(efault)", "%pd", PTR_INVALID); - test("(null)", "%pD", NULL); - test("(efault)", "%pD", PTR_INVALID); + test(kunittest, "(null)", "%pd", NULL); + test(kunittest, "(efault)", "%pd", PTR_INVALID); + test(kunittest, "(null)", "%pD", NULL); + test(kunittest, "(efault)", "%pD", PTR_INVALID); - test("romeo", "%pd", &test_dentry[3]); - test("alfa/romeo", "%pd2", &test_dentry[3]); - test("bravo/alfa/romeo", "%pd3", &test_dentry[3]); - test("/bravo/alfa/romeo", "%pd4", &test_dentry[3]); - test("/bravo/alfa", "%pd4", &test_dentry[2]); + test(kunittest, "romeo", "%pd", &test_dentry[3]); + test(kunittest, "alfa/romeo", "%pd2", &test_dentry[3]); + test(kunittest, "bravo/alfa/romeo", "%pd3", &test_dentry[3]); + test(kunittest, "/bravo/alfa/romeo", "%pd4", &test_dentry[3]); + test(kunittest, "/bravo/alfa", "%pd4", &test_dentry[2]); - test("bravo/alfa |bravo/alfa ", "%-12pd2|%*pd2", &test_dentry[2], -12, &test_dentry[2]); - test(" bravo/alfa| bravo/alfa", "%12pd2|%*pd2", &test_dentry[2], 12, &test_dentry[2]); + test(kunittest, "bravo/alfa |bravo/alfa ", "%-12pd2|%*pd2", &test_dentry[2], -12, &test_dentry[2]); + test(kunittest, " bravo/alfa| bravo/alfa", "%12pd2|%*pd2", &test_dentry[2], 12, &test_dentry[2]); } -static void __init -struct_va_format(void) +static void +struct_va_format(struct kunit *kunittest) { } -static void __init -time_and_date(void) +static void +time_and_date(struct kunit *kunittest) { /* 1543210543 */ const struct rtc_time tm = { @@ -508,27 +481,27 @@ time_and_date(void) /* 2019-01-04T15:32:23 */ time64_t t = 1546615943; - test("(%pt?)", "%pt", &tm); - test("2018-11-26T05:35:43", "%ptR", &tm); - test("0118-10-26T05:35:43", "%ptRr", &tm); - test("05:35:43|2018-11-26", "%ptRt|%ptRd", &tm, &tm); - test("05:35:43|0118-10-26", "%ptRtr|%ptRdr", &tm, &tm); - test("05:35:43|2018-11-26", "%ptRttr|%ptRdtr", &tm, &tm); - test("05:35:43 tr|2018-11-26 tr", "%ptRt tr|%ptRd tr", &tm, &tm); + test(kunittest, "(%pt?)", "%pt", &tm); + test(kunittest, "2018-11-26T05:35:43", "%ptR", &tm); + test(kunittest, "0118-10-26T05:35:43", "%ptRr", &tm); + test(kunittest, "05:35:43|2018-11-26", "%ptRt|%ptRd", &tm, &tm); + test(kunittest, "05:35:43|0118-10-26", "%ptRtr|%ptRdr", &tm, &tm); + test(kunittest, "05:35:43|2018-11-26", "%ptRttr|%ptRdtr", &tm, &tm); + test(kunittest, "05:35:43 tr|2018-11-26 tr", "%ptRt tr|%ptRd tr", &tm, &tm); - test("2019-01-04T15:32:23", "%ptT", &t); - test("0119-00-04T15:32:23", "%ptTr", &t); - test("15:32:23|2019-01-04", "%ptTt|%ptTd", &t, &t); - test("15:32:23|0119-00-04", "%ptTtr|%ptTdr", &t, &t); + test(kunittest, "2019-01-04T15:32:23", "%ptT", &t); + test(kunittest, "0119-00-04T15:32:23", "%ptTr", &t); + test(kunittest, "15:32:23|2019-01-04", "%ptTt|%ptTd", &t, &t); + test(kunittest, "15:32:23|0119-00-04", "%ptTtr|%ptTdr", &t, &t); } -static void __init -struct_clk(void) +static void +struct_clk(struct kunit *kunittest) { } -static void __init -large_bitmap(void) +static void +large_bitmap(struct kunit *kunittest) { const int nbits = 1 << 16; unsigned long *bits = bitmap_zalloc(nbits, GFP_KERNEL); @@ -537,69 +510,69 @@ large_bitmap(void) bitmap_set(bits, 1, 20); bitmap_set(bits, 60000, 15); - test("1-20,60000-60014", "%*pbl", nbits, bits); + test(kunittest, "1-20,60000-60014", "%*pbl", nbits, bits); bitmap_free(bits); } -static void __init -bitmap(void) +static void +bitmap(struct kunit *kunittest) { DECLARE_BITMAP(bits, 20); const int primes[] = {2,3,5,7,11,13,17,19}; int i; bitmap_zero(bits, 20); - test("00000|00000", "%20pb|%*pb", bits, 20, bits); - test("|", "%20pbl|%*pbl", bits, 20, bits); + test(kunittest, "00000|00000", "%20pb|%*pb", bits, 20, bits); + test(kunittest, "|", "%20pbl|%*pbl", bits, 20, bits); for (i = 0; i < ARRAY_SIZE(primes); ++i) set_bit(primes[i], bits); - test("a28ac|a28ac", "%20pb|%*pb", bits, 20, bits); - test("2-3,5,7,11,13,17,19|2-3,5,7,11,13,17,19", "%20pbl|%*pbl", bits, 20, bits); + test(kunittest, "a28ac|a28ac", "%20pb|%*pb", bits, 20, bits); + test(kunittest, "2-3,5,7,11,13,17,19|2-3,5,7,11,13,17,19", "%20pbl|%*pbl", bits, 20, bits); bitmap_fill(bits, 20); - test("fffff|fffff", "%20pb|%*pb", bits, 20, bits); - test("0-19|0-19", "%20pbl|%*pbl", bits, 20, bits); + test(kunittest, "fffff|fffff", "%20pb|%*pb", bits, 20, bits); + test(kunittest, "0-19|0-19", "%20pbl|%*pbl", bits, 20, bits); - large_bitmap(); + large_bitmap(kunittest); } -static void __init -netdev_features(void) +static void +netdev_features(struct kunit *kunittest) { } -static void __init -flags(void) +static void +flags(struct kunit *kunittest) { unsigned long flags; gfp_t gfp; char *cmp_buffer; flags = 0; - test("", "%pGp", &flags); + test(kunittest, "", "%pGp", &flags); /* Page flags should filter the zone id */ flags = 1UL << NR_PAGEFLAGS; - test("", "%pGp", &flags); + test(kunittest, "", "%pGp", &flags); flags |= 1UL << PG_uptodate | 1UL << PG_dirty | 1UL << PG_lru | 1UL << PG_active | 1UL << PG_swapbacked; - test("uptodate|dirty|lru|active|swapbacked", "%pGp", &flags); + test(kunittest, "uptodate|dirty|lru|active|swapbacked", "%pGp", &flags); flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC | VM_DENYWRITE; - test("read|exec|mayread|maywrite|mayexec|denywrite", "%pGv", &flags); + test(kunittest, "read|exec|mayread|maywrite|mayexec|denywrite", "%pGv", &flags); gfp = GFP_TRANSHUGE; - test("GFP_TRANSHUGE", "%pGg", &gfp); + test(kunittest, "GFP_TRANSHUGE", "%pGg", &gfp); gfp = GFP_ATOMIC|__GFP_DMA; - test("GFP_ATOMIC|GFP_DMA", "%pGg", &gfp); + test(kunittest, "GFP_ATOMIC|GFP_DMA", "%pGg", &gfp); gfp = __GFP_ATOMIC; - test("__GFP_ATOMIC", "%pGg", &gfp); + test(kunittest, "__GFP_ATOMIC", "%pGg", &gfp); cmp_buffer = kmalloc(BUF_SIZE, GFP_KERNEL); if (!cmp_buffer) @@ -608,17 +581,17 @@ flags(void) /* Any flags not translated by the table should remain numeric */ gfp = ~__GFP_BITS_MASK; snprintf(cmp_buffer, BUF_SIZE, "%#lx", (unsigned long) gfp); - test(cmp_buffer, "%pGg", &gfp); + test(kunittest, cmp_buffer, "%pGg", &gfp); snprintf(cmp_buffer, BUF_SIZE, "__GFP_ATOMIC|%#lx", (unsigned long) gfp); gfp |= __GFP_ATOMIC; - test(cmp_buffer, "%pGg", &gfp); + test(kunittest, cmp_buffer, "%pGg", &gfp); kfree(cmp_buffer); } -static void __init fwnode_pointer(void) +static void fwnode_pointer(struct kunit *kunittest) { const struct software_node softnodes[] = { { .name = "first", }, @@ -638,79 +611,90 @@ static void __init fwnode_pointer(void) return; } - test(full_name_second, "%pfw", software_node_fwnode(&softnodes[1])); - test(full_name, "%pfw", software_node_fwnode(&softnodes[2])); - test(full_name, "%pfwf", software_node_fwnode(&softnodes[2])); - test(second_name, "%pfwP", software_node_fwnode(&softnodes[1])); - test(third_name, "%pfwP", software_node_fwnode(&softnodes[2])); + test(kunittest, full_name_second, "%pfw", software_node_fwnode(&softnodes[1])); + test(kunittest, full_name, "%pfw", software_node_fwnode(&softnodes[2])); + test(kunittest, full_name, "%pfwf", software_node_fwnode(&softnodes[2])); + test(kunittest, second_name, "%pfwP", software_node_fwnode(&softnodes[1])); + test(kunittest, third_name, "%pfwP", software_node_fwnode(&softnodes[2])); software_node_unregister(&softnodes[2]); software_node_unregister(&softnodes[1]); software_node_unregister(&softnodes[0]); } -static void __init -errptr(void) +static void +errptr(struct kunit *kunittest) { - test("-1234", "%pe", ERR_PTR(-1234)); + test(kunittest, "-1234", "%pe", ERR_PTR(-1234)); /* Check that %pe with a non-ERR_PTR gets treated as ordinary %p. */ BUILD_BUG_ON(IS_ERR(PTR)); - test_hashed("%pe", PTR); + test_hashed(kunittest, "%pe", PTR); #ifdef CONFIG_SYMBOLIC_ERRNAME - test("(-ENOTSOCK)", "(%pe)", ERR_PTR(-ENOTSOCK)); - test("(-EAGAIN)", "(%pe)", ERR_PTR(-EAGAIN)); + test(kunittest, "(-ENOTSOCK)", "(%pe)", ERR_PTR(-ENOTSOCK)); + test(kunittest, "(-EAGAIN)", "(%pe)", ERR_PTR(-EAGAIN)); BUILD_BUG_ON(EAGAIN != EWOULDBLOCK); - test("(-EAGAIN)", "(%pe)", ERR_PTR(-EWOULDBLOCK)); - test("[-EIO ]", "[%-8pe]", ERR_PTR(-EIO)); - test("[ -EIO]", "[%8pe]", ERR_PTR(-EIO)); - test("-EPROBE_DEFER", "%pe", ERR_PTR(-EPROBE_DEFER)); + test(kunittest, "(-EAGAIN)", "(%pe)", ERR_PTR(-EWOULDBLOCK)); + test(kunittest, "[-EIO ]", "[%-8pe]", ERR_PTR(-EIO)); + test(kunittest, "[ -EIO]", "[%8pe]", ERR_PTR(-EIO)); + test(kunittest, "-EPROBE_DEFER", "%pe", ERR_PTR(-EPROBE_DEFER)); #endif } -static void __init -test_pointer(void) -{ - plain(); - null_pointer(); - error_pointer(); - invalid_pointer(); - symbol_ptr(); - kernel_ptr(); - struct_resource(); - addr(); - escaped_str(); - hex_string(); - mac(); - ip(); - uuid(); - dentry(); - struct_va_format(); - time_and_date(); - struct_clk(); - bitmap(); - netdev_features(); - flags(); - errptr(); - fwnode_pointer(); -} - -static void __init selftest(void) +static void +test_pointer(struct kunit *kunittest) +{ + plain(kunittest); + null_pointer(kunittest); + error_pointer(kunittest); + invalid_pointer(kunittest); + symbol_ptr(kunittest); + kernel_ptr(kunittest); + struct_resource(kunittest); + addr(kunittest); + escaped_str(kunittest); + hex_string(kunittest); + mac(kunittest); + ip(kunittest); + uuid(kunittest); + dentry(kunittest); + struct_va_format(kunittest); + time_and_date(kunittest); + struct_clk(kunittest); + bitmap(kunittest); + netdev_features(kunittest); + flags(kunittest); + errptr(kunittest); + fwnode_pointer(kunittest); +} + +static void selftest(struct kunit *kunittest) { alloced_buffer = kmalloc(BUF_SIZE + 2*PAD_SIZE, GFP_KERNEL); if (!alloced_buffer) return; test_buffer = alloced_buffer + PAD_SIZE; - test_basic(); - test_number(); - test_string(); - test_pointer(); + test_basic(kunittest); + test_number(kunittest); + test_string(kunittest); + test_pointer(kunittest); kfree(alloced_buffer); } -KSTM_MODULE_LOADERS(test_printf); +static struct kunit_case printf_test_cases[] = { + KUNIT_CASE(selftest), + {} +}; + +static struct kunit_suite printf_test_suite = { + .name = "printf-kunit-test", + .test_cases = printf_test_cases, +}; + +kunit_test_suite(printf_test_suite); + MODULE_AUTHOR("Rasmus Villemoes <linux(a)rasmusvillemoes.dk>"); MODULE_LICENSE("GPL"); -- 2.25.1

5 years

6
12
0 0

Disinfectant

by William Jones

Good morning, looking for companies interested in raising additional capital by diversifying their offer in soaps, liquids and gels for hand disinfection and cosmetics for body and hair care. The distribution of innovative products corresponding to the current preferences of customers in the field of hygiene and preventive healthcare allows our partners to gain new markets and achieve better economic results. In addition to products with bactericidal action, our range includes shower gels, shampoos and hair conditioners, as well as efficient, concentrated detergents. The versatility (suitable for all skin types) combined with an affordable price means that customers make an informed choice of a product among others available on the market. Are you interested in cooperation? William Jones

5 years

1
0
0 0

[PATCHv3] selftests: rtnetlink: load fou module for kci_test_encap_fou() test

by Po-Hsu Lin

The kci_test_encap_fou() test from kci_test_encap() in rtnetlink.sh needs the fou module to work. Otherwise it will fail with: $ ip netns exec "$testns" ip fou add port 7777 ipproto 47 RTNETLINK answers: No such file or directory Error talking to the kernel Add the CONFIG_NET_FOU into the config file as well. Which needs at least to be set as a loadable module. Signed-off-by: Po-Hsu Lin <po-hsu.lin(a)canonical.com> --- tools/testing/selftests/net/config | 1 + tools/testing/selftests/net/rtnetlink.sh | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index 3b42c06b..c5e50ab 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -31,3 +31,4 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_NETEM=y CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_KALLSYMS=y +CONFIG_NET_FOU=m diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh index 7c38a90..a711b3e 100755 --- a/tools/testing/selftests/net/rtnetlink.sh +++ b/tools/testing/selftests/net/rtnetlink.sh @@ -520,6 +520,11 @@ kci_test_encap_fou() return $ksft_skip fi + if ! /sbin/modprobe -q -n fou; then + echo "SKIP: module fou is not found" + return $ksft_skip + fi + /sbin/modprobe -q fou ip -netns "$testns" fou add port 7777 ipproto 47 2>/dev/null if [ $? -ne 0 ];then echo "FAIL: can't add fou port 7777, skipping test" @@ -540,6 +545,7 @@ kci_test_encap_fou() return 1 fi + /sbin/modprobe -q -r fou echo "PASS: fou" } -- 2.7.4

5 years

2
6
0 0

[PATCH] Documentation: kunit: Update Kconfig parts for KUNIT's module support

by SeongJae Park

From: SeongJae Park <sjpark(a)amazon.de> If 'CONFIG_KUNIT=m', letting kunit tests that do not support loadable module build depends on 'KUNIT' instead of 'KUNIT=y' result in compile errors. This commit updates the document for this. Fixes: 9fe124bf1b77 ("kunit: allow kunit to be loaded as a module") Signed-off-by: SeongJae Park <sjpark(a)amazon.de> --- Documentation/dev-tools/kunit/start.rst | 2 +- Documentation/dev-tools/kunit/usage.rst | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/dev-tools/kunit/start.rst b/Documentation/dev-tools/kunit/start.rst index d23385e3e159..454f307813ea 100644 --- a/Documentation/dev-tools/kunit/start.rst +++ b/Documentation/dev-tools/kunit/start.rst @@ -197,7 +197,7 @@ Now add the following to ``drivers/misc/Kconfig``: config MISC_EXAMPLE_TEST bool "Test for my example" - depends on MISC_EXAMPLE && KUNIT + depends on MISC_EXAMPLE && KUNIT=y and the following to ``drivers/misc/Makefile``: diff --git a/Documentation/dev-tools/kunit/usage.rst b/Documentation/dev-tools/kunit/usage.rst index 3c3fe8b5fecc..410380fc7fb4 100644 --- a/Documentation/dev-tools/kunit/usage.rst +++ b/Documentation/dev-tools/kunit/usage.rst @@ -556,6 +556,11 @@ Once the kernel is built and installed, a simple ...will run the tests. +.. note:: + Note that you should make your test depends on ``KUNIT=y`` in Kcofig if the + test does not support module build. Otherwise, it will trigger compile + errors if ``CONFIG_KUNIT`` is ``m``. + Writing new tests for other architectures ----------------------------------------- -- 2.17.1

5 years

3
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror