mm: khugepaged: fix radix tree node leak in shmem collapse error path

The radix tree counts valid entries in each tree node.  Entries stored
in the tree cannot be removed by simpling storing NULL in the slot or
the internal counters will be off and the node never gets freed again.

When collapsing a shmem page fails, restore the holes that were filled
with radix_tree_insert() with a proper radix tree deletion.

Fixes: f3f0e1d2150b ("khugepaged: add support of collapse for tmpfs/shmem pages")
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Johannes Weiner <[email protected]>
Reported-by: Jan Kara <[email protected]>
Acked-by: Kirill A. Shutemov <[email protected]>
Reviewed-by: Jan Kara <[email protected]>
Cc: Hugh Dickins <[email protected]>
Cc: Matthew Wilcox <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 2779c63bdea0a7227986616bde5d12ec2471594a..5d7c006373d30580f97d336c1cbb60edc7927735 100644 (file)
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1525,9 +1525,11 @@ tree_unlocked:
                        if (!page || iter.index < page->index) {
                                if (!nr_none)
                                        break;
-                               /* Put holes back where they were */
-                               radix_tree_replace_slot(slot, NULL);
                                nr_none--;
+                               /* Put holes back where they were */
+                               radix_tree_delete(&mapping->page_tree,
+                                                 iter.index);
+                               slot = radix_tree_iter_next(&iter);
                                continue;
                        }