kevin/linux
1
Fork 0
Code

userfaultfd: don't BUG_ON() if khugepaged yanks our page table

Browse Source 
Since khugepaged was changed to allow retracting page tables in file
mappings without holding the mmap lock, these BUG_ON()s are wrong - get
rid of them.

We could also remove the preceding "if (unlikely(...))" block, but then we
could reach pte_offset_map_lock() with transhuge pages not just for file
mappings but also for anonymous mappings - which would probably be fine
but I think is not necessarily expected.

Link: https://lkml.kernel.org/r/20240813-uffd-thp-flip-fix-v2-2-5efa61078a41@google.com
Fixes: 1d65b771bc ("mm/khugepaged: retract_page_tables() without mmap or vma lock")
Signed-off-by: Jann Horn <jannh@google.com>
Reviewed-by: Qi Zheng <zhengqi.arch@bytedance.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Pavel Emelyanov <xemul@virtuozzo.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Jann Horn 2024-08-13 22:25:22 +02:00 committed by Andrew Morton
parent 71c186efc1
commit 4828d207dc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mm/userfaultfd.c
View File

@ -807,9 +807,10 @@ retry:
err = -EFAULT; err = -EFAULT;
break; break;
} }
/*
BUG_ON(pmd_none(*dst_pmd)); * For shmem mappings, khugepaged is allowed to remove page
BUG_ON(pmd_trans_huge(*dst_pmd)); * tables under us; pte_offset_map_lock() will deal with that.
*/
err = mfill_atomic_pte(dst_pmd, dst_vma, dst_addr, err = mfill_atomic_pte(dst_pmd, dst_vma, dst_addr,
src_addr, flags, &folio); src_addr, flags, &folio);