mm/userfaultfd: Use hugetlb uffd_ops for poison

Move the hugetlb branch in mfill_atomic() lower so that the function
pointer for the poison operation can be used by all memory types.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 42cb8e5c32ca6ecf73b738bc8ef9ecc6bb12264a..4339a31bac3b74c5e5fc09985bfd99c1dfb9782d 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -7073,9 +7073,6 @@ int hugetlb_mfill_atomic_pte(struct vm_area_struct *dst_vma,
        bool folio_in_pagecache = false;
        u32 hash;
 
-       if (uffd_flags_mode_is(flags, MFILL_ATOMIC_POISON))
-               return hugetlb_mfill_pte_poison(dst_vma, dst_addr, increment);
-
        ret = hugetlb_mfill_prepare(dst_vma, dst_addr, increment,
                                    &dst_pte, &hash, flags);
        if (ret)

diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c
index fd89aebd86b0f4799de4e13219b6c794521d76d0..0891c5dee2d44b0311342af5ce9d330308445e67 100644 (file)
--- a/mm/userfaultfd.c
+++ b/mm/userfaultfd.c
@@ -685,14 +685,14 @@ retry:
                 * For shmem mappings, khugepaged is allowed to remove page
                 * tables under us; pte_offset_map_lock() will deal with that.
                 */
-               if (is_vm_hugetlb_page(dst_vma)) {
+               if (uffd_flags_mode_is(flags, MFILL_ATOMIC_POISON)) {
+                       err = uffd_ops->poison(dst_vma, dst_addr, increment);
+               } else if (is_vm_hugetlb_page(dst_vma)) {
                        err = hugetlb_mfill_atomic_pte(dst_vma, dst_addr,
                                        src_addr, flags, &folio, increment);
                } else if (uffd_flags_mode_is(flags, MFILL_ATOMIC_CONTINUE)) {
                        err = mfill_atomic_pte_continue(dst_vma, dst_addr,
                                                        flags);
-               } else if (uffd_flags_mode_is(flags, MFILL_ATOMIC_POISON)) {
-                       err = mfill_atomic_pte_poison(dst_vma, dst_addr, flags);
                } else if (!(dst_vma->vm_flags & VM_SHARED)) {
                        /*
                         * The normal page fault path for a shmem will invoke