mm/page_alloc: rework conditional splitting >= pageblock_order pages when freeing
Subsystems (2)
cover mm/page_alloc: rework conditional splitting >= pageblock_order pages when freeing
Looking into recent alloc_contig_range(__GFP_COMP) support, I realized that we now unconditionally split up high-order pages on the page freeing path to free in pageblock granularity, just to immediately let the buddy merge them again in the common case.
Let's optimize for the common case (all pageblock migratetypes match), and enable it only in configs where this is strictly required. Further, add some comments that explain why this special casing is required at all.
Alongside, a fix for a stale comment in page isolation code.
Tested with runtime allocation of gigantic pages and virtio-mem.
David Hildenbrand (2):
mm/page_alloc: conditionally split > pageblock_order pages in
free_one_page() and move_freepages_block_isolate()
mm/page_isolation: fixup isolate_single_pageblock() comment regarding
splitting free pages
mm/page_alloc.c | 71 ++++++++++++++++++++++++++++++++++++--------- mm/page_isolation.c | 9 +++--- 2 files changed, 61 insertions(+), 19 deletions(-)
Signature · 1 line
2.47.1
PATCH 1/2 mm/page_alloc: conditionally split > pageblock_order pages in free_one_page() and move_freepages_block_isolate()
Let's special-case for the common scenarios that:
(a) We are freeing pages <= pageblock_order
(b) We are freeing a page <= MAX_PAGE_ORDER and all pageblocks match (especially, no mixture of isolated and non-isolated pageblocks)
When we encounter a > MAX_PAGE_ORDER page, it can only come from alloc_contig_range(), and we can process MAX_PAGE_ORDER chunks.
When we encounter a >pageblock_order <= MAX_PAGE_ORDER page, check whether all pageblocks match, and if so (common case), don't split them up just for the buddy to merge them back.
This makes sure that when we free MAX_PAGE_ORDER chunks to the buddy, for example during system startups, memory onlining, or when isolating consecutive pageblocks via alloc_contig_range()/memory offlining, that we don't unnecessarily split up what we'll immediately merge again, because the migratetypes match.
Rename split_large_buddy() to __free_one_page_maybe_split(), to make it clearer what's happening, and handle in it only natural buddy orders, not the alloc_contig_range(__GFP_COMP) special case: handle that in free_one_page() only.
--- mm/page_alloc.c | 71 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 14 deletions(-)
mm/page_alloc.c +57 -14
@@ -1225,24 +1225,50 @@ static void free_pcppages_bulk(struct zone *zone, int count,spin_unlock_irqrestore (&zone->lock, flags); } -/* Split a multi-block free page into its individual pageblocks. */ -static void split_large_buddy (struct zone *zone,struct page *page, -unsigned long pfn,int order,fpi_t fpi) +static bool pfnblock_migratetype_equal (unsigned long pfn, +unsigned long end_pfn,int mt) { -unsigned long end = pfn + (1 << order); +VM_WARN_ON_ONCE (!IS_ALIGNED (pfn | end_pfn, pageblock_nr_pages)); +while (pfn != end_pfn) { +struct page *page =pfn_to_page (pfn); + +if (unlikely (mt !=get_pfnblock_migratetype (page, pfn))) +return false; + pfn += pageblock_nr_pages; + } +return true; +} + +static void __free_one_page_maybe_split (struct zone *zone,struct page *page, +unsigned long pfn,int order,fpi_t fpi_flags) +{ +const unsigned long end_pfn = pfn + (1 << order); +int mt =get_pfnblock_migratetype (page, pfn); + +VM_WARN_ON_ONCE (order >MAX_PAGE_ORDER );VM_WARN_ON_ONCE (!IS_ALIGNED (pfn,1 << order));/* Caller removed page from freelist, buddy info cleared! */ VM_WARN_ON_ONCE (PageBuddy (page)); -if (order > pageblock_order) - order = pageblock_order; - -while (pfn != end) { -int mt =get_pfnblock_migratetype (page, pfn); +/* +* With CONFIG_MEMORY_ISOLATION, we might be freeing MAX_ORDER_NR_PAGES +* pages that cover pageblocks with different migratetypes; for example +* only some migratetypes might be MIGRATE_ISOLATE. In that (unlikely) +* case, fallback to freeing individual pageblocks so they get put +* onto the right lists. +*/ +if (!IS_ENABLED (CONFIG_MEMORY_ISOLATION ) || +likely (order <= pageblock_order) || +pfnblock_migratetype_equal (pfn + pageblock_nr_pages, end_pfn, mt)) { +__free_one_page (page, pfn, zone, order, mt, fpi_flags); +return ; + } -__free_one_page (page, pfn, zone, order, mt, fpi); - pfn +=1 << order; +while (pfn != end_pfn) { + mt =get_pfnblock_migratetype (page, pfn); +__free_one_page (page, pfn, zone, pageblock_order, mt, fpi_flags); + pfn += pageblock_nr_pages; page =pfn_to_page (pfn); } }
@@ -1254,7 +1280,24 @@ static void free_one_page(struct zone *zone, struct page *page,unsigned long flags;spin_lock_irqsave (&zone->lock, flags); -split_large_buddy (zone, page, pfn, order, fpi_flags); +if (likely (order <=MAX_PAGE_ORDER )) { +__free_one_page_maybe_split (zone, page, pfn, order, fpi_flags); + }else if (IS_ENABLED (CONFIG_CONTIG_ALLOC )) { +const unsigned long end_pfn = pfn + (1 << order); + +/* +* The only way we can end up with order > MAX_PAGE_ORDER is +* through alloc_contig_range(__GFP_COMP). +*/ +while (pfn != end_pfn) { +__free_one_page_maybe_split (zone, page, pfn, +MAX_PAGE_ORDER , fpi_flags); + pfn +=MAX_ORDER_NR_PAGES ; + page =pfn_to_page (pfn); + } + }else { +WARN_ON_ONCE (1 ); + }spin_unlock_irqrestore (&zone->lock, flags);__count_vm_events (PGFREE ,1 << order);
@@ -1790,7 +1833,7 @@ bool move_freepages_block_isolate(struct zone *zone, struct page *page,del_page_from_free_list (buddy, zone, order,get_pfnblock_migratetype (buddy, pfn));set_pageblock_migratetype (page, migratetype); -split_large_buddy (zone, buddy, pfn, order,FPI_NONE ); +__free_one_page_maybe_split (zone, buddy, pfn, order,FPI_NONE );return true; }
@@ -1801,7 +1844,7 @@ bool move_freepages_block_isolate(struct zone *zone, struct page *page,del_page_from_free_list (page, zone, order,get_pfnblock_migratetype (page, pfn));set_pageblock_migratetype (page, migratetype); -split_large_buddy (zone, page, pfn, order,FPI_NONE ); +__free_one_page_maybe_split (zone, page, pfn, order,FPI_NONE );return true; } move:
Signature · 1 line
2.47.1
Zi Yan
reviewerRe: [PATCH v1 1/2] mm/page_alloc: conditionally split > pageblock_order pages in free_one_page() and move_freepages_block_isolate()
Quoted 24 lines · David Hildenbrand
Let's special-case for the common scenarios that:
(a) We are freeing pages <=
pageblock_order
(b) We are freeing a page <=MAX_PAGE_ORDERand all pageblocks match (especially, no mixture of isolated and non-isolated pageblocks)When we encounter a >
MAX_PAGE_ORDERpage, it can only come fromalloc_contig_range(), and we can processMAX_PAGE_ORDERchunks.When we encounter a >pageblock_order <=
MAX_PAGE_ORDERpage, check whether all pageblocks match, and if so (common case), don't split them up just for the buddy to merge them back.This makes sure that when we free
MAX_PAGE_ORDERchunks to the buddy, for example during system startups, memory onlining, or when isolating consecutive pageblocks via alloc_contig_range()/memory offlining, that we don't unnecessarily split up what we'll immediately merge again, because the migratetypes match.Rename
split_large_buddy()to__free_one_page_maybe_split(), to make it clearer what's happening, and handle in it only natural buddy orders, not thealloc_contig_range(__GFP_COMP)special case: handle that infree_one_page()only.
Quoted 5 lines
Signed-off-by David Hildenbrand <[email protected]>--- mm/page_alloc.c | 71 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 14 deletions(-)
LGTM. Reviewed-by: Zi Yan <[email protected]>
Best Regards,
Yan, Zi
Re: [PATCH v1 1/2] mm/page_alloc: conditionally split > pageblock_order pages in free_one_page() and move_freepages_block_isolate()
In reply to David HildenbrandQuoted 20 lines · David Hildenbrand
Let's special-case for the common scenarios that:
(a) We are freeing pages <=
pageblock_order
(b) We are freeing a page <=MAX_PAGE_ORDERand all pageblocks match (especially, no mixture of isolated and non-isolated pageblocks)When we encounter a >
MAX_PAGE_ORDERpage, it can only come fromalloc_contig_range(), and we can processMAX_PAGE_ORDERchunks.When we encounter a >pageblock_order <=
MAX_PAGE_ORDERpage, check whether all pageblocks match, and if so (common case), don't split them up just for the buddy to merge them back.This makes sure that when we free
MAX_PAGE_ORDERchunks to the buddy, for example during system startups, memory onlining, or when isolating consecutive pageblocks via alloc_contig_range()/memory offlining, that we don't unnecessarily split up what we'll immediately merge again, because the migratetypes match.
Quoted 6 lines
Rename
split_large_buddy()to__free_one_page_maybe_split(), to make it clearer what's happening, and handle in it only natural buddy orders, not thealloc_contig_range(__GFP_COMP)special case: handle that infree_one_page()only.Signed-off-by David Hildenbrand <[email protected]>
Re: [PATCH v1 1/2] mm/page_alloc: conditionally split > pageblock_order pages in free_one_page() and move_freepages_block_isolate()
In reply to David HildenbrandQuoted 5 lines · David Hildenbrand
Let's special-case for the common scenarios that:
(a) We are freeing pages <=
pageblock_order
(b) We are freeing a page <=MAX_PAGE_ORDERand all pageblocks match (especially, no mixture of isolated and non-isolated pageblocks)
Well in many of those cases we could also just adjust the pageblocks... But perhaps they indeed shouldn't differ in the first place, unless there's an isolation attempt.
Quoted 13 lines
When we encounter a >
MAX_PAGE_ORDERpage, it can only come fromalloc_contig_range(), and we can processMAX_PAGE_ORDERchunks.When we encounter a >pageblock_order <=
MAX_PAGE_ORDERpage, check whether all pageblocks match, and if so (common case), don't split them up just for the buddy to merge them back.This makes sure that when we free
MAX_PAGE_ORDERchunks to the buddy, for example during system startups, memory onlining, or when isolating consecutive pageblocks via alloc_contig_range()/memory offlining, that we don't unnecessarily split up what we'll immediately merge again, because the migratetypes match.
Quoted 6 lines
Rename
split_large_buddy()to__free_one_page_maybe_split(), to make it clearer what's happening, and handle in it only natural buddy orders, not thealloc_contig_range(__GFP_COMP)special case: handle that infree_one_page()only.Signed-off-by David Hildenbrand <[email protected]>
Hm but noticed something:
Quoted 27 lines
mm/page_alloc.c +18
-5+static void __free_one_page_maybe_split (struct zone *zone,struct page *page, +unsigned long pfn,int order,fpi_t fpi_flags) +{ +const unsigned long end_pfn = pfn + (1 << order); +int mt =get_pfnblock_migratetype (page, pfn); + +VM_WARN_ON_ONCE (order >MAX_PAGE_ORDER );VM_WARN_ON_ONCE (!IS_ALIGNED (pfn,1 << order));/* Caller removed page from freelist, buddy info cleared! */ VM_WARN_ON_ONCE (PageBuddy (page)); -if (order > pageblock_order) - order = pageblock_order; - -while (pfn != end) { -int mt =get_pfnblock_migratetype (page, pfn); +/* +* With CONFIG_MEMORY_ISOLATION, we might be freeing MAX_ORDER_NR_PAGES +* pages that cover pageblocks with different migratetypes; for example +* only some migratetypes might be MIGRATE_ISOLATE. In that (unlikely) +* case, fallback to freeing individual pageblocks so they get put +* onto the right lists. +*/ +if (!IS_ENABLED (CONFIG_MEMORY_ISOLATION ) || +likely (order <= pageblock_order) || +pfnblock_migratetype_equal (pfn + pageblock_nr_pages, end_pfn, mt)) { +__free_one_page (page, pfn, zone, order, mt, fpi_flags);
mm/page_alloc.c static void free_pcppages_bulk(struct zone *zone, int count, · line 1272
Quoted 10 lines
mm/page_alloc.c +6
-2+return ; + } -__free_one_page (page, pfn, zone, order, mt, fpi); - pfn +=1 << order; +while (pfn != end_pfn) { + mt =get_pfnblock_migratetype (page, pfn); +__free_one_page (page, pfn, zone, pageblock_order, mt, fpi_flags); + pfn += pageblock_nr_pages; page =pfn_to_page (pfn);
This predates your patch, but seems potentially dangerous to attempt pfn_to_page(end_pfn) with SPARSEMEM and no vmemmap and the end_pfn perhaps being just outside of the valid range? Should we change that?
But seems this code was initially introduced as part of Johannes' migratetype hygiene series.
Zi Yan
reviewerRe: [PATCH v1 1/2] mm/page_alloc: conditionally split > pageblock_order pages in free_one_page() and move_freepages_block_isolate()
Quoted 77 lines · Vlastimil Babka
Quoted 5 lines · David Hildenbrand
Let's special-case for the common scenarios that:
(a) We are freeing pages <=
pageblock_order
(b) We are freeing a page <=MAX_PAGE_ORDERand all pageblocks match (especially, no mixture of isolated and non-isolated pageblocks)Well in many of those cases we could also just adjust the pageblocks... But perhaps they indeed shouldn't differ in the first place, unless there's an isolation attempt.
Quoted 13 lines
When we encounter a >
MAX_PAGE_ORDERpage, it can only come fromalloc_contig_range(), and we can processMAX_PAGE_ORDERchunks.When we encounter a >pageblock_order <=
MAX_PAGE_ORDERpage, check whether all pageblocks match, and if so (common case), don't split them up just for the buddy to merge them back.This makes sure that when we free
MAX_PAGE_ORDERchunks to the buddy, for example during system startups, memory onlining, or when isolating consecutive pageblocks via alloc_contig_range()/memory offlining, that we don't unnecessarily split up what we'll immediately merge again, because the migratetypes match.Quoted 6 lines
Rename
split_large_buddy()to__free_one_page_maybe_split(), to make it clearer what's happening, and handle in it only natural buddy orders, not thealloc_contig_range(__GFP_COMP)special case: handle that infree_one_page()only.Signed-off-by David Hildenbrand <[email protected]>Acked-by Vlastimil Babka <[email protected]Hm but noticed something:
Quoted 27 lines
mm/page_alloc.c +18
-5+static void __free_one_page_maybe_split (struct zone *zone,struct page *page, +unsigned long pfn,int order,fpi_t fpi_flags) +{ +const unsigned long end_pfn = pfn + (1 << order); +int mt =get_pfnblock_migratetype (page, pfn); + +VM_WARN_ON_ONCE (order >MAX_PAGE_ORDER );VM_WARN_ON_ONCE (!IS_ALIGNED (pfn,1 << order));/* Caller removed page from freelist, buddy info cleared! */ VM_WARN_ON_ONCE (PageBuddy (page)); -if (order > pageblock_order) - order = pageblock_order; - -while (pfn != end) { -int mt =get_pfnblock_migratetype (page, pfn); +/* +* With CONFIG_MEMORY_ISOLATION, we might be freeing MAX_ORDER_NR_PAGES +* pages that cover pageblocks with different migratetypes; for example +* only some migratetypes might be MIGRATE_ISOLATE. In that (unlikely) +* case, fallback to freeing individual pageblocks so they get put +* onto the right lists. +*/ +if (!IS_ENABLED (CONFIG_MEMORY_ISOLATION ) || +likely (order <= pageblock_order) || +pfnblock_migratetype_equal (pfn + pageblock_nr_pages, end_pfn, mt)) { +__free_one_page (page, pfn, zone, order, mt, fpi_flags);mm/page_alloc.c static void free_pcppages_bulk(struct zone *zone, int count, · line 1272
Quoted 10 lines
mm/page_alloc.c +6
-2+return ; + } -__free_one_page (page, pfn, zone, order, mt, fpi); - pfn +=1 << order; +while (pfn != end_pfn) { + mt =get_pfnblock_migratetype (page, pfn); +__free_one_page (page, pfn, zone, pageblock_order, mt, fpi_flags); + pfn += pageblock_nr_pages; page =pfn_to_page (pfn);This predates your patch, but seems potentially dangerous to attempt
pfn_to_page(end_pfn)with SPARSEMEM and no vmemmap and theend_pfnperhaps being just outside of the valid range? Should we change that?
Quoted 2 lines
But seems this code was initially introduced as part of Johannes' migratetype hygiene series.
It starts as split_free_page() from commit b2c9e2fbba32 ("mm: make alloc_contig_range work at pageblock granularity”), but harmless since it is only used to split a buddy page. Then commit fd919a85cd55 ("mm:page_isolation: prepare for hygienic freelists") refactored it, which should be fine, since it is still used for the same purpose in page isolation. Then commit e98337d11bbd ("mm/contig_alloc: support __GFP_COMP") used it for gigantic hugetlb.
For SPARSEMEM && !SPARSEMEM_VMEMMAP, PFNs are contiguous, vmemmap might not be. The code above using pfn in the loop might be fine. And since order is provided, unless the caller is providing a falsely large order, pfn should be valid. Or am I missing anything?
Best Regards,
Yan, Zi
Re: [PATCH v1 1/2] mm/page_alloc: conditionally split > pageblock_order pages in free_one_page() and move_freepages_block_isolate()
Quoted 90 lines · Zi Yan
Quoted 77 lines · Vlastimil Babka
Quoted 5 lines · David Hildenbrand
Let's special-case for the common scenarios that:
(a) We are freeing pages <=
pageblock_order
(b) We are freeing a page <=MAX_PAGE_ORDERand all pageblocks match (especially, no mixture of isolated and non-isolated pageblocks)Well in many of those cases we could also just adjust the pageblocks... But perhaps they indeed shouldn't differ in the first place, unless there's an isolation attempt.
Quoted 13 lines
When we encounter a >
MAX_PAGE_ORDERpage, it can only come fromalloc_contig_range(), and we can processMAX_PAGE_ORDERchunks.When we encounter a >pageblock_order <=
MAX_PAGE_ORDERpage, check whether all pageblocks match, and if so (common case), don't split them up just for the buddy to merge them back.This makes sure that when we free
MAX_PAGE_ORDERchunks to the buddy, for example during system startups, memory onlining, or when isolating consecutive pageblocks via alloc_contig_range()/memory offlining, that we don't unnecessarily split up what we'll immediately merge again, because the migratetypes match.Quoted 6 lines
Rename
split_large_buddy()to__free_one_page_maybe_split(), to make it clearer what's happening, and handle in it only natural buddy orders, not thealloc_contig_range(__GFP_COMP)special case: handle that infree_one_page()only.Signed-off-by David Hildenbrand <[email protected]>Acked-by Vlastimil Babka <[email protected]Hm but noticed something:
Quoted 27 lines
mm/page_alloc.c +18
-5+static void __free_one_page_maybe_split (struct zone *zone,struct page *page, +unsigned long pfn,int order,fpi_t fpi_flags) +{ +const unsigned long end_pfn = pfn + (1 << order); +int mt =get_pfnblock_migratetype (page, pfn); + +VM_WARN_ON_ONCE (order >MAX_PAGE_ORDER );VM_WARN_ON_ONCE (!IS_ALIGNED (pfn,1 << order));/* Caller removed page from freelist, buddy info cleared! */ VM_WARN_ON_ONCE (PageBuddy (page)); -if (order > pageblock_order) - order = pageblock_order; - -while (pfn != end) { -int mt =get_pfnblock_migratetype (page, pfn); +/* +* With CONFIG_MEMORY_ISOLATION, we might be freeing MAX_ORDER_NR_PAGES +* pages that cover pageblocks with different migratetypes; for example +* only some migratetypes might be MIGRATE_ISOLATE. In that (unlikely) +* case, fallback to freeing individual pageblocks so they get put +* onto the right lists. +*/ +if (!IS_ENABLED (CONFIG_MEMORY_ISOLATION ) || +likely (order <= pageblock_order) || +pfnblock_migratetype_equal (pfn + pageblock_nr_pages, end_pfn, mt)) { +__free_one_page (page, pfn, zone, order, mt, fpi_flags);mm/page_alloc.c static void free_pcppages_bulk(struct zone *zone, int count, · line 1272
Quoted 10 lines
mm/page_alloc.c +6
-2+return ; + } -__free_one_page (page, pfn, zone, order, mt, fpi); - pfn +=1 << order; +while (pfn != end_pfn) { + mt =get_pfnblock_migratetype (page, pfn); +__free_one_page (page, pfn, zone, pageblock_order, mt, fpi_flags); + pfn += pageblock_nr_pages; page =pfn_to_page (pfn);This predates your patch, but seems potentially dangerous to attempt
pfn_to_page(end_pfn)with SPARSEMEM and no vmemmap and theend_pfnperhaps being just outside of the valid range? Should we change that?Quoted 2 lines
But seems this code was initially introduced as part of Johannes' migratetype hygiene series.
It starts as
split_free_page()from commitb2c9e2fbba32("mm: makealloc_contig_rangework at pageblock granularity”), but harmless since it is only used to split a buddy page. Then commitfd919a85cd55("mm:page_isolation: prepare for hygienic freelists") refactored it, which should be fine, since it is still used for the same purpose in page isolation. Then commite98337d11bbd("mm/contig_alloc: support__GFP_COMP") used it for gigantic hugetlb.
Quoted 4 lines
For SPARSEMEM && !SPARSEMEM_VMEMMAP, PFNs are contiguous, vmemmap might not be. The code above using pfn in the loop might be fine. And since order is provided, unless the caller is providing a falsely large order, pfn should be valid. Or am I missing anything?
I think the question is, what happens when we call pfn_to_page() on a PFN that falls into a memory section that is either offline, doesn't have a memmap, or does not exist.
With CONFIG_SPARSEMEM, we do a
struct mem_section *__sec = __pfn_to_section(__pfn) __section_mem_map_addr(__sec) + __pfn;
__pfn_to_section() can return NULL, in which case __section_mem_map_addr() would dereference NULL.
I assume it ould happen in corner cases, if we'd exceed NR_SECTION_ROOTS. (IOW, large memory, and we free a page that is at the very end of physical memory).
Likely, we should do the pfn_to_page() before the __free_one_page() call.
Signature · 3 lines
Cheers, David / dhildenb
Zi Yan
reviewerRe: [PATCH v1 1/2] mm/page_alloc: conditionally split > pageblock_order pages in free_one_page() and move_freepages_block_isolate()
Quoted 100 lines · David Hildenbrand
Quoted 90 lines · Zi Yan
Quoted 77 lines · Vlastimil Babka
Quoted 5 lines · David Hildenbrand
Let's special-case for the common scenarios that:
(a) We are freeing pages <=
pageblock_order
(b) We are freeing a page <=MAX_PAGE_ORDERand all pageblocks match (especially, no mixture of isolated and non-isolated pageblocks)Well in many of those cases we could also just adjust the pageblocks... But perhaps they indeed shouldn't differ in the first place, unless there's an isolation attempt.
Quoted 13 lines
When we encounter a >
MAX_PAGE_ORDERpage, it can only come fromalloc_contig_range(), and we can processMAX_PAGE_ORDERchunks.When we encounter a >pageblock_order <=
MAX_PAGE_ORDERpage, check whether all pageblocks match, and if so (common case), don't split them up just for the buddy to merge them back.This makes sure that when we free
MAX_PAGE_ORDERchunks to the buddy, for example during system startups, memory onlining, or when isolating consecutive pageblocks via alloc_contig_range()/memory offlining, that we don't unnecessarily split up what we'll immediately merge again, because the migratetypes match.Quoted 6 lines
Rename
split_large_buddy()to__free_one_page_maybe_split(), to make it clearer what's happening, and handle in it only natural buddy orders, not thealloc_contig_range(__GFP_COMP)special case: handle that infree_one_page()only.Signed-off-by David Hildenbrand <[email protected]>Acked-by Vlastimil Babka <[email protected]Hm but noticed something:
Quoted 27 lines
mm/page_alloc.c +18
-5+static void __free_one_page_maybe_split (struct zone *zone,struct page *page, +unsigned long pfn,int order,fpi_t fpi_flags) +{ +const unsigned long end_pfn = pfn + (1 << order); +int mt =get_pfnblock_migratetype (page, pfn); + +VM_WARN_ON_ONCE (order >MAX_PAGE_ORDER );VM_WARN_ON_ONCE (!IS_ALIGNED (pfn,1 << order));/* Caller removed page from freelist, buddy info cleared! */ VM_WARN_ON_ONCE (PageBuddy (page)); -if (order > pageblock_order) - order = pageblock_order; - -while (pfn != end) { -int mt =get_pfnblock_migratetype (page, pfn); +/* +* With CONFIG_MEMORY_ISOLATION, we might be freeing MAX_ORDER_NR_PAGES +* pages that cover pageblocks with different migratetypes; for example +* only some migratetypes might be MIGRATE_ISOLATE. In that (unlikely) +* case, fallback to freeing individual pageblocks so they get put +* onto the right lists. +*/ +if (!IS_ENABLED (CONFIG_MEMORY_ISOLATION ) || +likely (order <= pageblock_order) || +pfnblock_migratetype_equal (pfn + pageblock_nr_pages, end_pfn, mt)) { +__free_one_page (page, pfn, zone, order, mt, fpi_flags);mm/page_alloc.c static void free_pcppages_bulk(struct zone *zone, int count, · line 1272
Quoted 10 lines
mm/page_alloc.c +6
-2+return ; + } -__free_one_page (page, pfn, zone, order, mt, fpi); - pfn +=1 << order; +while (pfn != end_pfn) { + mt =get_pfnblock_migratetype (page, pfn); +__free_one_page (page, pfn, zone, pageblock_order, mt, fpi_flags); + pfn += pageblock_nr_pages; page =pfn_to_page (pfn);This predates your patch, but seems potentially dangerous to attempt
pfn_to_page(end_pfn)with SPARSEMEM and no vmemmap and theend_pfnperhaps being just outside of the valid range? Should we change that?Quoted 2 lines
But seems this code was initially introduced as part of Johannes' migratetype hygiene series.
It starts as
split_free_page()from commitb2c9e2fbba32("mm: makealloc_contig_rangework at pageblock granularity”), but harmless since it is only used to split a buddy page. Then commitfd919a85cd55("mm:page_isolation: prepare for hygienic freelists") refactored it, which should be fine, since it is still used for the same purpose in page isolation. Then commite98337d11bbd("mm/contig_alloc: support__GFP_COMP") used it for gigantic hugetlb.Quoted 4 lines
For SPARSEMEM && !SPARSEMEM_VMEMMAP, PFNs are contiguous, vmemmap might not be. The code above using pfn in the loop might be fine. And since order is provided, unless the caller is providing a falsely large order, pfn should be valid. Or am I missing anything?
I think the question is, what happens when we call
pfn_to_page()on a PFN that falls into a memory section that is either offline, doesn't have a memmap, or does not exist.With
CONFIG_SPARSEMEM, we do a
Quoted 8 lines
struct
mem_section*__sec=__pfn_to_section(__pfn)__section_mem_map_addr(__sec)+__pfn;
__pfn_to_section()can return NULL, in which case__section_mem_map_addr()would dereference NULL.I assume it ould happen in corner cases, if we'd exceed
NR_SECTION_ROOTS. (IOW, large memory, and we free a page that is at the very end of physical memory).Likely, we should do the
pfn_to_page()before the__free_one_page()call.
Got it. Both you and Vlastimil gave the same corner case issue.
I agree that doing pfn_to_page() before the __free_one_page() could get rid of the concern.
Thank you both.
Best Regards,
Yan, Zi
Re: [PATCH v1 1/2] mm/page_alloc: conditionally split > pageblock_order pages in free_one_page() and move_freepages_block_isolate()
Quoted 107 lines · Zi Yan
Quoted 105 lines · David Hildenbrand
Quoted 90 lines · Zi Yan
Quoted 77 lines · Vlastimil Babka
Quoted 5 lines · David Hildenbrand
Let's special-case for the common scenarios that:
(a) We are freeing pages <=
pageblock_order
(b) We are freeing a page <=MAX_PAGE_ORDERand all pageblocks match (especially, no mixture of isolated and non-isolated pageblocks)Well in many of those cases we could also just adjust the pageblocks... But perhaps they indeed shouldn't differ in the first place, unless there's an isolation attempt.
Quoted 13 lines
When we encounter a >
MAX_PAGE_ORDERpage, it can only come fromalloc_contig_range(), and we can processMAX_PAGE_ORDERchunks.When we encounter a >pageblock_order <=
MAX_PAGE_ORDERpage, check whether all pageblocks match, and if so (common case), don't split them up just for the buddy to merge them back.This makes sure that when we free
MAX_PAGE_ORDERchunks to the buddy, for example during system startups, memory onlining, or when isolating consecutive pageblocks via alloc_contig_range()/memory offlining, that we don't unnecessarily split up what we'll immediately merge again, because the migratetypes match.Quoted 6 lines
Rename
split_large_buddy()to__free_one_page_maybe_split(), to make it clearer what's happening, and handle in it only natural buddy orders, not thealloc_contig_range(__GFP_COMP)special case: handle that infree_one_page()only.Signed-off-by David Hildenbrand <[email protected]>Acked-by Vlastimil Babka <[email protected]Hm but noticed something:
Quoted 27 lines
mm/page_alloc.c +18
-5+static void __free_one_page_maybe_split (struct zone *zone,struct page *page, +unsigned long pfn,int order,fpi_t fpi_flags) +{ +const unsigned long end_pfn = pfn + (1 << order); +int mt =get_pfnblock_migratetype (page, pfn); + +VM_WARN_ON_ONCE (order >MAX_PAGE_ORDER );VM_WARN_ON_ONCE (!IS_ALIGNED (pfn,1 << order));/* Caller removed page from freelist, buddy info cleared! */ VM_WARN_ON_ONCE (PageBuddy (page)); -if (order > pageblock_order) - order = pageblock_order; - -while (pfn != end) { -int mt =get_pfnblock_migratetype (page, pfn); +/* +* With CONFIG_MEMORY_ISOLATION, we might be freeing MAX_ORDER_NR_PAGES +* pages that cover pageblocks with different migratetypes; for example +* only some migratetypes might be MIGRATE_ISOLATE. In that (unlikely) +* case, fallback to freeing individual pageblocks so they get put +* onto the right lists. +*/ +if (!IS_ENABLED (CONFIG_MEMORY_ISOLATION ) || +likely (order <= pageblock_order) || +pfnblock_migratetype_equal (pfn + pageblock_nr_pages, end_pfn, mt)) { +__free_one_page (page, pfn, zone, order, mt, fpi_flags);mm/page_alloc.c static void free_pcppages_bulk(struct zone *zone, int count, · line 1272
Quoted 10 lines
mm/page_alloc.c +6
-2+return ; + } -__free_one_page (page, pfn, zone, order, mt, fpi); - pfn +=1 << order; +while (pfn != end_pfn) { + mt =get_pfnblock_migratetype (page, pfn); +__free_one_page (page, pfn, zone, pageblock_order, mt, fpi_flags); + pfn += pageblock_nr_pages; page =pfn_to_page (pfn);This predates your patch, but seems potentially dangerous to attempt
pfn_to_page(end_pfn)with SPARSEMEM and no vmemmap and theend_pfnperhaps being just outside of the valid range? Should we change that?Quoted 2 lines
But seems this code was initially introduced as part of Johannes' migratetype hygiene series.
It starts as
split_free_page()from commitb2c9e2fbba32("mm: makealloc_contig_rangework at pageblock granularity”), but harmless since it is only used to split a buddy page. Then commitfd919a85cd55("mm:page_isolation: prepare for hygienic freelists") refactored it, which should be fine, since it is still used for the same purpose in page isolation. Then commite98337d11bbd("mm/contig_alloc: support__GFP_COMP") used it for gigantic hugetlb.Quoted 4 lines
For SPARSEMEM && !SPARSEMEM_VMEMMAP, PFNs are contiguous, vmemmap might not be. The code above using pfn in the loop might be fine. And since order is provided, unless the caller is providing a falsely large order, pfn should be valid. Or am I missing anything?
I think the question is, what happens when we call
pfn_to_page()on a PFN that falls into a memory section that is either offline, doesn't have a memmap, or does not exist.With
CONFIG_SPARSEMEM, we do astruct
mem_section*__sec=__pfn_to_section(__pfn)__section_mem_map_addr(__sec)+__pfn;
__pfn_to_section()can return NULL, in which case__section_mem_map_addr()would dereference NULL.
Quoted 7 lines
Quoted 3 lines
I assume it ould happen in corner cases, if we'd exceed
NR_SECTION_ROOTS. (IOW, large memory, and we free a page that is at the very end of physical memory).Likely, we should do the
pfn_to_page()before the__free_one_page()call.Got it. Both you and Vlastimil gave the same corner case issue.
I agree that doingpfn_to_page()before the__free_one_page()could get rid of the concern.
Thanks you both for the review. I'll resend a v2 tomorrow, including a patch to fix that up first.
Signature · 3 lines
Cheers, David / dhildenb
Re: [PATCH v1 1/2] mm/page_alloc: conditionally split > pageblock_order pages in free_one_page() and move_freepages_block_isolate()
In reply to Zi YanQuoted 38 lines · Zi Yan
Quoted 26 lines · Vlastimil Babka
Quoted 11 lines
mm/page_alloc.c +11
-0+/* +* With CONFIG_MEMORY_ISOLATION, we might be freeing MAX_ORDER_NR_PAGES +* pages that cover pageblocks with different migratetypes; for example +* only some migratetypes might be MIGRATE_ISOLATE. In that (unlikely) +* case, fallback to freeing individual pageblocks so they get put +* onto the right lists. +*/ +if (!IS_ENABLED (CONFIG_MEMORY_ISOLATION ) || +likely (order <= pageblock_order) || +pfnblock_migratetype_equal (pfn + pageblock_nr_pages, end_pfn, mt)) { +__free_one_page (page, pfn, zone, order, mt, fpi_flags);mm/page_alloc.c static void free_pcppages_bulk(struct zone *zone, int count, · line 1272
Quoted 10 lines
mm/page_alloc.c +6
-2+return ; + } -__free_one_page (page, pfn, zone, order, mt, fpi); - pfn +=1 << order; +while (pfn != end_pfn) { + mt =get_pfnblock_migratetype (page, pfn); +__free_one_page (page, pfn, zone, pageblock_order, mt, fpi_flags); + pfn += pageblock_nr_pages; page =pfn_to_page (pfn);This predates your patch, but seems potentially dangerous to attempt
pfn_to_page(end_pfn)with SPARSEMEM and no vmemmap and theend_pfnperhaps being just outside of the valid range? Should we change that?Quoted 2 lines
But seems this code was initially introduced as part of Johannes' migratetype hygiene series.
It starts as
split_free_page()from commitb2c9e2fbba32("mm: makealloc_contig_rangework at pageblock granularity”), but harmless since it is only used to split a buddy page. Then commitfd919a85cd55("mm:page_isolation: prepare for hygienic freelists") refactored it, which should be fine, since it is still used for the same purpose in page isolation. Then commite98337d11bbd("mm/contig_alloc: support__GFP_COMP") used it for gigantic hugetlb.
Quoted 4 lines
For SPARSEMEM && !SPARSEMEM_VMEMMAP, PFNs are contiguous, vmemmap might not be. The code above using pfn in the loop might be fine. And since order is provided, unless the caller is providing a falsely large order, pfn should be valid. Or am I missing anything?
I mean if we are in the last iteration and about to exit the loop because pfn == end_pfn, and it's the very last MAX_ORDER block of a zone and section, end_pfn is already outside of it, and pfn_to_page() might get NULL result from __pfn_to_section() and __section_mem_map_addr() then oops, no?
Quoted 2 lines
Best Regards,
Yan, Zi
Re: [PATCH v1 1/2] mm/page_alloc: conditionally split > pageblock_order pages in free_one_page() and move_freepages_block_isolate()
In reply to Vlastimil BabkaQuoted 10 lines · Vlastimil Babka
Quoted 5 lines · David Hildenbrand
Let's special-case for the common scenarios that:
(a) We are freeing pages <=
pageblock_order
(b) We are freeing a page <=MAX_PAGE_ORDERand all pageblocks match (especially, no mixture of isolated and non-isolated pageblocks)Well in many of those cases we could also just adjust the pageblocks... But perhaps they indeed shouldn't differ in the first place, unless there's an isolation attempt.
Thanks for the review and finding that one flaw.
Yes, I agree: usually we expect this to only happen with isolated pageblocks. At least in the scenarios I have in mind (boot, hotplug, alloc_contig_range()), we should only ever have a mixture of isolated and !isolated.
Maybe one could even special case on zone->nr_isolate_pageblock: if 0, just assume all pageblocks are the equal. I'll look into some details and might send a follow-up patch.
Signature · 3 lines
Cheers, David / dhildenb
PATCH 2/2 mm/page_isolation: fixup isolate_single_pageblock() comment regarding splitting free pages
In reply to David HildenbrandLet's fixup the comment, documenting how free_one_page_maybe_split() comes into play.
--- mm/page_isolation.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
mm/page_isolation.c +4 -5
@@ -298,11 +298,10 @@ __first_valid_page(unsigned long pfn, unsigned long nr_pages)* pagelbocks. * [ MAX_PAGE_ORDER ] * [ pageblock0 | pageblock1 ] -* When either pageblock is isolated, if it is a free page, the page is not -* split into separate migratetype lists, which is supposed to; if it is an -* in-use page and freed later, __free_one_page() does not split the free page -* either. The function handles this by splitting the free page or migrating -* the in-use page then splitting the free page. +* When either pageblock is isolated, if it is an in-use page and freed later, +* __free_one_page_maybe_split() will split the free page if required. If the +* page is already free, this function handles this by splitting the free page +* through move_freepages_block_isolate()->__free_one_page_maybe_split(). */ static int isolate_single_pageblock (unsigned long boundary_pfn,int flags,bool isolate_before,bool skip_isolation,int migratetype)
Signature · 1 line
2.47.1
Zi Yan
reviewerRe: [PATCH v1 2/2] mm/page_isolation: fixup isolate_single_pageblock() comment regarding splitting free pages
Quoted 18 lines · David Hildenbrand
Let's fixup the comment, documenting how
free_one_page_maybe_split()comes into play.Signed-off-by David Hildenbrand <[email protected]>--- mm/page_isolation.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)mm/page_isolation.c +0
-2@@ -298,11 +298,10 @@ __first_valid_page(unsigned long pfn, unsigned long nr_pages)* pagelbocks. * [ MAX_PAGE_ORDER ] * [ pageblock0 | pageblock1 ] -* When either pageblock is isolated, if it is a free page, the page is not -* split into separate migratetype lists, which is supposed to; if it is an
mm/page_isolation.c __first_valid_page(unsigned long pfn, unsigned long nr_pages) · line 307
Quoted 10 lines
mm/page_isolation.c +4
-3-* in-use page and freed later, __free_one_page() does not split the free page -* either. The function handles this by splitting the free page or migrating -* the in-use page then splitting the free page. +* When either pageblock is isolated, if it is an in-use page and freed later, +* __free_one_page_maybe_split() will split the free page if required. If the +* page is already free, this function handles this by splitting the free page +* through move_freepages_block_isolate()->__free_one_page_maybe_split(). */ static int isolate_single_pageblock (unsigned long boundary_pfn,int flags,bool isolate_before,bool skip_isolation,int migratetype)
LGTM. Reviewed-by: Zi Yan <[email protected]>
Best Regards,
Yan, Zi
Re: [PATCH v1 2/2] mm/page_isolation: fixup isolate_single_pageblock() comment regarding splitting free pages
In reply to David HildenbrandQuoted 4 lines · David Hildenbrand
Let's fixup the comment, documenting how
free_one_page_maybe_split()comes into play.Signed-off-by David Hildenbrand <[email protected]>
Quoted 24 lines
--- mm/page_isolation.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)mm/page_isolation.c +4
-5@@ -298,11 +298,10 @@ __first_valid_page(unsigned long pfn, unsigned long nr_pages)* pagelbocks. * [ MAX_PAGE_ORDER ] * [ pageblock0 | pageblock1 ] -* When either pageblock is isolated, if it is a free page, the page is not -* split into separate migratetype lists, which is supposed to; if it is an -* in-use page and freed later, __free_one_page() does not split the free page -* either. The function handles this by splitting the free page or migrating -* the in-use page then splitting the free page. +* When either pageblock is isolated, if it is an in-use page and freed later, +* __free_one_page_maybe_split() will split the free page if required. If the +* page is already free, this function handles this by splitting the free page +* through move_freepages_block_isolate()->__free_one_page_maybe_split(). */ static int isolate_single_pageblock (unsigned long boundary_pfn,int flags,bool isolate_before,bool skip_isolation,int migratetype)