mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 06:31:49 +00:00
hugetlb: freeze allocated pages before creating hugetlb pages
When creating hugetlb pages, the hugetlb code must first allocate contiguous pages from a low level allocator such as buddy, cma or memblock. The pages returned from these low level allocators are ref counted. This creates potential issues with other code taking speculative references on these pages before they can be transformed to a hugetlb page. This issue has been addressed with methods and code such as that provided in [1]. Recent discussions about vmemmap freeing [2] have indicated that it would be beneficial to freeze all sub pages, including the head page of pages returned from low level allocators before converting to a hugetlb page. This helps avoid races if we want to replace the page containing vmemmap for the head page. There have been proposals to change at least the buddy allocator to return frozen pages as described at [3]. If such a change is made, it can be employed by the hugetlb code. However, as mentioned above hugetlb uses several low level allocators so each would need to be modified to return frozen pages. For now, we can manually freeze the returned pages. This is done in two places: 1) alloc_buddy_huge_page, only the returned head page is ref counted. We freeze the head page, retrying once in the VERY rare case where there may be an inflated ref count. 2) prep_compound_gigantic_page, for gigantic pages the current code freezes all pages except the head page. New code will simply freeze the head page as well. In a few other places, code checks for inflated ref counts on newly allocated hugetlb pages. With the modifications to freeze after allocating, this code can be removed. After hugetlb pages are freshly allocated, they are often added to the hugetlb free lists. Since these pages were previously ref counted, this was done via put_page() which would end up calling the hugetlb destructor: free_huge_page. With changes to freeze pages, we simply call free_huge_page directly to add the pages to the free list. In a few other places, freshly allocated hugetlb pages were immediately put into use, and the expectation was they were already ref counted. In these cases, we must manually ref count the page. [1] https://lore.kernel.org/linux-mm/20210622021423.154662-3-mike.kravetz@oracle.com/ [2] https://lore.kernel.org/linux-mm/20220802180309.19340-1-joao.m.martins@oracle.com/ [3] https://lore.kernel.org/linux-mm/20220809171854.3725722-1-willy@infradead.org/ [mike.kravetz@oracle.com: fix NULL pointer dereference] Link: https://lkml.kernel.org/r/20220921202702.106069-1-mike.kravetz@oracle.com Link: https://lkml.kernel.org/r/20220916214638.155744-1-mike.kravetz@oracle.com Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com> Reviewed-by: Oscar Salvador <osalvador@suse.de> Reviewed-by: Muchun Song <songmuchun@bytedance.com> Reviewed-by: Miaohe Lin <linmiaohe@huawei.com> Cc: Joao Martins <joao.m.martins@oracle.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Peter Xu <peterx@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
c9b3637f8a
commit
2b21624fc2
102
mm/hugetlb.c
102
mm/hugetlb.c
@ -1787,9 +1787,8 @@ static bool __prep_compound_gigantic_page(struct page *page, unsigned int order,
|
|||||||
|
|
||||||
/* we rely on prep_new_huge_page to set the destructor */
|
/* we rely on prep_new_huge_page to set the destructor */
|
||||||
set_compound_order(page, order);
|
set_compound_order(page, order);
|
||||||
__ClearPageReserved(page);
|
|
||||||
__SetPageHead(page);
|
__SetPageHead(page);
|
||||||
for (i = 1; i < nr_pages; i++) {
|
for (i = 0; i < nr_pages; i++) {
|
||||||
p = nth_page(page, i);
|
p = nth_page(page, i);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1830,17 +1829,19 @@ static bool __prep_compound_gigantic_page(struct page *page, unsigned int order,
|
|||||||
} else {
|
} else {
|
||||||
VM_BUG_ON_PAGE(page_count(p), p);
|
VM_BUG_ON_PAGE(page_count(p), p);
|
||||||
}
|
}
|
||||||
set_compound_head(p, page);
|
if (i != 0)
|
||||||
|
set_compound_head(p, page);
|
||||||
}
|
}
|
||||||
atomic_set(compound_mapcount_ptr(page), -1);
|
atomic_set(compound_mapcount_ptr(page), -1);
|
||||||
atomic_set(compound_pincount_ptr(page), 0);
|
atomic_set(compound_pincount_ptr(page), 0);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
out_error:
|
out_error:
|
||||||
/* undo tail page modifications made above */
|
/* undo page modifications made above */
|
||||||
for (j = 1; j < i; j++) {
|
for (j = 0; j < i; j++) {
|
||||||
p = nth_page(page, j);
|
p = nth_page(page, j);
|
||||||
clear_compound_head(p);
|
if (j != 0)
|
||||||
|
clear_compound_head(p);
|
||||||
set_page_refcounted(p);
|
set_page_refcounted(p);
|
||||||
}
|
}
|
||||||
/* need to clear PG_reserved on remaining tail pages */
|
/* need to clear PG_reserved on remaining tail pages */
|
||||||
@ -1936,6 +1937,7 @@ static struct page *alloc_buddy_huge_page(struct hstate *h,
|
|||||||
int order = huge_page_order(h);
|
int order = huge_page_order(h);
|
||||||
struct page *page;
|
struct page *page;
|
||||||
bool alloc_try_hard = true;
|
bool alloc_try_hard = true;
|
||||||
|
bool retry = true;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* By default we always try hard to allocate the page with
|
* By default we always try hard to allocate the page with
|
||||||
@ -1951,7 +1953,21 @@ static struct page *alloc_buddy_huge_page(struct hstate *h,
|
|||||||
gfp_mask |= __GFP_RETRY_MAYFAIL;
|
gfp_mask |= __GFP_RETRY_MAYFAIL;
|
||||||
if (nid == NUMA_NO_NODE)
|
if (nid == NUMA_NO_NODE)
|
||||||
nid = numa_mem_id();
|
nid = numa_mem_id();
|
||||||
|
retry:
|
||||||
page = __alloc_pages(gfp_mask, order, nid, nmask);
|
page = __alloc_pages(gfp_mask, order, nid, nmask);
|
||||||
|
|
||||||
|
/* Freeze head page */
|
||||||
|
if (page && !page_ref_freeze(page, 1)) {
|
||||||
|
__free_pages(page, order);
|
||||||
|
if (retry) { /* retry once */
|
||||||
|
retry = false;
|
||||||
|
goto retry;
|
||||||
|
}
|
||||||
|
/* WOW! twice in a row. */
|
||||||
|
pr_warn("HugeTLB head page unexpected inflated ref count\n");
|
||||||
|
page = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
if (page)
|
if (page)
|
||||||
__count_vm_event(HTLB_BUDDY_PGALLOC);
|
__count_vm_event(HTLB_BUDDY_PGALLOC);
|
||||||
else
|
else
|
||||||
@ -1979,6 +1995,9 @@ static struct page *alloc_buddy_huge_page(struct hstate *h,
|
|||||||
/*
|
/*
|
||||||
* Common helper to allocate a fresh hugetlb page. All specific allocators
|
* Common helper to allocate a fresh hugetlb page. All specific allocators
|
||||||
* should use this function to get new hugetlb pages
|
* should use this function to get new hugetlb pages
|
||||||
|
*
|
||||||
|
* Note that returned page is 'frozen': ref count of head page and all tail
|
||||||
|
* pages is zero.
|
||||||
*/
|
*/
|
||||||
static struct page *alloc_fresh_huge_page(struct hstate *h,
|
static struct page *alloc_fresh_huge_page(struct hstate *h,
|
||||||
gfp_t gfp_mask, int nid, nodemask_t *nmask,
|
gfp_t gfp_mask, int nid, nodemask_t *nmask,
|
||||||
@ -2036,7 +2055,7 @@ static int alloc_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowed,
|
|||||||
if (!page)
|
if (!page)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
put_page(page); /* free it into the hugepage allocator */
|
free_huge_page(page); /* free it into the hugepage allocator */
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -2193,10 +2212,9 @@ int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn)
|
|||||||
* Allocates a fresh surplus page from the page allocator.
|
* Allocates a fresh surplus page from the page allocator.
|
||||||
*/
|
*/
|
||||||
static struct page *alloc_surplus_huge_page(struct hstate *h, gfp_t gfp_mask,
|
static struct page *alloc_surplus_huge_page(struct hstate *h, gfp_t gfp_mask,
|
||||||
int nid, nodemask_t *nmask, bool zero_ref)
|
int nid, nodemask_t *nmask)
|
||||||
{
|
{
|
||||||
struct page *page = NULL;
|
struct page *page = NULL;
|
||||||
bool retry = false;
|
|
||||||
|
|
||||||
if (hstate_is_gigantic(h))
|
if (hstate_is_gigantic(h))
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -2206,7 +2224,6 @@ static struct page *alloc_surplus_huge_page(struct hstate *h, gfp_t gfp_mask,
|
|||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
spin_unlock_irq(&hugetlb_lock);
|
spin_unlock_irq(&hugetlb_lock);
|
||||||
|
|
||||||
retry:
|
|
||||||
page = alloc_fresh_huge_page(h, gfp_mask, nid, nmask, NULL);
|
page = alloc_fresh_huge_page(h, gfp_mask, nid, nmask, NULL);
|
||||||
if (!page)
|
if (!page)
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -2222,34 +2239,10 @@ retry:
|
|||||||
if (h->surplus_huge_pages >= h->nr_overcommit_huge_pages) {
|
if (h->surplus_huge_pages >= h->nr_overcommit_huge_pages) {
|
||||||
SetHPageTemporary(page);
|
SetHPageTemporary(page);
|
||||||
spin_unlock_irq(&hugetlb_lock);
|
spin_unlock_irq(&hugetlb_lock);
|
||||||
put_page(page);
|
free_huge_page(page);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (zero_ref) {
|
|
||||||
/*
|
|
||||||
* Caller requires a page with zero ref count.
|
|
||||||
* We will drop ref count here. If someone else is holding
|
|
||||||
* a ref, the page will be freed when they drop it. Abuse
|
|
||||||
* temporary page flag to accomplish this.
|
|
||||||
*/
|
|
||||||
SetHPageTemporary(page);
|
|
||||||
if (!put_page_testzero(page)) {
|
|
||||||
/*
|
|
||||||
* Unexpected inflated ref count on freshly allocated
|
|
||||||
* huge. Retry once.
|
|
||||||
*/
|
|
||||||
pr_info("HugeTLB unexpected inflated ref count on freshly allocated page\n");
|
|
||||||
spin_unlock_irq(&hugetlb_lock);
|
|
||||||
if (retry)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
retry = true;
|
|
||||||
goto retry;
|
|
||||||
}
|
|
||||||
ClearHPageTemporary(page);
|
|
||||||
}
|
|
||||||
|
|
||||||
h->surplus_huge_pages++;
|
h->surplus_huge_pages++;
|
||||||
h->surplus_huge_pages_node[page_to_nid(page)]++;
|
h->surplus_huge_pages_node[page_to_nid(page)]++;
|
||||||
|
|
||||||
@ -2271,6 +2264,9 @@ static struct page *alloc_migrate_huge_page(struct hstate *h, gfp_t gfp_mask,
|
|||||||
if (!page)
|
if (!page)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
/* fresh huge pages are frozen */
|
||||||
|
set_page_refcounted(page);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We do not account these pages as surplus because they are only
|
* We do not account these pages as surplus because they are only
|
||||||
* temporary and will be released properly on the last reference
|
* temporary and will be released properly on the last reference
|
||||||
@ -2298,14 +2294,14 @@ struct page *alloc_buddy_huge_page_with_mpol(struct hstate *h,
|
|||||||
gfp_t gfp = gfp_mask | __GFP_NOWARN;
|
gfp_t gfp = gfp_mask | __GFP_NOWARN;
|
||||||
|
|
||||||
gfp &= ~(__GFP_DIRECT_RECLAIM | __GFP_NOFAIL);
|
gfp &= ~(__GFP_DIRECT_RECLAIM | __GFP_NOFAIL);
|
||||||
page = alloc_surplus_huge_page(h, gfp, nid, nodemask, false);
|
page = alloc_surplus_huge_page(h, gfp, nid, nodemask);
|
||||||
|
|
||||||
/* Fallback to all nodes if page==NULL */
|
/* Fallback to all nodes if page==NULL */
|
||||||
nodemask = NULL;
|
nodemask = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!page)
|
if (!page)
|
||||||
page = alloc_surplus_huge_page(h, gfp_mask, nid, nodemask, false);
|
page = alloc_surplus_huge_page(h, gfp_mask, nid, nodemask);
|
||||||
mpol_cond_put(mpol);
|
mpol_cond_put(mpol);
|
||||||
return page;
|
return page;
|
||||||
}
|
}
|
||||||
@ -2375,7 +2371,7 @@ retry:
|
|||||||
spin_unlock_irq(&hugetlb_lock);
|
spin_unlock_irq(&hugetlb_lock);
|
||||||
for (i = 0; i < needed; i++) {
|
for (i = 0; i < needed; i++) {
|
||||||
page = alloc_surplus_huge_page(h, htlb_alloc_mask(h),
|
page = alloc_surplus_huge_page(h, htlb_alloc_mask(h),
|
||||||
NUMA_NO_NODE, NULL, true);
|
NUMA_NO_NODE, NULL);
|
||||||
if (!page) {
|
if (!page) {
|
||||||
alloc_ok = false;
|
alloc_ok = false;
|
||||||
break;
|
break;
|
||||||
@ -2737,7 +2733,6 @@ static int alloc_and_dissolve_huge_page(struct hstate *h, struct page *old_page,
|
|||||||
{
|
{
|
||||||
gfp_t gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE;
|
gfp_t gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE;
|
||||||
int nid = page_to_nid(old_page);
|
int nid = page_to_nid(old_page);
|
||||||
bool alloc_retry = false;
|
|
||||||
struct page *new_page;
|
struct page *new_page;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
@ -2748,30 +2743,9 @@ static int alloc_and_dissolve_huge_page(struct hstate *h, struct page *old_page,
|
|||||||
* the pool. This simplifies and let us do most of the processing
|
* the pool. This simplifies and let us do most of the processing
|
||||||
* under the lock.
|
* under the lock.
|
||||||
*/
|
*/
|
||||||
alloc_retry:
|
|
||||||
new_page = alloc_buddy_huge_page(h, gfp_mask, nid, NULL, NULL);
|
new_page = alloc_buddy_huge_page(h, gfp_mask, nid, NULL, NULL);
|
||||||
if (!new_page)
|
if (!new_page)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
/*
|
|
||||||
* If all goes well, this page will be directly added to the free
|
|
||||||
* list in the pool. For this the ref count needs to be zero.
|
|
||||||
* Attempt to drop now, and retry once if needed. It is VERY
|
|
||||||
* unlikely there is another ref on the page.
|
|
||||||
*
|
|
||||||
* If someone else has a reference to the page, it will be freed
|
|
||||||
* when they drop their ref. Abuse temporary page flag to accomplish
|
|
||||||
* this. Retry once if there is an inflated ref count.
|
|
||||||
*/
|
|
||||||
SetHPageTemporary(new_page);
|
|
||||||
if (!put_page_testzero(new_page)) {
|
|
||||||
if (alloc_retry)
|
|
||||||
return -EBUSY;
|
|
||||||
|
|
||||||
alloc_retry = true;
|
|
||||||
goto alloc_retry;
|
|
||||||
}
|
|
||||||
ClearHPageTemporary(new_page);
|
|
||||||
|
|
||||||
__prep_new_huge_page(h, new_page);
|
__prep_new_huge_page(h, new_page);
|
||||||
|
|
||||||
retry:
|
retry:
|
||||||
@ -2951,6 +2925,7 @@ struct page *alloc_huge_page(struct vm_area_struct *vma,
|
|||||||
}
|
}
|
||||||
spin_lock_irq(&hugetlb_lock);
|
spin_lock_irq(&hugetlb_lock);
|
||||||
list_add(&page->lru, &h->hugepage_activelist);
|
list_add(&page->lru, &h->hugepage_activelist);
|
||||||
|
set_page_refcounted(page);
|
||||||
/* Fall through */
|
/* Fall through */
|
||||||
}
|
}
|
||||||
hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), h_cg, page);
|
hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), h_cg, page);
|
||||||
@ -3055,7 +3030,7 @@ static void __init gather_bootmem_prealloc(void)
|
|||||||
if (prep_compound_gigantic_page(page, huge_page_order(h))) {
|
if (prep_compound_gigantic_page(page, huge_page_order(h))) {
|
||||||
WARN_ON(PageReserved(page));
|
WARN_ON(PageReserved(page));
|
||||||
prep_new_huge_page(h, page, page_to_nid(page));
|
prep_new_huge_page(h, page, page_to_nid(page));
|
||||||
put_page(page); /* add to the hugepage allocator */
|
free_huge_page(page); /* add to the hugepage allocator */
|
||||||
} else {
|
} else {
|
||||||
/* VERY unlikely inflated ref count on a tail page */
|
/* VERY unlikely inflated ref count on a tail page */
|
||||||
free_gigantic_page(page, huge_page_order(h));
|
free_gigantic_page(page, huge_page_order(h));
|
||||||
@ -3087,7 +3062,7 @@ static void __init hugetlb_hstate_alloc_pages_onenode(struct hstate *h, int nid)
|
|||||||
&node_states[N_MEMORY], NULL);
|
&node_states[N_MEMORY], NULL);
|
||||||
if (!page)
|
if (!page)
|
||||||
break;
|
break;
|
||||||
put_page(page); /* free it into the hugepage allocator */
|
free_huge_page(page); /* free it into the hugepage allocator */
|
||||||
}
|
}
|
||||||
cond_resched();
|
cond_resched();
|
||||||
}
|
}
|
||||||
@ -3478,9 +3453,8 @@ static int demote_free_huge_page(struct hstate *h, struct page *page)
|
|||||||
else
|
else
|
||||||
prep_compound_page(subpage, target_hstate->order);
|
prep_compound_page(subpage, target_hstate->order);
|
||||||
set_page_private(subpage, 0);
|
set_page_private(subpage, 0);
|
||||||
set_page_refcounted(subpage);
|
|
||||||
prep_new_huge_page(target_hstate, subpage, nid);
|
prep_new_huge_page(target_hstate, subpage, nid);
|
||||||
put_page(subpage);
|
free_huge_page(subpage);
|
||||||
}
|
}
|
||||||
mutex_unlock(&target_hstate->resize_lock);
|
mutex_unlock(&target_hstate->resize_lock);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user