From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52B332D0614 for ; Mon, 6 Apr 2026 17:50:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775497841; cv=none; b=lxzZeVxeKzbh8U6PTUoEtvRLW6JnBmlvf2UGD68K2wI/bjyJYP0WolaOGNOOMq+lPTAl5+f0j+KNP7ZQGXbgNANteA7aDZa+9cdhfAkFR+dzIUMlUjNww4qSHqfXOkhce+80C3HRAPwUlUUYE+RT1qtf23yfUGH2mVWfJ6YJ1gs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775497841; c=relaxed/simple; bh=4SXNyti8wVIlkID/aCOlgY6IWHkHdlJ8o06ixcQ7XjA=; h=Date:To:From:Subject:Message-Id; b=DVjxY7Ai8ti2nm6E0IZsH6ijh79/iGPQS2W6tvnDZsVPwDyWvnClkxx2pUT1KA85/snBuvLq84wU52LKLetyPm7h6IUogY/Eztw1m8STpykq5aecWIaWU1qXnimZ4gSsJvrkqB3DlE/gP9y66+99OcMf7dO3hsiTZLhhtS7OK6w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=IV6nCdfi; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="IV6nCdfi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DDEF3C4CEF7; Mon, 6 Apr 2026 17:50:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1775497841; bh=4SXNyti8wVIlkID/aCOlgY6IWHkHdlJ8o06ixcQ7XjA=; h=Date:To:From:Subject:From; b=IV6nCdfin0od+3+/Uvc8tb8HPfoQ71jM+zxCTm0dkts3TwqRI3bKr3WT1XVptht4J XKvkRysGRCJaUJ2+fitSwxfFuxJxkb/JMOn65DSAcFZ+tmBexcOnNL6rWkPbVIu30s eqDHPof3WHfJVo4d/2O/7ZFxpPfSK8nHQJluYADw= Date: Mon, 06 Apr 2026 10:50:40 -0700 To: mm-commits@vger.kernel.org,willy@infradead.org,vbabka@suse.cz,surenb@google.com,shuah@kernel.org,seanjc@google.com,rppt@kernel.org,pbonzini@redhat.com,osalvador@suse.de,muchun.song@linux.dev,mhocko@suse.com,ljs@kernel.org,liam.howlett@oracle.com,kalyazin@amazon.com,jthoughton@google.com,hughd@google.com,harry.yoo@oracle.com,harry@kernel.org,david@kernel.org,baolin.wang@linux.alibaba.com,axelrasmussen@google.com,avagin@google.com,aarcange@redhat.com,peterx@redhat.com,akpm@linux-foundation.org From: Andrew Morton Subject: [to-be-updated] mm-generalize-handling-of-userfaults-in-__do_fault.patch removed from -mm tree Message-Id: <20260406175040.DDEF3C4CEF7@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm: generalize handling of userfaults in __do_fault() has been removed from the -mm tree. Its filename was mm-generalize-handling-of-userfaults-in-__do_fault.patch This patch was dropped because an updated version will be issued ------------------------------------------------------ From: Peter Xu Subject: mm: generalize handling of userfaults in __do_fault() Date: Thu, 2 Apr 2026 07:11:53 +0300 When a VMA is registered with userfaulfd, its ->fault() method should check if a folio exists in the page cache and call handle_userfault() with appropriate mode: - VM_UFFD_MINOR if VMA is registered in minor mode and the folio exists - VM_UFFD_MISSING if VMA is registered in missing mode and the folio does not exist Instead of calling handle_userfault() directly from a specific ->fault() handler, call __do_userfault() helper from the generic __do_fault(). For VMAs registered with userfaultfd the new __do_userfault() helper will check if the folio is found in the page cache using vm_uffd_ops->get_folio_noalloc() and call handle_userfault() with the appropriate mode. Make vm_uffd_ops->get_folio_noalloc() required method for non-anonymous VMAs mapped at PTE level. Link: https://lkml.kernel.org/r/20260402041156.1377214-13-rppt@kernel.org Signed-off-by: Peter Xu Co-developed-by: Mike Rapoport (Microsoft) Signed-off-by: Mike Rapoport (Microsoft) Cc: Andrea Arcangeli Cc: Andrei Vagin Cc: Axel Rasmussen Cc: Baolin Wang Cc: David Hildenbrand (Arm) Cc: Harry Yoo Cc: Harry Yoo (Oracle) Cc: Hugh Dickins Cc: James Houghton Cc: Liam Howlett Cc: Lorenzo Stoakes (Oracle) Cc: Matthew Wilcox (Oracle) Cc: Michal Hocko Cc: Muchun Song Cc: Nikita Kalyazin Cc: Oscar Salvador Cc: Paolo Bonzini Cc: Sean Christopherson Cc: Shuah Khan Cc: Suren Baghdasaryan Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- mm/memory.c | 43 +++++++++++++++++++++++++++++++++++++++++++ mm/shmem.c | 12 ------------ mm/userfaultfd.c | 9 +++++++++ 3 files changed, 52 insertions(+), 12 deletions(-) --- a/mm/memory.c~mm-generalize-handling-of-userfaults-in-__do_fault +++ a/mm/memory.c @@ -5423,6 +5423,41 @@ oom: return VM_FAULT_OOM; } +#ifdef CONFIG_USERFAULTFD +static vm_fault_t __do_userfault(struct vm_fault *vmf) +{ + struct vm_area_struct *vma = vmf->vma; + struct inode *inode; + struct folio *folio; + + if (!(userfaultfd_missing(vma) || userfaultfd_minor(vma))) + return 0; + + inode = file_inode(vma->vm_file); + folio = vma->vm_ops->uffd_ops->get_folio_noalloc(inode, vmf->pgoff); + if (!IS_ERR_OR_NULL(folio)) { + /* + * TODO: provide a flag for get_folio_noalloc() to avoid + * locking (or even the extra reference?) + */ + folio_unlock(folio); + folio_put(folio); + if (userfaultfd_minor(vma)) + return handle_userfault(vmf, VM_UFFD_MINOR); + } else { + if (userfaultfd_missing(vma)) + return handle_userfault(vmf, VM_UFFD_MISSING); + } + + return 0; +} +#else +static inline vm_fault_t __do_userfault(struct vm_fault *vmf) +{ + return 0; +} +#endif + /* * The mmap_lock must have been held on entry, and may have been * released depending on flags and vma->vm_ops->fault() return value. @@ -5455,6 +5490,14 @@ static vm_fault_t __do_fault(struct vm_f return VM_FAULT_OOM; } + /* + * If this is a userfault trap, process it in advance before + * triggering the genuine fault handler. + */ + ret = __do_userfault(vmf); + if (ret) + return ret; + ret = vma->vm_ops->fault(vmf); if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY | VM_FAULT_DONE_COW))) --- a/mm/shmem.c~mm-generalize-handling-of-userfaults-in-__do_fault +++ a/mm/shmem.c @@ -2483,13 +2483,6 @@ repeat: fault_mm = vma ? vma->vm_mm : NULL; folio = filemap_get_entry(inode->i_mapping, index); - if (folio && vma && userfaultfd_minor(vma)) { - if (!xa_is_value(folio)) - folio_put(folio); - *fault_type = handle_userfault(vmf, VM_UFFD_MINOR); - return 0; - } - if (xa_is_value(folio)) { error = shmem_swapin_folio(inode, index, &folio, sgp, gfp, vma, fault_type); @@ -2534,11 +2527,6 @@ repeat: * Fast cache lookup and swap lookup did not find it: allocate. */ - if (vma && userfaultfd_missing(vma)) { - *fault_type = handle_userfault(vmf, VM_UFFD_MISSING); - return 0; - } - /* Find hugepage orders that are allowed for anonymous shmem and tmpfs. */ orders = shmem_allowable_huge_orders(inode, vma, index, write_end, false); if (orders > 0) { --- a/mm/userfaultfd.c~mm-generalize-handling-of-userfaults-in-__do_fault +++ a/mm/userfaultfd.c @@ -2043,6 +2043,15 @@ bool vma_can_userfault(struct vm_area_st !vma_is_anonymous(vma)) return false; + /* + * File backed VMAs (except HugeTLB) must implement + * ops->get_folio_noalloc() because it's required by __do_userfault() + * in page fault handling. + */ + if (!vma_is_anonymous(vma) && !is_vm_hugetlb_page(vma) && + !ops->get_folio_noalloc) + return false; + return ops->can_userfault(vma, vm_flags); } _ Patches currently in -mm which might be from peterx@redhat.com are