Commit 4f3755d1 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds
Browse files

radix tree test suite: start adding multiorder tests 



Test suite infrastructure for working with multiorder entries.

The test itself is pretty basic: Add an entry, check that all expected
indices return that entry and that indices around that entry don't
return an entry.  Then delete the entry and check no index returns that
entry.  Tests a few edge conditions including the multiorder entry at
index 0 and at a higher index.  Also tests deleting through an alias as
well as through the canonical index.

Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Reviewed-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Kirill Shutemov <kirill.shutemov@linux.intel.com>
Cc: Jan Kara <jack@suse.com>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 49ea6ebc

tools/testing/radix-tree/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ CFLAGS += -I. -g -Wall -D_LGPL_SOURCE 
LDFLAGS += -lpthread -lurcu

TARGETS = main

OFILES = main.o radix-tree.o linux.o test.o tag_check.o find_next_bit.o \

	 regression1.o regression2.o regression3.o

	 regression1.o regression2.o regression3.o multiorder.o



targets: $(TARGETS)

tools/testing/radix-tree/main.c

+2 −0
Original line number Diff line number Diff line
@@ -275,6 +275,8 @@ static void single_thread_tests(bool long_run) 
	int i;



	printf("starting single_thread_tests: %d allocated\n", nr_allocated);

	multiorder_checks();

	printf("after multiorder_check: %d allocated\n", nr_allocated);

	locate_check();

	printf("after locate_check: %d allocated\n", nr_allocated);

	tag_check();

tools/testing/radix-tree/multiorder.c

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * multiorder.c: Multi-order radix tree entry testing

 * Copyright (c) 2016 Intel Corporation

 * Author: Ross Zwisler <ross.zwisler@linux.intel.com>

 * Author: Matthew Wilcox <matthew.r.wilcox@intel.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */

#include <linux/radix-tree.h>

#include <linux/slab.h>

#include <linux/errno.h>



#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);

	RADIX_TREE(tree, GFP_KERNEL);



	printf("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);



	assert(item_delete(&tree, index) != 0);



	for (i = 0; i < 2*max; i++)

		item_check_absent(&tree, i);

}



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);

	}

}

tools/testing/radix-tree/test.c

+10 −3
Original line number Diff line number Diff line
@@ -24,14 +24,21 @@ int item_tag_get(struct radix_tree_root *root, unsigned long index, int tag) 
	return radix_tree_tag_get(root, index, tag);

}



int __item_insert(struct radix_tree_root *root, struct item *item)

int __item_insert(struct radix_tree_root *root, struct item *item,

			unsigned order)

{

	return radix_tree_insert(root, item->index, item);

	return __radix_tree_insert(root, item->index, order, item);

}



int item_insert(struct radix_tree_root *root, unsigned long index)

{

	return __item_insert(root, item_create(index));

	return __item_insert(root, item_create(index), 0);

}



int item_insert_order(struct radix_tree_root *root, unsigned long index,

			unsigned order)

{

	return __item_insert(root, item_create(index), order);

}



int item_delete(struct radix_tree_root *root, unsigned long index)

tools/testing/radix-tree/test.h

+5 −1
Original line number Diff line number Diff line
@@ -8,8 +8,11 @@ struct item { 
};



struct item *item_create(unsigned long index);

int __item_insert(struct radix_tree_root *root, struct item *item);

int __item_insert(struct radix_tree_root *root, struct item *item,

			unsigned order);

int item_insert(struct radix_tree_root *root, unsigned long index);

int item_insert_order(struct radix_tree_root *root, unsigned long index,

			unsigned order);

int item_delete(struct radix_tree_root *root, unsigned long index);

struct item *item_lookup(struct radix_tree_root *root, unsigned long index);
@@ -23,6 +26,7 @@ void item_full_scan(struct radix_tree_root *root, unsigned long start, 
void item_kill_tree(struct radix_tree_root *root);



void tag_check(void);

void multiorder_checks(void);



struct item *

item_tag_set(struct radix_tree_root *root, unsigned long index, int tag);

CRA Git | Maintained and supported by SUSTech CRA and CCSE