]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/blobdiff - lib/radix-tree.c
radix-tree: fix replacement for multiorder entries
[mirror_ubuntu-zesty-kernel.git] / lib / radix-tree.c
index 962cfb3a76713572d8b16ccda80bbb4f681094bd..d09c17dd60ae048f68ba0317d73c67e86847891a 100644 (file)
@@ -22,6 +22,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/cpu.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -367,7 +368,7 @@ radix_tree_node_free(struct radix_tree_node *node)
  * To make use of this facility, the radix tree must be initialised without
  * __GFP_DIRECT_RECLAIM being passed to INIT_RADIX_TREE().
  */
-static int __radix_tree_preload(gfp_t gfp_mask, int nr)
+static int __radix_tree_preload(gfp_t gfp_mask, unsigned nr)
 {
        struct radix_tree_preload *rtp;
        struct radix_tree_node *node;
@@ -433,6 +434,28 @@ int radix_tree_maybe_preload(gfp_t gfp_mask)
 }
 EXPORT_SYMBOL(radix_tree_maybe_preload);
 
+#ifdef CONFIG_RADIX_TREE_MULTIORDER
+/*
+ * Preload with enough objects to ensure that we can split a single entry
+ * of order @old_order into many entries of size @new_order
+ */
+int radix_tree_split_preload(unsigned int old_order, unsigned int new_order,
+                                                       gfp_t gfp_mask)
+{
+       unsigned top = 1 << (old_order % RADIX_TREE_MAP_SHIFT);
+       unsigned layers = (old_order / RADIX_TREE_MAP_SHIFT) -
+                               (new_order / RADIX_TREE_MAP_SHIFT);
+       unsigned nr = 0;
+
+       WARN_ON_ONCE(!gfpflags_allow_blocking(gfp_mask));
+       BUG_ON(new_order >= old_order);
+
+       while (layers--)
+               nr = nr * RADIX_TREE_MAP_SIZE + 1;
+       return __radix_tree_preload(gfp_mask, top * nr);
+}
+#endif
+
 /*
  * The same as function above, but preload number of nodes required to insert
  * (1 << order) continuous naturally-aligned elements.
@@ -758,7 +781,10 @@ static inline int insert_entries(struct radix_tree_node *node, void **slot,
        unsigned i, n, tag, offset, tags = 0;
 
        if (node) {
-               n = 1 << (order - node->shift);
+               if (order > node->shift)
+                       n = 1 << (order - node->shift);
+               else
+                       n = 1;
                offset = get_slot_offset(node, slot);
        } else {
                n = 1;
@@ -797,7 +823,8 @@ static inline int insert_entries(struct radix_tree_node *node, void **slot,
                                        tag_set(node, tag, offset);
                }
                if (radix_tree_is_internal_node(old) &&
-                                       !is_sibling_entry(node, old))
+                                       !is_sibling_entry(node, old) &&
+                                       (old != RADIX_TREE_RETRY))
                        radix_tree_free_nodes(old);
                if (radix_tree_exceptional_entry(old))
                        node->exceptional--;
@@ -950,6 +977,24 @@ void *radix_tree_lookup(struct radix_tree_root *root, unsigned long index)
 }
 EXPORT_SYMBOL(radix_tree_lookup);
 
+static inline int slot_count(struct radix_tree_node *node,
+                                               void **slot)
+{
+       int n = 1;
+#ifdef CONFIG_RADIX_TREE_MULTIORDER
+       void *ptr = node_to_entry(slot);
+       unsigned offset = get_slot_offset(node, slot);
+       int i;
+
+       for (i = 1; offset + i < RADIX_TREE_MAP_SIZE; i++) {
+               if (node->slots[offset + i] != ptr)
+                       break;
+               n++;
+       }
+#endif
+       return n;
+}
+
 static void replace_slot(struct radix_tree_root *root,
                         struct radix_tree_node *node,
                         void **slot, void *item,
@@ -968,12 +1013,35 @@ static void replace_slot(struct radix_tree_root *root,
 
        if (node) {
                node->count += count;
-               node->exceptional += exceptional;
+               if (exceptional) {
+                       exceptional *= slot_count(node, slot);
+                       node->exceptional += exceptional;
+               }
        }
 
        rcu_assign_pointer(*slot, item);
 }
 
+static inline void delete_sibling_entries(struct radix_tree_node *node,
+                                               void **slot)
+{
+#ifdef CONFIG_RADIX_TREE_MULTIORDER
+       bool exceptional = radix_tree_exceptional_entry(*slot);
+       void *ptr = node_to_entry(slot);
+       unsigned offset = get_slot_offset(node, slot);
+       int i;
+
+       for (i = 1; offset + i < RADIX_TREE_MAP_SIZE; i++) {
+               if (node->slots[offset + i] != ptr)
+                       break;
+               node->slots[offset + i] = NULL;
+               node->count--;
+               if (exceptional)
+                       node->exceptional--;
+       }
+#endif
+}
+
 /**
  * __radix_tree_replace                - replace item in a slot
  * @root:              radix tree root
@@ -991,6 +1059,8 @@ void __radix_tree_replace(struct radix_tree_root *root,
                          void **slot, void *item,
                          radix_tree_update_node_t update_node, void *private)
 {
+       if (!item)
+               delete_sibling_entries(node, slot);
        /*
         * This function supports replacing exceptional entries and
         * deleting entries, but that needs accounting against the
@@ -1021,7 +1091,8 @@ void __radix_tree_replace(struct radix_tree_root *root,
  * NOTE: This cannot be used to switch between non-entries (empty slots),
  * regular entries, and exceptional entries, as that requires accounting
  * inside the radix tree node. When switching from one type of entry or
- * deleting, use __radix_tree_lookup() and __radix_tree_replace().
+ * deleting, use __radix_tree_lookup() and __radix_tree_replace() or
+ * radix_tree_iter_replace().
  */
 void radix_tree_replace_slot(struct radix_tree_root *root,
                             void **slot, void *item)
