maple_tree: Add mas_prev_range() and mas_find_range_rev interface

Some users of the maple tree may want to move to the previous range
regardless of the value stored there.  Add this interface as well as the
'find' variant to support walking to the first value, then iterating
over the previous ranges.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>

diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h
index 0552d8b3b5b773de09fa51eeac4fa525d45552a1..3bd51c17df4a7c61db884ddc38e673829adadbc1 100644 (file)
--- a/include/linux/maple_tree.h
+++ b/include/linux/maple_tree.h
@@ -466,6 +466,7 @@ void mas_destroy(struct ma_state *mas);
 int mas_expected_entries(struct ma_state *mas, unsigned long nr_entries);
 
 void *mas_prev(struct ma_state *mas, unsigned long min);
+void *mas_prev_range(struct ma_state *mas, unsigned long max);
 void *mas_next(struct ma_state *mas, unsigned long max);
 void *mas_next_range(struct ma_state *mas, unsigned long max);
 

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 803ffb84c77585ae7799c496c5db9d7ab67d1ae7..992bd7c60a192e4a4ddfe057414c247f6546c3c9 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -4869,7 +4869,7 @@ static inline void *mas_prev_entry(struct ma_state *mas, unsigned long min)
 {
        void *entry;
 
-       if (mas->index < min)
+       if (mas->index <= min)
                return NULL;
 
        entry = mas_prev_slot(mas, min);
@@ -5948,18 +5948,8 @@ void *mt_next(struct maple_tree *mt, unsigned long index, unsigned long max)
 }
 EXPORT_SYMBOL_GPL(mt_next);
 
-/**
- * mas_prev() - Get the previous entry
- * @mas: The maple state
- * @min: The minimum value to check.
- *
- * Must hold rcu_read_lock or the write lock.
- * Will reset mas to MAS_START if the node is MAS_NONE.  Will stop on not
- * searchable nodes.
- *
- * Return: the previous value or %NULL.
- */
-void *mas_prev(struct ma_state *mas, unsigned long min)
+static inline bool mas_prev_setup(struct ma_state *mas, unsigned long min,
+               void **entry)
 {
        if (mas->index <= min)
                goto none;
@@ -5977,7 +5967,8 @@ void *mas_prev(struct ma_state *mas, unsigned long min)
                if (!mas->index)
                        goto none;
                mas->index = mas->last = 0;
-               return mas_root(mas);
+               *entry = mas_root(mas);
+               return true;
        }
 
        if (mas_is_none(mas)) {
@@ -5985,18 +5976,65 @@ void *mas_prev(struct ma_state *mas, unsigned long min)
                        /* Walked to out-of-range pointer? */
                        mas->index = mas->last = 0;
                        mas->node = MAS_ROOT;
-                       return mas_root(mas);
+                       *entry = mas_root(mas);
+                       return true;
                }
-               return NULL;
+               return true;
        }
-       return mas_prev_entry(mas, min);
+
+       return false;
 
 none:
        mas->node = MAS_NONE;
-       return NULL;
+       return true;
+}
+
+/**
+ * mas_prev() - Get the previous entry
+ * @mas: The maple state
+ * @min: The minimum value to check.
+ *
+ * Must hold rcu_read_lock or the write lock.
+ * Will reset mas to MAS_START if the node is MAS_NONE.  Will stop on not
+ * searchable nodes.
+ *
+ * Return: the previous value or %NULL.
+ */
+void *mas_prev(struct ma_state *mas, unsigned long min)
+{
+       void *entry = NULL;
+
+       if (mas_prev_setup(mas, min, &entry))
+               return entry;
+
+       return mas_prev_entry(mas, min);
 }
 EXPORT_SYMBOL_GPL(mas_prev);
 
+/**
+ * mas_prev_range() - Advance to the previous range
+ * @mas: The maple state
+ * @min: The minimum value to check.
+ *
+ * Sets @mas->index and @mas->last to the range.
+ * Must hold rcu_read_lock or the write lock.
+ * Will reset mas to MAS_START if the node is MAS_NONE.  Will stop on not
+ * searchable nodes.
+ *
+ * Return: the previous value or %NULL.
+ */
+void *mas_prev_range(struct ma_state *mas, unsigned long min)
+{
+       void *entry = NULL;
+
+       if (mas_prev_setup(mas, min, &entry))
+               return entry;
+
+       return mas_prev_slot(mas, min);
+}
+EXPORT_SYMBOL_GPL(mas_prev_slot);
+
+
 /**
  * mt_prev() - get the previous value in the maple tree
  * @mt: The maple tree
@@ -6144,21 +6182,17 @@ void *mas_find_range(struct ma_state *mas, unsigned long max)
 }
 EXPORT_SYMBOL_GPL(mas_find_range);
 
+
 /**
- * mas_find_rev: On the first call, find the first non-null entry at or below
- * mas->index down to %min.  Otherwise find the first non-null entry below
- * mas->index down to %min.
- * @mas: The maple state
- * @min: The minimum value to check.
+ * mas_find_rev_setup() - Internal function to set up mas_find_*_rev()
  *
- * Must hold rcu_read_lock or the write lock.
- * If an entry exists, last and index are updated accordingly.
- * May set @mas->node to MAS_NONE.
- *
- * Return: The entry or %NULL.
+ * Returns: True if entry is the answer, false otherwise.
  */
