diff options
| author | Jann Horn <jannh@google.com> | 2024-08-13 22:25:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-09-12 11:11:27 +0200 |
| commit | 4a594acc12d5954cdc71d4450a386748bf3d136a (patch) | |
| tree | 4b94fac2ebc89e61543e6def973123b50d691108 /mm/userfaultfd.c | |
| parent | b4fdabffae14cca2c80d99bd81f3f27239ac7f5e (diff) | |
| download | linux-4a594acc12d5954cdc71d4450a386748bf3d136a.tar.gz linux-4a594acc12d5954cdc71d4450a386748bf3d136a.tar.bz2 linux-4a594acc12d5954cdc71d4450a386748bf3d136a.zip | |
userfaultfd: don't BUG_ON() if khugepaged yanks our page table
commit 4828d207dc5161dc7ddf9a4f6dcfd80c7dd7d20a upstream.
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: 1d65b771bc08 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/userfaultfd.c')
| -rw-r--r-- | mm/userfaultfd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index e76faba10279..b5b5cb1f922c 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -717,9 +717,10 @@ retry: err = -EFAULT; break; } - - BUG_ON(pmd_none(*dst_pmd)); - BUG_ON(pmd_trans_huge(*dst_pmd)); + /* + * For shmem mappings, khugepaged is allowed to remove page + * tables under us; pte_offset_map_lock() will deal with that. + */ err = mfill_atomic_pte(dst_pmd, dst_vma, dst_addr, src_addr, flags, &folio); |