Use pageblock_order for cma and alloc_contig_range alignment.
Subsystems (8)
v9 cover Use pageblock_order for cma and alloc_contig_range alignment.
From: Zi Yan <[email protected]>
Hi David,
This patchset tries to remove the MAX_ORDER-1 alignment requirement for CMA and alloc_contig_range(). It prepares for my upcoming changes to make MAX_ORDER adjustable at boot time[1]. It is on top of mmotm-2022-03-16-17-42.
Changelog
===
V9
---
1. Limited has_unmovable_pages() check within a pageblock.
2. Added a check to ensure page isolation is done within a single zone in isolate_single_pageblock().
3. Fixed an off-by-one bug in isolate_single_pageblock().
4. Fixed a NULL-deferencing bug when the pages before to-be-isolated pageblock is not online in isolate_single_pageblock().
V8
---
1. Cleaned up has_unmovable_pages() to remove page argument.
V7
---
1. Added page validity check in isolate_single_pageblock() to avoid out of zone pages.
2. Fixed a bug in split_free_page() to split and free pages in correct page order.
V6
---
1. Resolved compilation error/warning reported by kernel test robot.
2. Tried to solve the coding concerns from Christophe Leroy.
3. Shortened lengthy lines (pointed out by Christoph Hellwig).
V5
---
1. Moved isolation address alignment handling in start_isolate_page_range().
2. Rewrote and simplified how alloc_contig_range() works at pageblock granularity (Patch 3). Only two pageblock migratetypes need to be saved and restored. start_isolate_page_range() might need to migrate pages in this version, but it prevents the caller from worrying about max(MAX_ORDER_NR_PAEGS, pageblock_nr_pages) alignment after the page range is isolated.
V4
---
1. Dropped two irrelevant patches on non-lru compound page handling, as it is not supported upstream.
2. Renamed migratetype_has_fallback() to migratetype_is_mergeable().
3. Always check whether two pageblocks can be merged in __free_one_page() when order is >= pageblock_order, as the case (not mergeable pageblocks are isolated, CMA, and HIGHATOMIC) becomes more common.
3. Moving has_unmovable_pages() is now a separate patch.
4. Removed MAX_ORDER-1 alignment requirement in the comment in virtio_mem code.
Description
===
The MAX_ORDER - 1 alignment requirement comes from that alloc_contig_range() isolates pageblocks to remove free memory from buddy allocator but isolating only a subset of pageblocks within a page spanning across multiple pageblocks causes free page accounting issues. Isolated page might not be put into the right free list, since the code assumes the migratetype of the first pageblock as the whole free page migratetype. This is based on the discussion at [2].
To remove the requirement, this patchset:
1. isolates pages at pageblock granularity instead of max(MAX_ORDER_NR_PAEGS, pageblock_nr_pages);
2. splits free pages across the specified range or migrates in-use pages across the specified range then splits the freed page to avoid free page accounting issues (it happens when multiple pageblocks within a single page have different migratetypes);
3. only checks unmovable pages within the range instead of MAX_ORDER - 1 aligned range during isolation to avoid alloc_contig_range() failure when pageblocks within a MAX_ORDER - 1 aligned range are allocated separately.
4. returns pages not in the range as it did before.
One optimization might come later:
1. make MIGRATE_ISOLATE a separate bit to be able to restore the original migratetypes when isolation fails in the middle of the range.
Feel free to give comments and suggestions. Thanks.
[1] https://lore.kernel.org/linux-mm/[email protected]/
[2] https://lore.kernel.org/linux-mm/[email protected]/
Zi Yan (5):
mm: page_isolation: move has_unmovable_pages() to mm/page_isolation.c
mm: page_isolation: check specified range for unmovable pages
mm: make alloc_contig_range work at pageblock granularity
mm: cma: use pageblock_order as the single alignment
drivers: virtio_mem: use pageblock size as the minimum virtio_mem
size.
drivers/virtio/virtio_mem.c | 6 +- include/linux/cma.h | 4 +- include/linux/mmzone.h | 5 +- include/linux/page-isolation.h | 4 +- mm/internal.h | 6 + mm/memory_hotplug.c | 3 +- mm/page_alloc.c | 244 ++++++----------------- mm/page_isolation.c | 342 +++++++++++++++++++++++++++++++-- 8 files changed, 397 insertions(+), 217 deletions(-)
Signature · 1 line
2.35.1
PATCH v9 1/5 mm: page_isolation: move has_unmovable_pages() to mm/page_isolation.c
From: Zi Yan <[email protected]>
has_unmovable_pages() is only used in mm/page_isolation.c. Move it from mm/page_alloc.c and make it static.
--- include/linux/page-isolation.h | 2 - mm/page_alloc.c | 119 --------------------------------- mm/page_isolation.c | 119 +++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 121 deletions(-)
include/linux/page-isolation.h +0 -2
@@ -33,8 +33,6 @@ static inline bool is_migrate_isolate(int migratetype)#define MEMORY_OFFLINE 0x1#define REPORT_FAILURE 0x2 -struct page *has_unmovable_pages (struct zone *zone,struct page *page, -int migratetype,int flags);void set_pageblock_migratetype (struct page *page,int migratetype);int move_freepages_block (struct zone *zone,struct page *page,int migratetype,int *num_movable);
mm/page_alloc.c +0 -119
125 lines not on this page · raw message
mm/page_isolation.c +119 -0
125 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v9 2/5 mm: page_isolation: check specified range for unmovable pages
In reply to Zi YanFrom: Zi Yan <[email protected]>
Enable set_migratetype_isolate() to check specified sub-range for unmovable pages during isolation. Page isolation is done
at MAX_ORDER_NR_PAEGS granularity, but not all pages within that granularity are intended to be isolated. For example, alloc_contig_range(), which uses page isolation, allows ranges without alignment. This commit makes unmovable page check only look for interesting pages, so that page isolation can succeed for any non-overlapping ranges.
--- mm/page_alloc.c | 16 ++-------- mm/page_isolation.c | 78 ++++++++++++++++++++++++++++++++------------- 2 files changed, 57 insertions(+), 37 deletions(-)
mm/page_alloc.c +2 -14
@@ -8937,16 +8937,6 @@ void *__init alloc_large_system_hash(const char *tablename, }#ifdef CONFIG_CONTIG_ALLOC -static unsigned long pfn_max_align_down (unsigned long pfn) -{ -return ALIGN_DOWN (pfn,MAX_ORDER_NR_PAGES ); -} - -static unsigned long pfn_max_align_up (unsigned long pfn) -{ -return ALIGN (pfn,MAX_ORDER_NR_PAGES ); -} -#if defined(CONFIG_DYNAMIC_DEBUG ) || \ (defined(CONFIG_DYNAMIC_DEBUG_CORE ) && defined(DYNAMIC_DEBUG_MODULE ))/* Usage: See admin-guide/dynamic-debug-howto.rst */
@@ -9091,8 +9081,7 @@ int alloc_contig_range(unsigned long start, unsigned long end,* put back to page allocator so that buddy can use them. */ - ret =start_isolate_page_range (pfn_max_align_down (start), -pfn_max_align_up (end), migratetype,0 ); + ret =start_isolate_page_range (start, end, migratetype,0 );if (ret)return ret;
@@ -9173,8 +9162,7 @@ int alloc_contig_range(unsigned long start, unsigned long end,free_contig_range (end, outer_end - end); done: -undo_isolate_page_range (pfn_max_align_down (start), -pfn_max_align_up (end), migratetype); +undo_isolate_page_range (start, end, migratetype);return ret; }EXPORT_SYMBOL (alloc_contig_range);
mm/page_isolation.c +55 -23
154 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v9 3/5 mm: make alloc_contig_range work at pageblock granularity
In reply to Zi YanFrom: Zi Yan <[email protected]>
alloc_contig_range() worked at MAX_ORDER_NR_PAGES granularity to avoid merging pageblocks with different migratetypes. It might unnecessarily convert extra pageblocks at the beginning and at the end of the range. Change alloc_contig_range() to work at pageblock granularity.
Special handling is needed for free pages and in-use pages across the boundaries of the range specified alloc_contig_range(). Because these partially isolated pages causes free page accounting issues. The free pages will be split and freed into separate migratetype lists; the in-use pages will be migrated then the freed pages will be handled.
--- include/linux/page-isolation.h | 2 +- mm/internal.h | 6 ++ mm/memory_hotplug.c | 3 +- mm/page_alloc.c | 107 +++++++++---------- mm/page_isolation.c | 189 ++++++++++++++++++++++++++++++--- 5 files changed, 236 insertions(+), 71 deletions(-)
include/linux/page-isolation.h +1 -1
@@ -42,7 +42,7 @@ int move_freepages_block(struct zone *zone, struct page *page,*/ int start_isolate_page_range (unsigned long start_pfn,unsigned long end_pfn, -unsigned migratetype,int flags); +unsigned migratetype,int flags,gfp_t gfp_flags);/* * Changes MIGRATE_ISOLATE to MIGRATE_MOVABLE.
mm/internal.h +6 -0
@@ -269,6 +269,9 @@ extern void *memmap_alloc(phys_addr_t size, phys_addr_t align,phys_addr_t min_addr, int nid, bool exact_nid); +void split_free_page (struct page *free_page, +int order,unsigned long split_pfn_offset); +#if definedCONFIG_COMPACTION || definedCONFIG_CMA /*
@@ -332,6 +335,9 @@ isolate_freepages_range(struct compact_control *cc,int isolate_migratepages_range (struct compact_control *cc,unsigned long low_pfn,unsigned long end_pfn); + +int __alloc_contig_migrate_range (struct compact_control *cc, +unsigned long start,unsigned long end);#endif int find_suitable_fallback (struct free_area *area,unsigned int order,int migratetype,bool only_stealable,bool *can_steal);
mm/memory_hotplug.c +2 -1
@@ -1836,7 +1836,8 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages,/* set above range as isolated */ ret =start_isolate_page_range (start_pfn, end_pfn,MIGRATE_MOVABLE , -MEMORY_OFFLINE |REPORT_FAILURE ); +MEMORY_OFFLINE |REPORT_FAILURE , +GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL);if (ret) { reason ="failure to isolate range" ; goto failed_removal_pcplists_disabled;
mm/page_alloc.c +51 -56
159 lines not on this page · raw message
mm/page_isolation.c +176 -13
233 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v9 4/5 mm: cma: use pageblock_order as the single alignment
In reply to Zi YanFrom: Zi Yan <[email protected]>
Now alloc_contig_range() works at pageblock granularity. Change CMA allocation, which uses alloc_contig_range(), to use pageblock_nr_pages alignment.
--- include/linux/cma.h | 4 ++-- include/linux/mmzone.h | 5 +---- mm/page_alloc.c | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-)
include/linux/cma.h +2 -2
@@ -17,11 +17,11 @@#define CMA_MAX_NAME 64/* -* TODO: once the buddy -- especially pageblock merging and alloc_contig_range() +* the buddy -- especially pageblock merging and alloc_contig_range() * -- can deal with only some pageblocks of a higher-order page being * MIGRATE_CMA, we can use pageblock_nr_pages. */ -#define CMA_MIN_ALIGNMENT_PAGES MAX_ORDER_NR_PAGES +#define CMA_MIN_ALIGNMENT_PAGES pageblock_nr_pages#define CMA_MIN_ALIGNMENT_BYTES (PAGE_SIZE * CMA_MIN_ALIGNMENT_PAGES)struct cma ;
include/linux/mmzone.h +1 -4
@@ -54,10 +54,7 @@ enum migratetype {* * The way to use it is to change migratetype of a range of * pageblocks to MIGRATE_CMA which can be done by -* __free_pageblock_cma() function. What is important though -* is that a range of pageblocks must be aligned to -* MAX_ORDER_NR_PAGES should biggest page be bigger than -* a single pageblock. +* __free_pageblock_cma() function. */ MIGRATE_CMA,#endif
mm/page_alloc.c +2 -2
@@ -9064,8 +9064,8 @@ int __alloc_contig_migrate_range(struct compact_control *cc,* be either of the two. * @gfp_mask: GFP mask to use during compaction * -* The PFN range does not have to be pageblock or MAX_ORDER_NR_PAGES -* aligned. The PFN range must belong to a single zone. +* The PFN range does not have to be pageblock aligned. The PFN range must +* belong to a single zone. * * The first thing this routine does is attempt to MIGRATE_ISOLATE all * pageblocks in the range. Once isolated, the pageblocks should not
Signature · 1 line
2.35.1
PATCH v9 5/5 drivers: virtio_mem: use pageblock size as the minimum virtio_mem size.
In reply to Zi YanFrom: Zi Yan <[email protected]>
alloc_contig_range() now only needs to be aligned to pageblock_nr_pages, drop virtio_mem size requirement that it needs to be MAX_ORDER_NR_PAGES.
--- drivers/virtio/virtio_mem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/virtio/virtio_mem.c +3 -3
@@ -2476,10 +2476,10 @@ static int virtio_mem_init_hotplug(struct virtio_mem *vm) VIRTIO_MEM_DEFAULT_OFFLINE_THRESHOLD);/* -* TODO: once alloc_contig_range() works reliably with pageblock -* granularity on ZONE_NORMAL, use pageblock_nr_pages instead. +* alloc_contig_range() works reliably with pageblock +* granularity on ZONE_NORMAL, use pageblock_nr_pages. */ - sb_size =PAGE_SIZE *MAX_ORDER_NR_PAGES ; + sb_size =PAGE_SIZE * pageblock_nr_pages; sb_size =max_t (uint64_t, vm->device_block_size, sb_size);if (sb_size <memory_block_size_bytes () && !force_bbm) {
Signature · 1 line
2.35.1