-void *mas_find_rev(struct ma_state *mas, unsigned long min)
+static inline bool mas_find_rev_setup(struct ma_state *mas, unsigned long min,
+               void **entry)
 {
+       *entry = NULL;
+
        if (unlikely(mas_is_none(mas))) {
                if (mas->index <= min)
                        goto none;
@@ -6170,7 +6204,7 @@ void *mas_find_rev(struct ma_state *mas, unsigned long min)
        if (unlikely(mas_is_paused(mas))) {
                if (unlikely(mas->index <= min)) {
                        mas->node = MAS_NONE;
-                       return NULL;
+                       return true;
                }
                mas->node = MAS_START;
                mas->last = --mas->index;
@@ -6178,14 +6212,12 @@ void *mas_find_rev(struct ma_state *mas, unsigned long min)
 
        if (unlikely(mas_is_start(mas))) {
                /* First run or continue */
-               void *entry;
-
                if (mas->index < min)
-                       return NULL;
+                       return true;
 
-               entry = mas_walk(mas);
-               if (entry)
-                       return entry;
+               *entry = mas_walk(mas);
+               if (*entry)
+                       return true;
        }
 
        if (unlikely(!mas_searchable(mas))) {
@@ -6199,22 +6231,73 @@ void *mas_find_rev(struct ma_state *mas, unsigned long min)
                         */
                        mas->last = mas->index = 0;
                        mas->node = MAS_ROOT;
-                       return mas_root(mas);
+                       *entry = mas_root(mas);
+                       return true;
                }
        }
 
        if (mas->index < min)
-               return NULL;
+               return true;
 
-       /* Retries on dead nodes handled by mas_next_entry */
-       return mas_prev_entry(mas, min);
+       /* Retries on dead nodes handled by mas_prev_entry */
+       return false;
 
 none:
        mas->node = MAS_NONE;
-       return NULL;
+       return true;
+}
+
+/**
+ * mas_find_rev: On the first call, find the first non-null entry at or below
+ * mas->index down to %min.  Otherwise find the first non-null entry below
+ * mas->index down to %min.
+ * @mas: The maple state
+ * @min: The minimum value to check.
+ *
+ * Must hold rcu_read_lock or the write lock.
+ * If an entry exists, last and index are updated accordingly.
+ * May set @mas->node to MAS_NONE.
+ *
+ * Return: The entry or %NULL.
+ */
+void *mas_find_rev(struct ma_state *mas, unsigned long min)
+{
+       void *entry;
+
+       if (mas_find_rev_setup(mas, min, &entry))
+               return entry;
+
+       /* Retries on dead nodes handled by mas_next_entry */
+       return mas_prev_entry(mas, min);
+
 }
 EXPORT_SYMBOL_GPL(mas_find_rev);
 
+/**
+ * mas_find_range_rev: On the first call, find the first non-null entry at or
+ * below mas->index down to %min.  Otherwise advance to the previous slot after
+ * mas->index down to %min.
+ * @mas: The maple state
+ * @min: The minimum value to check.
+ *
+ * Must hold rcu_read_lock or the write lock.
+ * If an entry exists, last and index are updated accordingly.
+ * May set @mas->node to MAS_NONE.
+ *
+ * Return: The entry or %NULL.
+ */
+void *mas_find_range_rev(struct ma_state *mas, unsigned long min)
+{
+       void *entry;
+
+       if (mas_find_rev_setup(mas, min, &entry))
+               return entry;
+
+       /* Retries on dead nodes handled by mas_prev_slot */
+       return mas_prev_slot(mas, min);
+}
+EXPORT_SYMBOL_GPL(mas_find_range_rev);
+
 /**
  * mas_erase() - Find the range in which index resides and erase the entire
  * range.