radix-tree: fix multiorder BUG_ON in radix_tree_insert

These BUG_ON tests are to ensure that all the tags are clear when
inserting a new entry.  If we insert a multiorder entry, we'll end up
looking at the tags for a different node, and so the BUG_ON can end up
triggering spuriously.

Also, we now have three tags, not two, so check all three are clear, and
check all the root tags with a single call to BUG_ON since the bits are
stored contiguously.

Include a test-case to ensure this problem does not reoccur.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Reviewed-by: Ross 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index f14ada9830ca128bda6a0d097f2a8ba2698435f4..ff460423ff4b44cd4ff3268ea4864ca3db852146 100644 (file)
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -165,6 +165,11 @@ static inline int root_tag_get(struct radix_tree_root *root, unsigned int tag)
        return (__force unsigned)root->gfp_mask & (1 << (tag + __GFP_BITS_SHIFT));
 }
 
+static inline unsigned root_tags_get(struct radix_tree_root *root)
+{
+       return (__force unsigned)root->gfp_mask >> __GFP_BITS_SHIFT;
+}
+
 /*
  * Returns 1 if any slot in the node has this tag set.
  * Otherwise returns 0.
@@ -604,12 +609,13 @@ int __radix_tree_insert(struct radix_tree_root *root, unsigned long index,
        rcu_assign_pointer(*slot, item);
 
        if (node) {
+               unsigned offset = get_slot_offset(node, slot);
                node->count++;
-               BUG_ON(tag_get(node, 0, index & RADIX_TREE_MAP_MASK));
-               BUG_ON(tag_get(node, 1, index & RADIX_TREE_MAP_MASK));
+               BUG_ON(tag_get(node, 0, offset));
+               BUG_ON(tag_get(node, 1, offset));
+               BUG_ON(tag_get(node, 2, offset));
        } else {
-               BUG_ON(root_tag_get(root, 0));
-               BUG_ON(root_tag_get(root, 1));
+               BUG_ON(root_tags_get(root));
        }
 
        return 0;

diff --git a/tools/testing/radix-tree/multiorder.c b/tools/testing/radix-tree/multiorder.c
index 71f34a04700240f0100f8d2537f86bb5a1dfbae7..0a311a5f39de986abe920c4902a516bbd7833f93 100644 (file)
--- a/tools/testing/radix-tree/multiorder.c
+++ b/tools/testing/radix-tree/multiorder.c
@@ -81,6 +81,17 @@ static void multiorder_shrink(unsigned long index, int order)
                item_check_absent(&tree, i);
 }
 
+static void multiorder_insert_bug(void)
+{
+       RADIX_TREE(tree, GFP_KERNEL);
+
+       item_insert(&tree, 0);
+       radix_tree_tag_set(&tree, 0, 0);
+       item_insert_order(&tree, 3 << 6, 6);
+
+       item_kill_tree(&tree);
+}
+
 void multiorder_checks(void)
 {
        int i;
@@ -94,4 +105,5 @@ void multiorder_checks(void)
        for (i = 0; i < 15; i++)
                multiorder_shrink((1UL << (i + RADIX_TREE_MAP_SHIFT)), i);
 
+       multiorder_insert_bug();
 }