test_ida: Convert check_ida_conv to new API

Move as much as possible to kernel space; leave the parts in user space
that rely on checking memory allocation failures to detect the
transition between an exceptional entry and a bitmap.

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

diff --git a/lib/test_ida.c b/lib/test_ida.c
index 44174ec9f5bf89ff07905a757ff2d5b6ab2f1758..eaee9a28f32546fe9b9e08825e1d763686b48b83 100644 (file)
--- a/lib/test_ida.c
+++ b/lib/test_ida.c
@@ -69,6 +69,35 @@ static void ida_check_max(struct ida *ida)
        }
 }
 
+/*
+ * Check handling of conversions between exceptional entries and full bitmaps.
+ */
+static void ida_check_conv(struct ida *ida)
+{
+       unsigned long i;
+
+       for (i = 0; i < IDA_BITMAP_BITS * 2; i += IDA_BITMAP_BITS) {
+               IDA_BUG_ON(ida, ida_alloc_min(ida, i + 1, GFP_KERNEL) != i + 1);
+               IDA_BUG_ON(ida, ida_alloc_min(ida, i + BITS_PER_LONG,
+                                       GFP_KERNEL) != i + BITS_PER_LONG);
+               ida_free(ida, i + 1);
+               ida_free(ida, i + BITS_PER_LONG);
+               IDA_BUG_ON(ida, !ida_is_empty(ida));
+       }
+
+       for (i = 0; i < IDA_BITMAP_BITS * 2; i++)
+               IDA_BUG_ON(ida, ida_alloc(ida, GFP_KERNEL) != i);
+       for (i = IDA_BITMAP_BITS * 2; i > 0; i--)
+               ida_free(ida, i - 1);
+       IDA_BUG_ON(ida, !ida_is_empty(ida));
+
+       for (i = 0; i < IDA_BITMAP_BITS + BITS_PER_LONG - 4; i++)
+               IDA_BUG_ON(ida, ida_alloc(ida, GFP_KERNEL) != i);
+       for (i = IDA_BITMAP_BITS + BITS_PER_LONG - 4; i > 0; i--)
+               ida_free(ida, i - 1);
+       IDA_BUG_ON(ida, !ida_is_empty(ida));
+}
+
 static int ida_checks(void)
 {
        DEFINE_IDA(ida);
@@ -78,6 +107,7 @@ static int ida_checks(void)
        ida_check_leaf(&ida, 1024);
        ida_check_leaf(&ida, 1024 * 64);
        ida_check_max(&ida);
+       ida_check_conv(&ida);
 
        printk("IDA: %u of %u tests passed\n", tests_passed, tests_run);
        return (tests_run != tests_passed) ? 0 : -EINVAL;

diff --git a/tools/testing/radix-tree/idr-test.c b/tools/testing/radix-tree/idr-test.c
index bd9699327f95a910e52cb2345cd1821289c0ff7b..c6026cfe3145686b01498afcb33af61f66780003 100644 (file)
--- a/tools/testing/radix-tree/idr-test.c
+++ b/tools/testing/radix-tree/idr-test.c
@@ -339,59 +339,23 @@ void ida_check_nomem(void)
 /*
  * Check handling of conversions between exceptional entries and full bitmaps.
  */
-void ida_check_conv(void)
+void ida_check_conv_user(void)
 {
        DEFINE_IDA(ida);
-       int id;
        unsigned long i;
 
-       for (i = 0; i < IDA_BITMAP_BITS * 2; i += IDA_BITMAP_BITS) {
-               assert(ida_pre_get(&ida, GFP_KERNEL));
-               assert(!ida_get_new_above(&ida, i + 1, &id));
-               assert(id == i + 1);
-               assert(!ida_get_new_above(&ida, i + BITS_PER_LONG, &id));
-               assert(id == i + BITS_PER_LONG);
-               ida_remove(&ida, i + 1);
-               ida_remove(&ida, i + BITS_PER_LONG);
-               assert(ida_is_empty(&ida));
-       }
-
-       assert(ida_pre_get(&ida, GFP_KERNEL));
-
-       for (i = 0; i < IDA_BITMAP_BITS * 2; i++) {
-               assert(ida_pre_get(&ida, GFP_KERNEL));
-               assert(!ida_get_new(&ida, &id));
-               assert(id == i);
-       }
-
-       for (i = IDA_BITMAP_BITS * 2; i > 0; i--) {
-               ida_remove(&ida, i - 1);
-       }
-       assert(ida_is_empty(&ida));
-
-       for (i = 0; i < IDA_BITMAP_BITS + BITS_PER_LONG - 4; i++) {
-               assert(ida_pre_get(&ida, GFP_KERNEL));
-               assert(!ida_get_new(&ida, &id));
-               assert(id == i);
-       }
-
-       for (i = IDA_BITMAP_BITS + BITS_PER_LONG - 4; i > 0; i--) {
-               ida_remove(&ida, i - 1);
-       }
-       assert(ida_is_empty(&ida));
-
        radix_tree_cpu_dead(1);
        for (i = 0; i < 1000000; i++) {
-               int err = ida_get_new(&ida, &id);
-               if (err == -EAGAIN) {
-                       assert((i % IDA_BITMAP_BITS) == (BITS_PER_LONG - 2));
-                       assert(ida_pre_get(&ida, GFP_KERNEL));
-                       err = ida_get_new(&ida, &id);
+               int id = ida_alloc(&ida, GFP_NOWAIT);
+               if (id == -ENOMEM) {
+                       IDA_BUG_ON(&ida, (i % IDA_BITMAP_BITS) !=
+                                       BITS_PER_LONG - 2);
+                       id = ida_alloc(&ida, GFP_KERNEL);
                } else {
-                       assert((i % IDA_BITMAP_BITS) != (BITS_PER_LONG - 2));
+                       IDA_BUG_ON(&ida, (i % IDA_BITMAP_BITS) ==
+                                       BITS_PER_LONG - 2);
                }
-               assert(!err);
-               assert(id == i);
+               IDA_BUG_ON(&ida, id != i);
        }
        ida_destroy(&ida);
 }
@@ -507,7 +471,7 @@ void user_ida_checks(void)
        ida_destroy(&ida);
        assert(ida_is_empty(&ida));
 
-       ida_check_conv();
+       ida_check_conv_user();
        ida_check_random();
        ida_simple_get_remove_test();