1. 21 5月, 2016 4 次提交
    • R
      radix tree test suite: multi-order iteration test · 643b57d0
      Ross Zwisler 提交于
      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: NRoss Zwisler <ross.zwisler@linux.intel.com>
      Signed-off-by: NMatthew Wilcox <willy@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: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      643b57d0
    • M
      radix-tree: fix multiorder BUG_ON in radix_tree_insert · 7b60e9ad
      Matthew Wilcox 提交于
      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: NMatthew Wilcox <willy@linux.intel.com>
      Reviewed-by: NRoss 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: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7b60e9ad
    • M
      radix-tree: fix several shrinking bugs with multiorder entries · afe0e395
      Matthew Wilcox 提交于
      Setting the indirect bit on the user data entry used to be unambiguous
      because the tree walking code knew not to expect internal nodes in the
      last level of the tree.  Multiorder entries can appear at any level of
      the tree, and a leaf with the indirect bit set is indistinguishable from
      a pointer to a node.
      
      Introduce a special entry (RADIX_TREE_RETRY) which is neither a valid
      user entry, nor a valid pointer to a node.  The radix_tree_deref_retry()
      function continues to work the same way, but tree walking code can
      distinguish it from a pointer to a node.
      
      Also fix the condition for setting slot->parent to NULL; it does not
      matter what height the tree is, it only matters whether slot is an
      indirect pointer.  Move this code above the comment which is referring
      to the assignment to root->rnode.
      
      Also fix the condition for preventing the tree from shrinking to a
      single entry if it's a multiorder entry.
      
      Add a test-case to the test suite that checks that the tree goes back
      down to its original height after an item is inserted & deleted from a
      higher index in the tree.
      Signed-off-by: NMatthew Wilcox <willy@linux.intel.com>
      Reviewed-by: NRoss 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: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      afe0e395
    • M
      radix tree test suite: start adding multiorder tests · 4f3755d1
      Matthew Wilcox 提交于
      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: NMatthew Wilcox <willy@linux.intel.com>
      Reviewed-by: NRoss 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: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4f3755d1