From c5adae9583ef6985875532904160c6bf9f07b453 Mon Sep 17 00:00:00 2001 From: Kostenzer Felix Date: Fri, 24 Feb 2017 15:01:07 -0800 Subject: lib: add CONFIG_TEST_SORT to enable self-test of sort() Along with the addition made to Kconfig.debug, the prior existing but permanently disabled test function has been slightly refactored. Patch has been tested using QEMU 2.1.2 with a .config obtained through 'make defconfig' (x86_64) and manually enabling the option. [arnd@arndb.de: move sort self-test into a separate file] Link: http://lkml.kernel.org/r/20170112110657.3123790-1-arnd@arndb.de Link: http://lkml.kernel.org/r/HE1PR09MB0394B0418D504DCD27167D4FD49B0@HE1PR09MB0394.eurprd09.prod.outlook.com Signed-off-by: Kostenzer Felix Signed-off-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- lib/test_sort.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 lib/test_sort.c (limited to 'lib/test_sort.c') diff --git a/lib/test_sort.c b/lib/test_sort.c new file mode 100644 index 000000000000..d389c1cc2f6c --- /dev/null +++ b/lib/test_sort.c @@ -0,0 +1,43 @@ +#include +#include +#include + +/* a simple boot-time regression test */ + +#define TEST_LEN 1000 + +static int __init cmpint(const void *a, const void *b) +{ + return *(int *)a - *(int *)b; +} + +static int __init test_sort_init(void) +{ + int *a, i, r = 1, err = -ENOMEM; + + a = kmalloc_array(TEST_LEN, sizeof(*a), GFP_KERNEL); + if (!a) + return err; + + for (i = 0; i < TEST_LEN; i++) { + r = (r * 725861) % 6599; + a[i] = r; + } + + sort(a, TEST_LEN, sizeof(*a), cmpint, NULL); + + err = -EINVAL; + for (i = 0; i < TEST_LEN-1; i++) + if (a[i] > a[i+1]) { + pr_err("test has failed\n"); + goto exit; + } + err = 0; + pr_info("test passed\n"); +exit: + kfree(a); + return err; +} + +module_init(test_sort_init); +MODULE_LICENSE("GPL"); -- cgit v1.2.3-59-g8ed1b From 8893f519330bb073a49c5b4676fce4be6f1be15d Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Fri, 24 Feb 2017 15:01:09 -0800 Subject: lib/test_sort.c: make it explicitly non-modular The Kconfig currently controlling compilation of this code is: lib/Kconfig.debug:config TEST_SORT lib/Kconfig.debug: bool "Array-based sort test" ...meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modular infrastructure use, so that when reading the code there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering becomes slightly earlier when we change it to use subsys_initcall as done here. However, since it is a self contained test, this shouldn't be an issue and subsys_initcall seems like a better fit for this particular case. We also delete the MODULE_LICENSE tag since that information is now contained at the top of the file in the comments. Link: http://lkml.kernel.org/r/20170124225608.7319-1-paul.gortmaker@windriver.com Signed-off-by: Paul Gortmaker Cc: Kostenzer Felix Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- lib/test_sort.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib/test_sort.c') diff --git a/lib/test_sort.c b/lib/test_sort.c index d389c1cc2f6c..4db3911db50a 100644 --- a/lib/test_sort.c +++ b/lib/test_sort.c @@ -1,8 +1,11 @@ #include #include -#include +#include -/* a simple boot-time regression test */ +/* + * A simple boot-time regression test + * License: GPL + */ #define TEST_LEN 1000 @@ -38,6 +41,4 @@ exit: kfree(a); return err; } - -module_init(test_sort_init); -MODULE_LICENSE("GPL"); +subsys_initcall(test_sort_init); -- cgit v1.2.3-59-g8ed1b