GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-22 23:04:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mm: make alloc_contig_range handle in-use hugetlb pages

Browse source 
alloc_contig_range() will fail if it finds a HugeTLB page within the
range, without a chance to handle them.  Since HugeTLB pages can be
migrated as any LRU or Movable page, it does not make sense to bail out
without trying.  Enable the interface to recognize in-use HugeTLB pages so
we can migrate them, and have much better chances to succeed the call.

Link: https://lkml.kernel.org/r/20210419075413.1064-7-osalvador@suse.de
Signed-off-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Oscar Salvador 2021-05-04 18:35:29 -07:00 • committed by Linus Torvalds
parent 369fa227c2
commit ae37c7ff79
4 changed files with 34 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
mm/hugetlb.c
View file

@ -2271,9 +2271,11 @@ static void restore_reserve_on_error(struct hstate *h,
* alloc_and_dissolve_huge_page - Allocate a new page and dissolve the old one
* @h: struct hstate old page belongs to
* @old_page: Old page to dissolve
* @list: List to isolate the page in case we need to
* Returns 0 on success, otherwise negated error.
*/
static int alloc_and_dissolve_huge_page(struct hstate *h, struct page *old_page)
static int alloc_and_dissolve_huge_page(struct hstate *h, struct page *old_page,
struct list_head *list)
{
gfp_t gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE;
int nid = page_to_nid(old_page);
@ -2300,9 +2302,13 @@ retry:
goto free_new;
} else if (page_count(old_page)) {
/*
* Someone has grabbed the page, fail for now.
* Someone has grabbed the page, try to isolate it here.
* Fail with -EBUSY if not possible.
*/
ret = -EBUSY;
spin_unlock_irq(&hugetlb_lock);
if (!isolate_huge_page(old_page, list))
ret = -EBUSY;
spin_lock_irq(&hugetlb_lock);
goto free_new;
} else if (!HPageFreed(old_page)) {
/*
@ -2352,10 +2358,11 @@ free_new:
return ret;
}
int isolate_or_dissolve_huge_page(struct page *page)
int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list)
{
struct hstate *h;
struct page *head;
int ret = -EBUSY;
/*
* The page might have been dissolved from under our feet, so make sure
@ -2380,7 +2387,12 @@ int isolate_or_dissolve_huge_page(struct page *page)
if (hstate_is_gigantic(h))
return -ENOMEM;
return alloc_and_dissolve_huge_page(h, head);
if (page_count(head) && isolate_huge_page(head, list))
ret = 0;
else if (!page_count(head))
ret = alloc_and_dissolve_huge_page(h, head, list);
return ret;
}
struct page *alloc_huge_page(struct vm_area_struct *vma,