@@ -1029,6 +1100,21 @@ void radix_tree_replace_slot(struct radix_tree_root *root,
        replace_slot(root, NULL, slot, item, true);
 }
 
+/**
+ * radix_tree_iter_replace - replace item in a slot
+ * @root:      radix tree root
+ * @slot:      pointer to slot
+ * @item:      new item to store in the slot.
+ *
+ * For use with radix_tree_split() and radix_tree_for_each_slot().
+ * Caller must hold tree write locked across split and replacement.
+ */
+void radix_tree_iter_replace(struct radix_tree_root *root,
+               const struct radix_tree_iter *iter, void **slot, void *item)
+{
+       __radix_tree_replace(root, iter->node, slot, item, NULL, NULL);
+}
+
 #ifdef CONFIG_RADIX_TREE_MULTIORDER
 /**
  * radix_tree_join - replace multiple entries with one multiorder entry
@@ -1061,6 +1147,117 @@ int radix_tree_join(struct radix_tree_root *root, unsigned long index,
 
        return error;
 }
+
+/**
+ * radix_tree_split - Split an entry into smaller entries
+ * @root: radix tree root
+ * @index: An index within the large entry
+ * @order: Order of new entries
+ *
+ * Call this function as the first step in replacing a multiorder entry
+ * with several entries of lower order.  After this function returns,
+ * loop over the relevant portion of the tree using radix_tree_for_each_slot()
+ * and call radix_tree_iter_replace() to set up each new entry.
+ *
+ * The tags from this entry are replicated to all the new entries.
+ *
+ * The radix tree should be locked against modification during the entire
+ * replacement operation.  Lock-free lookups will see RADIX_TREE_RETRY which
+ * should prompt RCU walkers to restart the lookup from the root.
+ */
+int radix_tree_split(struct radix_tree_root *root, unsigned long index,
+                               unsigned order)
+{
+       struct radix_tree_node *parent, *node, *child;
+       void **slot;
+       unsigned int offset, end;
+       unsigned n, tag, tags = 0;
+
+       if (!__radix_tree_lookup(root, index, &parent, &slot))
+               return -ENOENT;
+       if (!parent)
+               return -ENOENT;
+
+       offset = get_slot_offset(parent, slot);
+
+       for (tag = 0; tag < RADIX_TREE_MAX_TAGS; tag++)
+               if (tag_get(parent, tag, offset))
+                       tags |= 1 << tag;
+
+       for (end = offset + 1; end < RADIX_TREE_MAP_SIZE; end++) {
+               if (!is_sibling_entry(parent, parent->slots[end]))
+                       break;
+               for (tag = 0; tag < RADIX_TREE_MAX_TAGS; tag++)
+                       if (tags & (1 << tag))
+                               tag_set(parent, tag, end);
+               /* rcu_assign_pointer ensures tags are set before RETRY */
+               rcu_assign_pointer(parent->slots[end], RADIX_TREE_RETRY);
+       }
+       rcu_assign_pointer(parent->slots[offset], RADIX_TREE_RETRY);
+       parent->exceptional -= (end - offset);
+
+       if (order == parent->shift)
+               return 0;
+       if (order > parent->shift) {
+               while (offset < end)
+                       offset += insert_entries(parent, &parent->slots[offset],
+                                       RADIX_TREE_RETRY, order, true);
+               return 0;
+       }
+
+       node = parent;
+
+       for (;;) {
+               if (node->shift > order) {
+                       child = radix_tree_node_alloc(root);
+                       if (!child)
+                               goto nomem;
+                       child->shift = node->shift - RADIX_TREE_MAP_SHIFT;
+                       child->offset = offset;
+                       child->count = 0;
+                       child->parent = node;
+                       if (node != parent) {
+                               node->count++;
+                               node->slots[offset] = node_to_entry(child);
+                               for (tag = 0; tag < RADIX_TREE_MAX_TAGS; tag++)
+                                       if (tags & (1 << tag))
+                                               tag_set(node, tag, offset);
+                       }
+
+                       node = child;
+                       offset = 0;
+                       continue;
+               }
+
+               n = insert_entries(node, &node->slots[offset],
+                                       RADIX_TREE_RETRY, order, false);
+               BUG_ON(n > RADIX_TREE_MAP_SIZE);
+
+               for (tag = 0; tag < RADIX_TREE_MAX_TAGS; tag++)
+                       if (tags & (1 << tag))
+                               tag_set(node, tag, offset);
+               offset += n;
+
+               while (offset == RADIX_TREE_MAP_SIZE) {
+                       if (node == parent)
+                               break;
+                       offset = node->offset;
+                       child = node;
+                       node = node->parent;
+                       rcu_assign_pointer(node->slots[offset],
+                                               node_to_entry(child));
+                       offset++;
+               }
+               if ((node == parent) && (offset == end))
+                       return 0;
+       }
+
+ nomem:
+       /* Shouldn't happen; did user forget to preload? */
+       /* TODO: free all the allocated nodes */
+       WARN_ON(1);
+       return -ENOMEM;
+}
 #endif
 
 /**
@@ -1441,8 +1638,10 @@ void **radix_tree_next_chunk(struct radix_tree_root *root,
                        child = rcu_dereference_raw(node->slots[offset]);
                }
 
-               if ((child == NULL) || (child == RADIX_TREE_RETRY))
+               if (!child)
                        goto restart;
+               if (child == RADIX_TREE_RETRY)
+                       break;
        } while (radix_tree_is_internal_node(child));
 
        /* Update the iterator state */
@@ -1638,20 +1837,6 @@ void __radix_tree_delete_node(struct radix_tree_root *root,
        delete_node(root, node, NULL, NULL);
 }
 
-static inline void delete_sibling_entries(struct radix_tree_node *node,
-                                       void *ptr, unsigned offset)
-{
-#ifdef CONFIG_RADIX_TREE_MULTIORDER
-       int i;
-       for (i = 1; offset + i < RADIX_TREE_MAP_SIZE; i++) {
-               if (node->slots[offset + i] != ptr)
-                       break;
-               node->slots[offset + i] = NULL;
-               node->count--;
-       }
-#endif
-}
-
 /**
  *     radix_tree_delete_item    -    delete an item from a radix tree
  *     @root:          radix tree root
@@ -1691,7 +1876,6 @@ void *radix_tree_delete_item(struct radix_tree_root *root,
        for (tag = 0; tag < RADIX_TREE_MAX_TAGS; tag++)
                node_tag_clear(root, node, tag, offset);
 
-       delete_sibling_entries(node, node_to_entry(slot), offset);
        __radix_tree_replace(root, node, slot, NULL, NULL, NULL);
 
        return entry;