Commit 62fd5258 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

radix tree test suite: Test radix_tree_replace_slot() for multiorder entries

When we replace a multiorder entry, check that all indices reflect the
new value.

Also, compile the test suite with -O2, which shows other problems with
the code due to some dodgy pointer operations in the radix tree code.
Signed-off-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9c0e28a7
CFLAGS += -I. -g -Wall -D_LGPL_SOURCE CFLAGS += -I. -g -O2 -Wall -D_LGPL_SOURCE
LDFLAGS += -lpthread -lurcu LDFLAGS += -lpthread -lurcu
TARGETS = main TARGETS = main
OFILES = main.o radix-tree.o linux.o test.o tag_check.o find_next_bit.o \ OFILES = main.o radix-tree.o linux.o test.o tag_check.o find_next_bit.o \
......
...@@ -124,6 +124,8 @@ static void multiorder_check(unsigned long index, int order) ...@@ -124,6 +124,8 @@ static void multiorder_check(unsigned long index, int order)
unsigned long i; unsigned long i;
unsigned long min = index & ~((1UL << order) - 1); unsigned long min = index & ~((1UL << order) - 1);
unsigned long max = min + (1UL << order); unsigned long max = min + (1UL << order);
void **slot;
struct item *item2 = item_create(min);
RADIX_TREE(tree, GFP_KERNEL); RADIX_TREE(tree, GFP_KERNEL);
printf("Multiorder index %ld, order %d\n", index, order); printf("Multiorder index %ld, order %d\n", index, order);
...@@ -139,13 +141,19 @@ static void multiorder_check(unsigned long index, int order) ...@@ -139,13 +141,19 @@ static void multiorder_check(unsigned long index, int order)
item_check_absent(&tree, i); item_check_absent(&tree, i);
for (i = max; i < 2*max; i++) for (i = max; i < 2*max; i++)
item_check_absent(&tree, 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(slot, item2);
for (i = min; i < max; i++) { for (i = min; i < max; i++) {
static void *entry = (void *) struct item *item = item_lookup(&tree, i);
(0xA0 | RADIX_TREE_EXCEPTIONAL_ENTRY); assert(item != 0);
assert(radix_tree_insert(&tree, i, entry) == -EEXIST); assert(item->index == min);
} }
assert(item_delete(&tree, index) != 0); assert(item_delete(&tree, min) != 0);
for (i = 0; i < 2*max; i++) for (i = 0; i < 2*max; i++)
item_check_absent(&tree, i); item_check_absent(&tree, i);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment