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 <fkostenzer@live.at>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 54 insertions, 39 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 213decb76922..55735c9bdb75 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1739,6 +1739,14 @@ config TEST_LIST_SORT
 
           If unsure, say N.
 
+config TEST_SORT
+        bool "Array-based sort test"
+        depends on DEBUG_KERNEL
+        help
+          This option enables the self-test function of 'sort()' at boot.
+
+          If unsure, say N.
+
 config KPROBES_SANITY_TEST
         bool "Kprobes sanity tests"
         depends on DEBUG_KERNEL
diff --git a/lib/Makefile b/lib/Makefile
index d6d53b70f58d..445a39c21f46 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -50,6 +50,7 @@ obj-$(CONFIG_TEST_KASAN) += test_kasan.o
 obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o
 obj-$(CONFIG_TEST_LKM) += test_module.o
 obj-$(CONFIG_TEST_RHASHTABLE) += test_rhashtable.o
+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
diff --git a/lib/sort.c b/lib/sort.c
index fc20df42aa6f..975c6ef6fec7 100644
--- a/lib/sort.c
+++ b/lib/sort.c
@@ -4,6 +4,8 @@
  * Jan 23 2005  Matt Mackall <mpm@selenic.com>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/export.h>
 #include <linux/sort.h>
@@ -101,42 +103,3 @@ void sort(void *base, size_t num, size_t size,
 }
 
 EXPORT_SYMBOL(sort);
-
-#if 0
-#include <linux/slab.h>
-/* a simple boot-time regression test */
-
-int cmpint(const void *a, const void *b)
-{
-        return *(int *)a - *(int *)b;
-}
-
-static int sort_test(void)
-{
-        int *a, i, r = 1;
-
-        a = kmalloc(1000 * sizeof(int), GFP_KERNEL);
-        BUG_ON(!a);
-
-        printk("testing sort()\n");
-
-        for (i = 0; i < 1000; i++) {
-                r = (r * 725861) % 6599;
-                a[i] = r;
-        }
-
-        sort(a, 1000, sizeof(int), cmpint, NULL);
-
-        for (i = 0; i < 999; i++)
-                if (a[i] > a[i+1]) {
-                        printk("sort() failed!\n");
-                        break;
-                }
-
-        kfree(a);
-
-        return 0;
-}
-
-module_init(sort_test);
-#endif
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 <linux/sort.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+
+/* 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");