Merge branch 'ida-4.19' of git://git.infradead.org/users/willy/linux-dax

Pull IDA updates from Matthew Wilcox:
 "A better IDA API:

      id = ida_alloc(ida, GFP_xxx);
      ida_free(ida, id);

  rather than the cumbersome ida_simple_get(), ida_simple_remove().

  The new IDA API is similar to ida_simple_get() but better named.  The
  internal restructuring of the IDA code removes the bitmap
  preallocation nonsense.

  I hope the net -200 lines of code is convincing"

* 'ida-4.19' of git://git.infradead.org/users/willy/linux-dax: (29 commits)
  ida: Change ida_get_new_above to return the id
  ida: Remove old API
  test_ida: check_ida_destroy and check_ida_alloc
  test_ida: Convert check_ida_conv to new API
  test_ida: Move ida_check_max
  test_ida: Move ida_check_leaf
  idr-test: Convert ida_check_nomem to new API
  ida: Start new test_ida module
  target/iscsi: Allocate session IDs from an IDA
  iscsi target: fix session creation failure handling
  drm/vmwgfx: Convert to new IDA API
  dmaengine: Convert to new IDA API
  ppc: Convert vas ID allocation to new IDA API
  media: Convert entity ID allocation to new IDA API
  ppc: Convert mmu context allocation to new IDA API
  Convert net_namespace to new IDA API
  cb710: Convert to new IDA API
  rsxx: Convert to new IDA API
  osd: Convert to new IDA API
  sd: Convert to new IDA API
  ...

5 files changed, 58 insertions, 190 deletions

diff --git a/tools/testing/radix-tree/Makefile b/tools/testing/radix-tree/Makefile
index db66f8a0d4be..37baecc3766f 100644
--- a/tools/testing/radix-tree/Makefile
+++ b/tools/testing/radix-tree/Makefile
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0
 
-CFLAGS += -I. -I../../include -g -O2 -Wall -D_LGPL_SOURCE -fsanitize=address
-LDFLAGS += -fsanitize=address
+CFLAGS += -I. -I../../include -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address \
+          -fsanitize=undefined
+LDFLAGS += -fsanitize=address -fsanitize=undefined
 LDLIBS+= -lpthread -lurcu
 TARGETS = main idr-test multiorder
 CORE_OFILES := radix-tree.o idr.o linux.o test.o find_bit.o
@@ -21,6 +22,7 @@ targets: generated/map-shift.h $(TARGETS)
 
 main:   $(OFILES)
 
+idr-test.o: ../../../lib/test_ida.c
 idr-test: idr-test.o $(CORE_OFILES)
 
 multiorder: multiorder.o $(CORE_OFILES)
diff --git a/tools/testing/radix-tree/idr-test.c b/tools/testing/radix-tree/idr-test.c
index ee820fcc29b0..321ba92c70d2 100644
--- a/tools/testing/radix-tree/idr-test.c
+++ b/tools/testing/radix-tree/idr-test.c
@@ -309,141 +309,61 @@ void idr_checks(void)
         idr_u32_test(0);
 }
 
