xarray: Move multiorder_check to in-kernel tests

This version is a little less thorough in order to be a little quicker,
but tests the important edge cases.  Also test adding a multiorder entry
at a non-canonical index, and erasing it.

Signed-off-by: Matthew Wilcox <willy@infradead.org>

2 files changed, 44 insertions, 48 deletions

diff --git a/lib/test_xarray.c b/lib/test_xarray.c
index ff94b54a926d..0f06a93b4d0e 100644
--- a/lib/test_xarray.c
+++ b/lib/test_xarray.c
@@ -422,6 +422,43 @@ static noinline void check_xas_erase(struct xarray *xa)
         }
 }
 
+#ifdef CONFIG_XARRAY_MULTI
+static noinline void check_multi_store_1(struct xarray *xa, unsigned long index,
+                unsigned int order)
+{
+        XA_STATE(xas, xa, index);
+        unsigned long min = index & ~((1UL << order) - 1);
+        unsigned long max = min + (1UL << order);
+
+        xa_store_order(xa, index, order, xa_mk_value(index), GFP_KERNEL);
+        XA_BUG_ON(xa, xa_load(xa, min) != xa_mk_value(index));
+        XA_BUG_ON(xa, xa_load(xa, max - 1) != xa_mk_value(index));
+        XA_BUG_ON(xa, xa_load(xa, max) != NULL);
+        XA_BUG_ON(xa, xa_load(xa, min - 1) != NULL);
+
+        XA_BUG_ON(xa, xas_store(&xas, xa_mk_value(min)) != xa_mk_value(index));
+        XA_BUG_ON(xa, xa_load(xa, min) != xa_mk_value(min));
+        XA_BUG_ON(xa, xa_load(xa, max - 1) != xa_mk_value(min));
+        XA_BUG_ON(xa, xa_load(xa, max) != NULL);
+        XA_BUG_ON(xa, xa_load(xa, min - 1) != NULL);
+
+        xa_erase_index(xa, min);
+        XA_BUG_ON(xa, !xa_empty(xa));
+}
+
+static noinline void check_multi_store_2(struct xarray *xa, unsigned long index,
+                unsigned int order)
+{
+        XA_STATE(xas, xa, index);
+        xa_store_order(xa, index, order, xa_mk_value(0), GFP_KERNEL);
+
+        XA_BUG_ON(xa, xas_store(&xas, xa_mk_value(1)) != xa_mk_value(0));
+        XA_BUG_ON(xa, xas.xa_index != index);
+        XA_BUG_ON(xa, xas_store(&xas, NULL) != xa_mk_value(1));
+        XA_BUG_ON(xa, !xa_empty(xa));
+}
+#endif
+
 static noinline void check_multi_store(struct xarray *xa)
 {
 #ifdef CONFIG_XARRAY_MULTI
@@ -487,6 +524,13 @@ static noinline void check_multi_store(struct xarray *xa)
                         XA_BUG_ON(xa, !xa_empty(xa));
                 }
         }
+
+        for (i = 0; i < 20; i++) {
+                check_multi_store_1(xa, 200, i);
+                check_multi_store_1(xa, 0, i);
+                check_multi_store_1(xa, (1UL << i) + 1, i);
+        }
+        check_multi_store_2(xa, 4095, 9);
 #endif
 }
 
diff --git a/tools/testing/radix-tree/multiorder.c b/tools/testing/radix-tree/multiorder.c
index a60c03287e9c..6e8d66c2aa89 100644
--- a/tools/testing/radix-tree/multiorder.c
+++ b/tools/testing/radix-tree/multiorder.c
@@ -20,46 +20,6 @@
 
 #include "test.h"
 
-static void multiorder_check(unsigned long index, int order)
-{
-        unsigned long i;
-        unsigned long min = index & ~((1UL << order) - 1);
-        unsigned long max = min + (1UL << order);
-        void **slot;
-        struct item *item2 = item_create(min, order);
-        RADIX_TREE(tree, GFP_KERNEL);
-
-        printv(2, "Multiorder index %ld, order %d\n", index, order);
-
-        assert(item_insert_order(&tree, index, order) == 0);
-
-        for (i = min; i < max; i++) {
-                struct item *item = item_lookup(&tree, i);
-                assert(item != 0);
-                assert(item->index == index);
-        }
-        for (i = 0; i < min; i++)
-                item_check_absent(&tree, i);
-        for (i = max; i < 2*max; i++)
-                item_check_absent(&tree, i);
-        for (i = min; i < max; i++)
-                assert(radix_tree_insert(&tree, i, item2) == -EEXIST);
-
-        slot = radix_tree_lookup_slot(&tree, index);
-        free(*slot);
-        radix_tree_replace_slot(&tree, slot, item2);
-        for (i = min; i < max; i++) {
-                struct item *item = item_lookup(&tree, i);
-                assert(item != 0);
-                assert(item->index == min);
-        }
-
-        assert(item_delete(&tree, min) != 0);
-
-        for (i = 0; i < 2*max; i++)
-                item_check_absent(&tree, i);
-}
-
 void multiorder_iteration(void)
 {
         RADIX_TREE(tree, GFP_KERNEL);
@@ -251,14 +211,6 @@ static void multiorder_iteration_race(void)
 
 void multiorder_checks(void)
 {
-        int i;
-
-        for (i = 0; i < 20; i++) {
-                multiorder_check(200, i);
-                multiorder_check(0, i);
-                multiorder_check((1UL << i) + 1, i);
-        }
-
         multiorder_iteration();
         multiorder_tagged_iteration();
         multiorder_iteration_race();