Commit adb9d9c4 authored by Matthew Wilcox's avatar Matthew Wilcox
Browse files

radix tree: Remove radix_tree_clear_tags 



The page cache was the only user of this interface and it has now
been converted to the XArray.  Transform the test into a test of
xas_init_marks().

Signed-off-by: default avatarMatthew Wilcox <willy@infradead.org>
parent 8cf2f984

include/linux/radix-tree.h

+0 −2
Original line number Diff line number Diff line
@@ -252,8 +252,6 @@ void radix_tree_iter_delete(struct radix_tree_root *, 
			struct radix_tree_iter *iter, void __rcu **slot);

void *radix_tree_delete_item(struct radix_tree_root *, unsigned long, void *);

void *radix_tree_delete(struct radix_tree_root *, unsigned long);

void radix_tree_clear_tags(struct radix_tree_root *, struct radix_tree_node *,

			   void __rcu **slot);

unsigned int radix_tree_gang_lookup(const struct radix_tree_root *,

			void **results, unsigned long first_index,

			unsigned int max_items);

lib/radix-tree.c

+0 −13
Original line number Diff line number Diff line
@@ -1670,19 +1670,6 @@ void *radix_tree_delete(struct radix_tree_root *root, unsigned long index) 
}

EXPORT_SYMBOL(radix_tree_delete);



void radix_tree_clear_tags(struct radix_tree_root *root,

			   struct radix_tree_node *node,

			   void __rcu **slot)

{

	if (node) {

		unsigned int tag, offset = get_slot_offset(node, slot);

		for (tag = 0; tag < RADIX_TREE_MAX_TAGS; tag++)

			node_tag_clear(root, node, tag, offset);

	} else {

		root_tag_clear_all(root);

	}

}



/**

 *	radix_tree_tagged - test whether any items in the tree are tagged

 *	@root:		radix tree root

lib/test_xarray.c

+40 −0
Original line number Diff line number Diff line
@@ -213,12 +213,52 @@ static noinline void check_xa_mark_1(struct xarray *xa, unsigned long index) 
	XA_BUG_ON(xa, !xa_empty(xa));

}



static noinline void check_xa_mark_2(struct xarray *xa)

{

	XA_STATE(xas, xa, 0);

	unsigned long index;

	unsigned int count = 0;

	void *entry;



	xa_store_index(xa, 0, GFP_KERNEL);

	xa_set_mark(xa, 0, XA_MARK_0);

	xas_lock(&xas);

	xas_load(&xas);

	xas_init_marks(&xas);

	xas_unlock(&xas);

	XA_BUG_ON(xa, !xa_get_mark(xa, 0, XA_MARK_0) == 0);



	for (index = 3500; index < 4500; index++) {

		xa_store_index(xa, index, GFP_KERNEL);

		xa_set_mark(xa, index, XA_MARK_0);

	}



	xas_reset(&xas);

	rcu_read_lock();

	xas_for_each_marked(&xas, entry, ULONG_MAX, XA_MARK_0)

		count++;

	rcu_read_unlock();

	XA_BUG_ON(xa, count != 1000);



	xas_lock(&xas);

	xas_for_each(&xas, entry, ULONG_MAX) {

		xas_init_marks(&xas);

		XA_BUG_ON(xa, !xa_get_mark(xa, xas.xa_index, XA_MARK_0));

		XA_BUG_ON(xa, !xas_get_mark(&xas, XA_MARK_0));

	}

	xas_unlock(&xas);



	xa_destroy(xa);

}



static noinline void check_xa_mark(struct xarray *xa)

{

	unsigned long index;



	for (index = 0; index < 16384; index += 4)

		check_xa_mark_1(xa, index);



	check_xa_mark_2(xa);

}



static noinline void check_xa_shrink(struct xarray *xa)

tools/testing/radix-tree/tag_check.c

+0 −29
Original line number Diff line number Diff line
@@ -331,34 +331,6 @@ static void single_check(void) 
	item_kill_tree(&tree);

}



void radix_tree_clear_tags_test(void)

{

	unsigned long index;

	struct radix_tree_node *node;

	struct radix_tree_iter iter;

	void **slot;



	RADIX_TREE(tree, GFP_KERNEL);



	item_insert(&tree, 0);

	item_tag_set(&tree, 0, 0);

	__radix_tree_lookup(&tree, 0, &node, &slot);

	radix_tree_clear_tags(&tree, node, slot);

	assert(item_tag_get(&tree, 0, 0) == 0);



	for (index = 0; index < 1000; index++) {

		item_insert(&tree, index);

		item_tag_set(&tree, index, 0);

	}



	radix_tree_for_each_slot(slot, &tree, &iter, 0) {

		radix_tree_clear_tags(&tree, iter.node, slot);

		assert(item_tag_get(&tree, iter.index, 0) == 0);

	}



	item_kill_tree(&tree);

}



void tag_check(void)

{

	single_check();
@@ -376,5 +348,4 @@ void tag_check(void) 
	thrash_tags();

	rcu_barrier();

	printv(2, "after thrash_tags: %d allocated\n", nr_allocated);

	radix_tree_clear_tags_test();

}