+#define module_init(x)
+#define module_exit(x)
+#define MODULE_AUTHOR(x)
+#define MODULE_LICENSE(x)
+#define dump_stack()    assert(0)
+void ida_dump(struct ida *);
+
+#include "../../../lib/test_ida.c"
+
 /*
  * Check that we get the correct error when we run out of memory doing
- * allocations.  To ensure we run out of memory, just "forget" to preload.
+ * allocations.  In userspace, GFP_NOWAIT will always fail an allocation.
  * The first test is for not having a bitmap available, and the second test
  * is for not being able to allocate a level of the radix tree.
  */
 void ida_check_nomem(void)
 {
         DEFINE_IDA(ida);
-        int id, err;
-
-        err = ida_get_new_above(&ida, 256, &id);
-        assert(err == -EAGAIN);
-        err = ida_get_new_above(&ida, 1UL << 30, &id);
-        assert(err == -EAGAIN);
-}
-
-/*
- * Check what happens when we fill a leaf and then delete it.  This may
- * discover mishandling of IDR_FREE.
- */
-void ida_check_leaf(void)
-{
-        DEFINE_IDA(ida);
         int id;
-        unsigned long i;
 
-        for (i = 0; i < IDA_BITMAP_BITS; i++) {
-                assert(ida_pre_get(&ida, GFP_KERNEL));
-                assert(!ida_get_new(&ida, &id));
-                assert(id == i);
-        }
-
-        ida_destroy(&ida);
-        assert(ida_is_empty(&ida));
-
-        assert(ida_pre_get(&ida, GFP_KERNEL));
-        assert(!ida_get_new(&ida, &id));
-        assert(id == 0);
-        ida_destroy(&ida);
-        assert(ida_is_empty(&ida));
+        id = ida_alloc_min(&ida, 256, GFP_NOWAIT);
+        IDA_BUG_ON(&ida, id != -ENOMEM);
+        id = ida_alloc_min(&ida, 1UL << 30, GFP_NOWAIT);
+        IDA_BUG_ON(&ida, id != -ENOMEM);
+        IDA_BUG_ON(&ida, !ida_is_empty(&ida));
 }
 
 /*
  * 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);
 }
 
-/*
- * Check allocations up to and slightly above the maximum allowed (2^31-1) ID.
- * Allocating up to 2^31-1 should succeed, and then allocating the next one
- * should fail.
- */
-void ida_check_max(void)
-{
-        DEFINE_IDA(ida);
-        int id, err;
-        unsigned long i, j;
-
-        for (j = 1; j < 65537; j *= 2) {
-                unsigned long base = (1UL << 31) - j;
-                for (i = 0; i < j; i++) {
-                        assert(ida_pre_get(&ida, GFP_KERNEL));
-                        assert(!ida_get_new_above(&ida, base, &id));
-                        assert(id == base + i);
-                }
-                assert(ida_pre_get(&ida, GFP_KERNEL));
-                err = ida_get_new_above(&ida, base, &id);
-                assert(err == -ENOSPC);
-                ida_destroy(&ida);
-                assert(ida_is_empty(&ida));
-                rcu_barrier();
-        }
-}
-
 void ida_check_random(void)
 {
         DEFINE_IDA(ida);
         DECLARE_BITMAP(bitmap, 2048);
-        int id, err;
         unsigned int i;
         time_t s = time(NULL);
 
@@ -454,15 +374,11 @@ void ida_check_random(void)
                 int bit = i & 2047;
                 if (test_bit(bit, bitmap)) {
                         __clear_bit(bit, bitmap);
-                        ida_remove(&ida, bit);
+                        ida_free(&ida, bit);
                 } else {
                         __set_bit(bit, bitmap);
-                        do {
-                                ida_pre_get(&ida, GFP_KERNEL);
-                                err = ida_get_new_above(&ida, bit, &id);
-                        } while (err == -EAGAIN);
-                        assert(!err);
-                        assert(id == bit);
+                        IDA_BUG_ON(&ida, ida_alloc_min(&ida, bit, GFP_KERNEL)
+                                        != bit);
                 }
         }
         ida_destroy(&ida);
@@ -488,71 +404,12 @@ void ida_simple_get_remove_test(void)
         ida_destroy(&ida);
 }
 
-void ida_checks(void)
+void user_ida_checks(void)
 {
-        DEFINE_IDA(ida);
-        int id;
-        unsigned long i;
-
         radix_tree_cpu_dead(1);
-        ida_check_nomem();
-
-        for (i = 0; i < 10000; i++) {
-                assert(ida_pre_get(&ida, GFP_KERNEL));
-                assert(!ida_get_new(&ida, &id));
-                assert(id == i);
-        }
-
-        ida_remove(&ida, 20);
-        ida_remove(&ida, 21);
-        for (i = 0; i < 3; i++) {
-                assert(ida_pre_get(&ida, GFP_KERNEL));
-                assert(!ida_get_new(&ida, &id));
-                if (i == 2)
-                        assert(id == 10000);
-        }
-
-        for (i = 0; i < 5000; i++)
-                ida_remove(&ida, i);
-
-        assert(ida_pre_get(&ida, GFP_KERNEL));
-        assert(!ida_get_new_above(&ida, 5000, &id));
-        assert(id == 10001);
-
-        ida_destroy(&ida);
-
-        assert(ida_is_empty(&ida));
 
-        assert(ida_pre_get(&ida, GFP_KERNEL));
-        assert(!ida_get_new_above(&ida, 1, &id));
-        assert(id == 1);
-
-        ida_remove(&ida, id);
-        assert(ida_is_empty(&ida));
-        ida_destroy(&ida);
-        assert(ida_is_empty(&ida));
-
-        assert(ida_pre_get(&ida, GFP_KERNEL));
-        assert(!ida_get_new_above(&ida, 1, &id));
-        ida_destroy(&ida);
-        assert(ida_is_empty(&ida));
-
-        assert(ida_pre_get(&ida, GFP_KERNEL));
-        assert(!ida_get_new_above(&ida, 1, &id));
-        assert(id == 1);
-        assert(ida_pre_get(&ida, GFP_KERNEL));
-        assert(!ida_get_new_above(&ida, 1025, &id));
-        assert(id == 1025);
-        assert(ida_pre_get(&ida, GFP_KERNEL));
-        assert(!ida_get_new_above(&ida, 10000, &id));
-        assert(id == 10000);
-        ida_remove(&ida, 1025);
-        ida_destroy(&ida);
-        assert(ida_is_empty(&ida));
-
-        ida_check_leaf();
-        ida_check_max();
-        ida_check_conv();
+        ida_check_nomem();
+        ida_check_conv_user();
         ida_check_random();
         ida_simple_get_remove_test();
 
@@ -582,12 +439,19 @@ void ida_thread_tests(void)
                 pthread_join(threads[i], NULL);
 }
 
+void ida_tests(void)
+{
+        user_ida_checks();
+        ida_checks();
+        ida_exit();
+        ida_thread_tests();
+}
+
 int __weak main(void)
 {
         radix_tree_init();
         idr_checks();
-        ida_checks();
-        ida_thread_tests();
+        ida_tests();
         radix_tree_cpu_dead(1);
         rcu_barrier();
         if (nr_allocated)
diff --git a/tools/testing/radix-tree/linux/xarray.h b/tools/testing/radix-tree/linux/xarray.h
new file mode 100644
index 000000000000..df3812cda376
--- /dev/null
+++ b/tools/testing/radix-tree/linux/xarray.h
@@ -0,0 +1,2 @@
+#include "generated/map-shift.h"
+#include "../../../../include/linux/xarray.h"
diff --git a/tools/testing/radix-tree/main.c b/tools/testing/radix-tree/main.c
index 257f3f8aacaa..b741686e53d6 100644
--- a/tools/testing/radix-tree/main.c
+++ b/tools/testing/radix-tree/main.c
@@ -27,20 +27,22 @@ void __gang_check(unsigned long middle, long down, long up, int chunk, int hop)
                 item_check_present(&tree, middle + idx);
         item_check_absent(&tree, middle + up);
 
-        item_gang_check_present(&tree, middle - down,
-                        up + down, chunk, hop);
-        item_full_scan(&tree, middle - down, down + up, chunk);
+        if (chunk > 0) {
+                item_gang_check_present(&tree, middle - down, up + down,
+                                chunk, hop);
+                item_full_scan(&tree, middle - down, down + up, chunk);
+        }
         item_kill_tree(&tree);
 }
 
 void gang_check(void)
 {
-        __gang_check(1 << 30, 128, 128, 35, 2);
-        __gang_check(1 << 31, 128, 128, 32, 32);
-        __gang_check(1 << 31, 128, 128, 32, 100);
-        __gang_check(1 << 31, 128, 128, 17, 7);
-        __gang_check(0xffff0000, 0, 65536, 17, 7);
-        __gang_check(0xfffffffe, 1, 1, 17, 7);
+        __gang_check(1UL << 30, 128, 128, 35, 2);
+        __gang_check(1UL << 31, 128, 128, 32, 32);
+        __gang_check(1UL << 31, 128, 128, 32, 100);
+        __gang_check(1UL << 31, 128, 128, 17, 7);
+        __gang_check(0xffff0000UL, 0, 65536, 17, 7);
+        __gang_check(0xfffffffeUL, 1, 1, 17, 7);
 }
 
 void __big_gang_check(void)
@@ -322,7 +324,7 @@ static void single_thread_tests(bool long_run)
         printv(2, "after dynamic_height_check: %d allocated, preempt %d\n",
                 nr_allocated, preempt_count);
         idr_checks();
-        ida_checks();
+        ida_tests();
         rcu_barrier();
         printv(2, "after idr_checks: %d allocated, preempt %d\n",
                 nr_allocated, preempt_count);
@@ -369,7 +371,6 @@ int main(int argc, char **argv)
         iteration_test(0, 10 + 90 * long_run);
         iteration_test(7, 10 + 90 * long_run);
         single_thread_tests(long_run);
-        ida_thread_tests();
 
         /* Free any remaining preallocated nodes */
         radix_tree_cpu_dead(0);
diff --git a/tools/testing/radix-tree/test.h b/tools/testing/radix-tree/test.h
index 31f1d9b6f506..92d901eacf49 100644
--- a/tools/testing/radix-tree/test.h
+++ b/tools/testing/radix-tree/test.h
@@ -39,8 +39,7 @@ void multiorder_checks(void);
 void iteration_test(unsigned order, unsigned duration);
 void benchmark(void);
 void idr_checks(void);
-void ida_checks(void);
-void ida_thread_tests(void);
+void ida_tests(void);
 
 struct item *
 item_tag_set(struct radix_tree_root *root, unsigned long index, int tag);