lib: add module support to linked list sorting tests

Extract the linked list sorting test code into its own source file, to
allow to compile it either to a loadable module, or builtin into the
kernel.

Link: http://lkml.kernel.org/r/1488287219-15832-4-git-send-email-geert@linux-m68k.org
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index de3f7c151320067f144fc48d5a9599b8cfddaecf..e4587ebe52c7ec3c7923c661dea9b8f15b77bd8e 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1719,11 +1719,12 @@ config LKDTM
        Documentation/fault-injection/provoke-crashes.txt
 
 config TEST_LIST_SORT
-       bool "Linked list sorting test"
-       depends on DEBUG_KERNEL
+       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.
+         executed only once during system boot (so affects only boot time),
+         or at module load time.
 
          If unsure, say N.
 

diff --git a/lib/Makefile b/lib/Makefile
index a155c73e3437ad539a809524dd3d162cd8db1b75..0166fbc0fa811f8462bc2f3dafcae9408ae922c4 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_TEST_FIRMWARE) += test_firmware.o
 obj-$(CONFIG_TEST_HASH) += test_hash.o test_siphash.o
 obj-$(CONFIG_TEST_KASAN) += test_kasan.o
 obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o
+obj-$(CONFIG_TEST_LIST_SORT) += test_list_sort.o
 obj-$(CONFIG_TEST_LKM) += test_module.o
 obj-$(CONFIG_TEST_RHASHTABLE) += test_rhashtable.o
 obj-$(CONFIG_TEST_SORT) += test_sort.o

diff --git a/lib/list_sort.c b/lib/list_sort.c
index 3fe401067e20ba81c762fb00ae00730de6b9502f..9e9acc37652f2814542438f65d20ea9b3aab6539 100644 (file)
--- a/lib/list_sort.c
+++ b/lib/list_sort.c
@@ -1,6 +1,3 @@
-
-#define pr_fmt(fmt) "list_sort_test: " fmt
-
 #include <linux/kernel.h>
 #include <linux/bug.h>
 #include <linux/compiler.h>
@@ -145,149 +142,3 @@ void list_sort(void *priv, struct list_head *head,
        merge_and_restore_back_links(priv, cmp, head, part[max_lev], list);
 }
 EXPORT_SYMBOL(list_sort);
