Skip to content

Commit fece202

Browse files
kiryltorvalds
authored andcommitted
mm/khugepaged.c: convert VM_BUG_ON() to collapse fail
khugepaged is not yet able to convert PTE-mapped huge pages back to PMD mapped. We do not collapse such pages. See check khugepaged_scan_pmd(). But if between khugepaged_scan_pmd() and __collapse_huge_page_isolate() somebody managed to instantiate THP in the range and then split the PMD back to PTEs we would have a problem -- VM_BUG_ON_PAGE(PageCompound(page)) will get triggered. It's possible since we drop mmap_sem during collapse to re-take for write. Replace the VM_BUG_ON() with graceful collapse fail. Link: http://lkml.kernel.org/r/[email protected] Fixes: b1caa95 ("khugepaged: ignore pmd tables with THP mapped with ptes") Signed-off-by: Kirill A. Shutemov <[email protected]> Cc: Laura Abbott <[email protected]> Cc: Jerome Marchand <[email protected]> Cc: Vlastimil Babka <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 28ee90f commit fece202

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

mm/khugepaged.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,12 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma,
530530
goto out;
531531
}
532532

533-
VM_BUG_ON_PAGE(PageCompound(page), page);
533+
/* TODO: teach khugepaged to collapse THP mapped with pte */
534+
if (PageCompound(page)) {
535+
result = SCAN_PAGE_COMPOUND;
536+
goto out;
537+
}
538+
534539
VM_BUG_ON_PAGE(!PageAnon(page), page);
535540

536541
/*

0 commit comments

Comments
 (0)