• David Stevens's avatar
    mm/khugepaged: fix iteration in collapse_file · c8a8f3b4
    David Stevens authored
    Remove an unnecessary call to xas_set(index) when iterating over the
    target range in collapse_file.  The extra call to xas_set reset the xas
    cursor to the top of the tree, causing the xas_next call on the next
    iteration to walk the tree to index instead of advancing to index+1.  This
    returned the same page again, which would cause collapse_file to fail
    because the page is already locked.
    
    This bug was hidden when CONFIG_DEBUG_VM was set.  When that config was
    used, the xas_load in a subsequent VM_BUG_ON assert would walk xas from
    the top of the tree to index, causing the xas_next call on the next loop
    iteration to advance the cursor as expected.
    
    Link: https://lkml.kernel.org/r/20230607053135.2087354-1-stevensd@google.com
    Fixes: a2e17cc2 ("mm/khugepaged: maintain page cache uptodate flag")
    Signed-off-by: default avatarDavid Stevens <stevensd@chromium.org>
    Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
    Cc: David Hildenbrand <david@redhat.com>
    Cc: Hugh Dickins <hughd@google.com>
    Cc: Jiaqi Yan <jiaqiyan@google.com>
    Cc: Kirill A . Shutemov <kirill@shutemov.name>
    Cc: Matthew Wilcox <willy@infradead.org>
    Cc: Yang Shi <shy828301@gmail.com>
    Cc: Mike Kravetz <mike.kravetz@oracle.com>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    c8a8f3b4
khugepaged.c 75.2 KB