Commit bb373dce authored by Peter Xu's avatar Peter Xu Committed by Andrew Morton

mm/hugetlb: don't wait for migration entry during follow page

That's what the code does with !hugetlb pages, so we should logically do
the same for hugetlb, so migration entry will also be treated as no page.

This is probably also the last piece in follow_page code that may sleep,
the last one should be removed in cf994dd8af27 ("mm/gup: remove
FOLL_MIGRATION", 2022-11-16).

Link: https://lkml.kernel.org/r/20221216155100.2043537-3-peterx@redhat.comSigned-off-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: James Houghton <jthoughton@google.com>
Cc: Jann Horn <jannh@google.com>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Nadav Amit <nadav.amit@gmail.com>
Cc: Rik van Riel <riel@surriel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 243b1f2d
...@@ -6401,7 +6401,6 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, ...@@ -6401,7 +6401,6 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma,
if (WARN_ON_ONCE(flags & FOLL_PIN)) if (WARN_ON_ONCE(flags & FOLL_PIN))
return NULL; return NULL;
retry:
pte = huge_pte_offset(mm, haddr, huge_page_size(h)); pte = huge_pte_offset(mm, haddr, huge_page_size(h));
if (!pte) if (!pte)
return NULL; return NULL;
...@@ -6424,16 +6423,6 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, ...@@ -6424,16 +6423,6 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma,
page = NULL; page = NULL;
goto out; goto out;
} }
} else {
if (is_hugetlb_entry_migration(entry)) {
spin_unlock(ptl);
__migration_entry_wait_huge(pte, ptl);
goto retry;
}
/*
* hwpoisoned entry is treated as no_page_table in
* follow_page_mask().
*/
} }
out: out:
spin_unlock(ptl); spin_unlock(ptl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment