aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox <willy@infradead.org>2018-06-18 17:25:20 -0400
committerMatthew Wilcox <willy@infradead.org>2018-08-21 23:54:20 -0400
commit161b47e31f9912947a3a72dcb161c79978a1fe04 (patch)
treeb692e9d61c20e194b50e256a4952ea4776331de3
parenttest_ida: Move ida_check_leaf (diff)
downloadlinux-dev-161b47e31f9912947a3a72dcb161c79978a1fe04.tar.xz
linux-dev-161b47e31f9912947a3a72dcb161c79978a1fe04.zip
test_ida: Move ida_check_max
Convert to new API and move to kernel space. Signed-off-by: Matthew Wilcox <willy@infradead.org>
-rw-r--r--lib/test_ida.c23
-rw-r--r--tools/testing/radix-tree/idr-test.c28
2 files changed, 23 insertions, 28 deletions
diff --git a/lib/test_ida.c b/lib/test_ida.c
index 1988f91a20c8..44174ec9f5bf 100644
--- a/lib/test_ida.c
+++ b/lib/test_ida.c
@@ -47,6 +47,28 @@ static void ida_check_leaf(struct ida *ida, unsigned int base)
IDA_BUG_ON(ida, !ida_is_empty(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.
+ */
+static void ida_check_max(struct ida *ida)
+{
+ unsigned long i, j;
+
+ for (j = 1; j < 65537; j *= 2) {
+ unsigned long base = (1UL << 31) - j;
+ for (i = 0; i < j; i++) {
+ IDA_BUG_ON(ida, ida_alloc_min(ida, base, GFP_KERNEL) !=
+ base + i);
+ }
+ IDA_BUG_ON(ida, ida_alloc_min(ida, base, GFP_KERNEL) !=
+ -ENOSPC);
+ ida_destroy(ida);
+ IDA_BUG_ON(ida, !ida_is_empty(ida));
+ }
+}
+
static int ida_checks(void)
{
DEFINE_IDA(ida);
@@ -55,6 +77,7 @@ static int ida_checks(void)
ida_check_leaf(&ida, 0);
ida_check_leaf(&ida, 1024);
ida_check_leaf(&ida, 1024 * 64);
+ ida_check_max(&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 fef1f45b927b..bd9699327f95 100644
--- a/tools/testing/radix-tree/idr-test.c
+++ b/tools/testing/radix-tree/idr-test.c
@@ -396,33 +396,6 @@ void ida_check_conv(void)
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);
@@ -534,7 +507,6 @@ void user_ida_checks(void)
ida_destroy(&ida);
assert(ida_is_empty(&ida));
- ida_check_max();
ida_check_conv();
ida_check_random();
ida_simple_get_remove_test();