Remove some code duplication by calling set_page_refcounted() at the
end of __alloc_pages() instead of after each call that can allocate
a page. That means that we free a frozen page if we've exceeded the
allowed memcg memory.
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
---
mm/page_alloc.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 26f8ed480ebb..f1b7fc657c74 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5513,10 +5513,8 @@ struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid,
/* First allocation attempt */
page = get_page_from_freelist(alloc_gfp, order, alloc_flags, &ac);
- if (likely(page)) {
- set_page_refcounted(page);
+ if (likely(page))
goto out;
- }
alloc_gfp = gfp;
ac.spread_dirty_pages = false;
@@ -5528,15 +5526,15 @@ struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid,
ac.nodemask = nodemask;
page = __alloc_pages_slowpath(alloc_gfp, order, &ac);
- if (page)
- set_page_refcounted(page);
out:
if (memcg_kmem_enabled() && (gfp & __GFP_ACCOUNT) && page &&
unlikely(__memcg_kmem_charge_page(page, gfp, order) != 0)) {
- __free_pages(page, order);
+ free_frozen_pages(page, order);
page = NULL;
}
+ if (page)
+ set_page_refcounted(page);
trace_mm_page_alloc(page, order, alloc_gfp, ac.migratetype);
--
2.35.1