-
-#ifdef CONFIG_TEST_LIST_SORT
-
-#include <linux/slab.h>
-#include <linux/random.h>
-
-/*
- * The pattern of set bits in the list length determines which cases
- * are hit in list_sort().
- */
-#define TEST_LIST_LEN (512+128+2) /* not including head */
-
-#define TEST_POISON1 0xDEADBEEF
-#define TEST_POISON2 0xA324354C
-
-struct debug_el {
-       unsigned int poison1;
-       struct list_head list;
-       unsigned int poison2;
-       int value;
-       unsigned serial;
-};
-
-/* 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)
-{
-       if (ela->serial >= TEST_LIST_LEN) {
-               pr_err("error: incorrect serial %d\n", ela->serial);
-               return -EINVAL;
-       }
-       if (elb->serial >= TEST_LIST_LEN) {
-               pr_err("error: incorrect serial %d\n", elb->serial);
-               return -EINVAL;
-       }
-       if (elts[ela->serial] != ela || elts[elb->serial] != elb) {
-               pr_err("error: phantom element\n");
-               return -EINVAL;
-       }
-       if (ela->poison1 != TEST_POISON1 || ela->poison2 != TEST_POISON2) {
-               pr_err("error: bad poison: %#x/%#x\n",
-                       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);
-               return -EINVAL;
-       }
-       return 0;
-}
-
-static int __init cmp(void *priv, struct list_head *a, struct list_head *b)
-{
-       struct debug_el *ela, *elb;
-
-       ela = container_of(a, struct debug_el, list);
-       elb = container_of(b, struct debug_el, list);
-
-       check(ela, elb);
-       return ela->value - elb->value;
-}
-
-static int __init list_sort_test(void)
-{
-       int i, count = 1, err = -ENOMEM;
-       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) {
-               pr_err("error: cannot allocate memory\n");
-               return err;
-       }
-
-       for (i = 0; i < TEST_LIST_LEN; i++) {
-               el = kmalloc(sizeof(*el), GFP_KERNEL);
-               if (!el) {
-                       pr_err("error: cannot allocate memory\n");
-                       goto exit;
-               }
-                /* force some equivalencies */
-               el->value = prandom_u32() % (TEST_LIST_LEN / 3);
-               el->serial = i;
-               el->poison1 = TEST_POISON1;
-               el->poison2 = TEST_POISON2;
-               elts[i] = el;
-               list_add_tail(&el->list, &head);
-       }
-
-       list_sort(NULL, &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");
-                       goto exit;
-               }
-
-               cmp_result = cmp(NULL, cur, cur->next);
-               if (cmp_result > 0) {
-                       pr_err("error: list is not sorted\n");
-                       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");
-                       goto exit;
-               }
-
-               if (check(el, el1)) {
-                       pr_err("error: element check failed\n");
-                       goto exit;
-               }
-               count++;
-       }
-       if (head.prev != cur) {
-               pr_err("error: list is corrupted\n");
-               goto exit;
-       }
-
-
-       if (count != TEST_LIST_LEN) {
-               pr_err("error: 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;
-}
-late_initcall(list_sort_test);
-#endif /* CONFIG_TEST_LIST_SORT */

diff --git a/lib/test_list_sort.c b/lib/test_list_sort.c
new file mode 100644 (file)
index 0000000..28e8173
--- /dev/null
+++ b/lib/test_list_sort.c
@@ -0,0 +1,150 @@
+#define pr_fmt(fmt) "list_sort_test: " 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>
+
+/*
+ * The pattern of set bits in the list length determines which cases
+ * are hit in list_sort().
+ */
+#define TEST_LIST_LEN (512+128+2) /* not including head */
+
+#define TEST_POISON1 0xDEADBEEF
+#define TEST_POISON2 0xA324354C
+
+struct debug_el {
+       unsigned int poison1;
+       struct list_head list;
+       unsigned int poison2;
+       int value;
+       unsigned serial;
+};
+
+/* 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)
+{
+       if (ela->serial >= TEST_LIST_LEN) {
+               pr_err("error: incorrect serial %d\n", ela->serial);
+               return -EINVAL;
+       }
+       if (elb->serial >= TEST_LIST_LEN) {
+               pr_err("error: incorrect serial %d\n", elb->serial);
+               return -EINVAL;
+       }
+       if (elts[ela->serial] != ela || elts[elb->serial] != elb) {
+               pr_err("error: phantom element\n");
+               return -EINVAL;
+       }
+       if (ela->poison1 != TEST_POISON1 || ela->poison2 != TEST_POISON2) {
+               pr_err("error: bad poison: %#x/%#x\n",
+                       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);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static int __init cmp(void *priv, struct list_head *a, struct list_head *b)
+{
+       struct debug_el *ela, *elb;
+
+       ela = container_of(a, struct debug_el, list);
+       elb = container_of(b, struct debug_el, list);
+
+       check(ela, elb);
+       return ela->value - elb->value;
+}
+
+static int __init list_sort_test(void)
+{
+       int i, count = 1, err = -ENOMEM;
+       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) {
+               pr_err("error: cannot allocate memory\n");
+               return err;
+       }
+
+       for (i = 0; i < TEST_LIST_LEN; i++) {
+               el = kmalloc(sizeof(*el), GFP_KERNEL);
+               if (!el) {
+                       pr_err("error: cannot allocate memory\n");
+                       goto exit;
+               }
+                /* force some equivalencies */
+               el->value = prandom_u32() % (TEST_LIST_LEN / 3);
+               el->serial = i;
+               el->poison1 = TEST_POISON1;
+               el->poison2 = TEST_POISON2;
+               elts[i] = el;
+               list_add_tail(&el->list, &head);
+       }
+
+       list_sort(NULL, &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");
+                       goto exit;
+               }
+
+               cmp_result = cmp(NULL, cur, cur->next);
+               if (cmp_result > 0) {
+                       pr_err("error: list is not sorted\n");
+                       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");
+                       goto exit;
+               }
+
+               if (check(el, el1)) {
+                       pr_err("error: element check failed\n");
+                       goto exit;
+               }
+               count++;
+       }
+       if (head.prev != cur) {
+               pr_err("error: list is corrupted\n");
+               goto exit;
+       }
+
+
+       if (count != TEST_LIST_LEN) {
+               pr_err("error: 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);
+MODULE_LICENSE("GPL");