Skip to content

Commit c1d91dc

Browse files
Liu Shixinmehmetb0
authored andcommitted
mm/swapfile: skip HugeTLB pages for unuse_vma
BugLink: https://bugs.launchpad.net/bugs/2097393 commit 7528c4f upstream. I got a bad pud error and lost a 1GB HugeTLB when calling swapoff. The problem can be reproduced by the following steps: 1. Allocate an anonymous 1GB HugeTLB and some other anonymous memory. 2. Swapout the above anonymous memory. 3. run swapoff and we will get a bad pud error in kernel message: mm/pgtable-generic.c:42: bad pud 00000000743d215d(84000001400000e7) We can tell that pud_clear_bad is called by pud_none_or_clear_bad in unuse_pud_range() by ftrace. And therefore the HugeTLB pages will never be freed because we lost it from page table. We can skip HugeTLB pages for unuse_vma to fix it. Link: https://lkml.kernel.org/r/[email protected] Fixes: 0fe6e20 ("hugetlb, rmap: add reverse mapping for hugepage") Signed-off-by: Liu Shixin <[email protected]> Acked-by: Muchun Song <[email protected]> Cc: Naoya Horiguchi <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Manuel Diewald <[email protected]> Signed-off-by: Koichiro Den <[email protected]>
1 parent b91ac4c commit c1d91dc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mm/swapfile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2005,7 +2005,7 @@ static int unuse_mm(struct mm_struct *mm, unsigned int type)
20052005

20062006
mmap_read_lock(mm);
20072007
for_each_vma(vmi, vma) {
2008-
if (vma->anon_vma) {
2008+
if (vma->anon_vma && !is_vm_hugetlb_page(vma)) {
20092009
ret = unuse_vma(vma, type);
20102010
if (ret)
20112011
break;

0 commit comments

Comments
 (0)