mm-hugetlb-make-userfaultfd_huge_must_wait-safe-to-pmd-unshare.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: make userfaultfd_huge_must_wait() safe to pmd unshare
has been removed from the -mm tree. Its filename was
mm-hugetlb-make-userfaultfd_huge_must_wait-safe-to-pmd-unshare.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: mm/hugetlb: make userfaultfd_huge_must_wait() safe to pmd unshare
Date: Fri, 16 Dec 2022 10:52:17 -0500
We can take the hugetlb walker lock, here taking vma lock directly.
Signed-off-by Peter Xu <[email protected]>
Reviewed-by David Hildenbrand <[email protected]>
Reviewed-by Mike Kravetz <[email protected]>
Reviewed-by John Hubbard <[email protected]>
Cc Andrea Arcangeli <[email protected]>
Cc James Houghton <[email protected]>
Cc Jann Horn <[email protected]>
Cc Miaohe Lin <[email protected]>
Cc Muchun Song <[email protected]>
Cc Nadav Amit <[email protected]>
Cc Rik van Riel <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/userfaultfd.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
fs/userfaultfd.c renamed from fs/userfaultfd.c~mm-hugetlb-make-userfaultfd_huge_must_wait-safe-to-pmd-unshare +16 -4
@@ -391,7 +391,8 @@ static inline unsigned int userfaultfd_g*/ vm_fault_t handle_userfault (struct vm_fault *vmf,unsigned long reason) { -struct mm_struct *mm = vmf->vma->vm_mm; +struct vm_area_struct *vma = vmf->vma; +struct mm_struct *mm = vma->vm_mm;struct userfaultfd_ctx *ctx;struct userfaultfd_wait_queue uwq;vm_fault_t ret =VM_FAULT_SIGBUS ;
@@ -418,7 +419,7 @@ vm_fault_t handle_userfault(struct vm_fa*/ mmap_assert_locked (mm); - ctx = vmf->vma->vm_userfaultfd_ctx.ctx; + ctx = vma->vm_userfaultfd_ctx.ctx;if (!ctx) goto out;
@@ -508,6 +509,15 @@ vm_fault_t handle_userfault(struct vm_fa blocking_state =userfaultfd_get_blocking_state (vmf->flags); +/* +* Take the vma lock now, in order to safely call +* userfaultfd_huge_must_wait() later. Since acquiring the +* (sleepable) vma lock can modify the current task state, that +* must be before explicitly calling set_current_state(). +*/ +if (is_vm_hugetlb_page (vma)) +hugetlb_vma_lock_read (vma); +spin_lock_irq (&ctx->fault_pending_wqh.lock);/* * After the __add_wait_queue the uwq is visible to userland
@@ -522,13 +532,15 @@ vm_fault_t handle_userfault(struct vm_faset_current_state (blocking_state);spin_unlock_irq (&ctx->fault_pending_wqh.lock); -if (!is_vm_hugetlb_page (vmf->vma)) +if (!is_vm_hugetlb_page (vma)) must_wait =userfaultfd_must_wait (ctx, vmf->address, vmf->flags, reason);else - must_wait =userfaultfd_huge_must_wait (ctx, vmf->vma, + must_wait =userfaultfd_huge_must_wait (ctx, vma, vmf->address, vmf->flags, reason); +if (is_vm_hugetlb_page (vma)) +hugetlb_vma_unlock_read (vma);mmap_read_unlock (mm);if (likely (must_wait && !READ_ONCE (ctx->released))) {
_
Patches currently in -mm which might be from [email protected] are
selftests-vm-remove-__use_gnu-in-hugetlb-madvisec.patch