lkml.org 
[lkml]   [2016]   [Nov]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/6] mm: khugepaged: fix radix tree node leak in shmem collapse error path
    Date
    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")
    Reported-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
    ---
    mm/khugepaged.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/mm/khugepaged.c b/mm/khugepaged.c
    index 728d7790dc2d..eac6f0580e26 100644
    --- a/mm/khugepaged.c
    +++ b/mm/khugepaged.c
    @@ -1520,7 +1520,8 @@ static void collapse_shmem(struct mm_struct *mm,
    if (!nr_none)
    break;
    /* Put holes back where they were */
    - radix_tree_replace_slot(slot, NULL);
    + radix_tree_delete(&mapping->page_tree,
    + iter.index);
    nr_none--;
    continue;
    }
    --
    2.10.1
    \
     
     \ /
      Last update: 2016-11-07 20:09    [W:3.330 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site