From: Matthew Wilcox <willy@linux.intel.com>
To: linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>,
linux-mm@kvack.org, linux-fsdevel@vger.kernel.org,
Konstantin Khlebnikov <koct9i@gmail.com>,
Kirill Shutemov <kirill.shutemov@linux.intel.com>,
Jan Kara <jack@suse.com>, Neil Brown <neilb@suse.de>,
Matthew Wilcox <willy@linux.intel.com>
Subject: [PATCH 20/30] radix tree test suite: multi-order iteration test
Date: Wed, 6 Apr 2016 17:21:29 -0400 [thread overview]
Message-ID: <1459977699-2349-21-git-send-email-willy@linux.intel.com> (raw)
In-Reply-To: <1459977699-2349-1-git-send-email-willy@linux.intel.com>
From: Ross Zwisler <ross.zwisler@linux.intel.com>
Add a unit test to verify that we can iterate over multi-order entries
properly via a radix_tree_for_each_slot() loop.
This was done with a single, somewhat complicated configuration that was
meant to test many of the various corner cases having to do with
multi-order entries:
- An iteration could begin at a sibling entry, and we need to return the
canonical entry.
- We could have entries of various orders in the same slots[] array.
- We could have multi-order entries at a nonzero height, followed by
indirect pointers to more radix tree nodes later in that same slots[]
array.
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
---
tools/testing/radix-tree/multiorder.c | 92 +++++++++++++++++++++++++++++++++++
1 file changed, 92 insertions(+)
diff --git a/tools/testing/radix-tree/multiorder.c b/tools/testing/radix-tree/multiorder.c
index 606bfe04b104..583c5127fbcf 100644
--- a/tools/testing/radix-tree/multiorder.c
+++ b/tools/testing/radix-tree/multiorder.c
@@ -57,6 +57,96 @@ static void multiorder_insert_bug(void)
item_kill_tree(&tree);
}
+void multiorder_iteration(void)
+{
+ RADIX_TREE(tree, GFP_KERNEL);
+ struct radix_tree_iter iter;
+ void **slot;
+ int i, err;
+
+ printf("Multiorder iteration test\n");
+
+#define NUM_ENTRIES 11
+ int index[NUM_ENTRIES] = {0, 2, 4, 8, 16, 32, 34, 36, 64, 72, 128};
+ int order[NUM_ENTRIES] = {1, 1, 2, 3, 4, 1, 0, 1, 3, 0, 7};
+
+ for (i = 0; i < NUM_ENTRIES; i++) {
+ err = item_insert_order(&tree, index[i], order[i]);
+ assert(!err);
+ }
+
+ i = 0;
+ /* start from index 1 to verify we find the multi-order entry at 0 */
+ radix_tree_for_each_slot(slot, &tree, &iter, 1) {
+ int height = order[i] / RADIX_TREE_MAP_SHIFT;
+ int shift = height * RADIX_TREE_MAP_SHIFT;
+
+ assert(iter.index == index[i]);
+ assert(iter.shift == shift);
+ i++;
+ }
+
+ /*
+ * Now iterate through the tree starting at an elevated multi-order
+ * entry, beginning at an index in the middle of the range.
+ */
+ i = 8;
+ radix_tree_for_each_slot(slot, &tree, &iter, 70) {
+ int height = order[i] / RADIX_TREE_MAP_SHIFT;
+ int shift = height * RADIX_TREE_MAP_SHIFT;
+
+ assert(iter.index == index[i]);
+ assert(iter.shift == shift);
+ i++;
+ }
+
+ item_kill_tree(&tree);
+}
+
+void multiorder_tagged_iteration(void)
+{
+ RADIX_TREE(tree, GFP_KERNEL);
+ struct radix_tree_iter iter;
+ void **slot;
+ int i;
+
+ printf("Multiorder tagged iteration test\n");
+
+#define MT_NUM_ENTRIES 9
+ int index[MT_NUM_ENTRIES] = {0, 2, 4, 16, 32, 40, 64, 72, 128};
+ int order[MT_NUM_ENTRIES] = {1, 0, 2, 4, 3, 1, 3, 0, 7};
+
+#define TAG_ENTRIES 7
+ int tag_index[TAG_ENTRIES] = {0, 4, 16, 40, 64, 72, 128};
+
+ for (i = 0; i < MT_NUM_ENTRIES; i++)
+ assert(!item_insert_order(&tree, index[i], order[i]));
+
+ assert(!radix_tree_tagged(&tree, 1));
+
+ for (i = 0; i < TAG_ENTRIES; i++)
+ assert(radix_tree_tag_set(&tree, tag_index[i], 1));
+
+ i = 0;
+ /* start from index 1 to verify we find the multi-order entry at 0 */
+ radix_tree_for_each_tagged(slot, &tree, &iter, 1, 1) {
+ assert(iter.index == tag_index[i]);
+ i++;
+ }
+
+ /*
+ * Now iterate through the tree starting at an elevated multi-order
+ * entry, beginning at an index in the middle of the range.
+ */
+ i = 4;
+ radix_tree_for_each_slot(slot, &tree, &iter, 70) {
+ assert(iter.index == tag_index[i]);
+ i++;
+ }
+
+ item_kill_tree(&tree);
+}
+
void multiorder_checks(void)
{
int i;
@@ -67,5 +157,7 @@ void multiorder_checks(void)
multiorder_check((1UL << i) + 1, i);
}
+ multiorder_iteration();
+ multiorder_tagged_iteration();
multiorder_insert_bug();
}
--
2.8.0.rc3
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-04-06 21:29 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-06 21:21 [PATCH 00/30] Radix tree multiorder fixes Matthew Wilcox
2016-04-06 21:21 ` [PATCH 01/30] radix-tree: Introduce radix_tree_empty Matthew Wilcox
2016-04-06 21:21 ` [PATCH 02/30] radix tree test suite: Fix build Matthew Wilcox
2016-04-06 21:21 ` [PATCH 03/30] radix tree test suite: Add tests for radix_tree_locate_item() Matthew Wilcox
2016-04-06 21:21 ` [PATCH 04/30] radix tree test suite: Allow testing other fan-out values Matthew Wilcox
2016-04-06 21:21 ` [PATCH 05/30] radix tree test suite: keep regression test runs short Matthew Wilcox
2016-04-06 21:21 ` [PATCH 06/30] radix tree test suite: rebuild when headers change Matthew Wilcox
2016-04-06 21:21 ` [PATCH 07/30] radix-tree: remove unused looping macros Matthew Wilcox
2016-04-06 21:21 ` [PATCH 08/30] Introduce CONFIG_RADIX_TREE_MULTIORDER Matthew Wilcox
2016-04-06 21:21 ` [PATCH 09/30] radix-tree: Add missing sibling entry functionality Matthew Wilcox
2016-04-06 21:21 ` [PATCH 10/30] radix-tree: Fix sibling entry insertion Matthew Wilcox
2016-04-06 21:21 ` [PATCH 11/30] radix-tree: Fix deleting a multi-order entry through an alias Matthew Wilcox
2016-04-06 21:21 ` [PATCH 12/30] radix-tree: Remove restriction on multi-order entries Matthew Wilcox
2016-04-06 21:21 ` [PATCH 13/30] radix-tree: Introduce radix_tree_load_root() Matthew Wilcox
2016-04-06 21:21 ` [PATCH 14/30] radix-tree: Fix extending the tree for multi-order entries at offset 0 Matthew Wilcox
2016-04-06 21:21 ` [PATCH 15/30] radix-tree: Fix several shrinking bugs with multiorder entries Matthew Wilcox
2016-04-06 21:21 ` [PATCH 16/30] radix tree test suite: Start adding multiorder tests Matthew Wilcox
2016-04-06 21:21 ` [PATCH 17/30] radix-tree: Rewrite __radix_tree_lookup Matthew Wilcox
2016-04-06 21:21 ` [PATCH 18/30] radix-tree: Fix multiorder BUG_ON in radix_tree_insert Matthew Wilcox
2016-04-06 21:21 ` [PATCH 19/30] radix-tree: add support for multi-order iterating Matthew Wilcox
2016-04-06 21:21 ` Matthew Wilcox [this message]
2016-04-06 21:21 ` [PATCH 21/30] radix tree test suite: Add multiorder shrinking test Matthew Wilcox
2016-04-06 21:21 ` [PATCH 22/30] radix-tree: Rewrite radix_tree_tag_set Matthew Wilcox
2016-04-06 21:21 ` [PATCH 23/30] radix-tree: Rewrite radix_tree_tag_clear Matthew Wilcox
2016-04-06 21:21 ` [PATCH 24/30] radix-tree: Rewrite radix_tree_tag_get Matthew Wilcox
2016-04-06 21:21 ` [PATCH 25/30] radix-tree test suite: add multi-order tag test Matthew Wilcox
2016-04-06 21:21 ` [PATCH 26/30] radix-tree: Fix radix_tree_create for sibling entries Matthew Wilcox
2016-04-06 21:21 ` [PATCH 27/30] radix-tree: Rewrite radix_tree_locate_item Matthew Wilcox
2016-04-06 21:21 ` [PATCH 28/30] radix-tree: Fix two bugs in radix_tree_range_tag_if_tagged() Matthew Wilcox
2016-04-06 21:21 ` [PATCH 29/30] radix-tree: Fix radix_tree_dump() for multi-order entries Matthew Wilcox
2016-04-06 21:21 ` [PATCH 30/30] radix-tree: Add copyright statements Matthew Wilcox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459977699-2349-21-git-send-email-willy@linux.intel.com \
--to=willy@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=koct9i@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=neilb@suse.de \
--cc=ross.zwisler@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).