mm-page_alloc-pageblock-flags-functions-clean-up.patch removed from -mm tree
The quilt patch titled
Subject: mm/page_alloc: pageblock flags functions clean up
has been removed from the -mm tree. Its filename was
mm-page_alloc-pageblock-flags-functions-clean-up.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Zi Yan <[email protected]>
Subject: mm/page_alloc: pageblock flags functions clean up
Date: Mon, 16 Jun 2025 22:11:09 -0400
Patch series "Make MIGRATE_ISOLATE a standalone bit", v10.
This patchset moves MIGRATE_ISOLATE to a standalone bit to avoid being overwritten during pageblock isolation process. Currently, MIGRATE_ISOLATE is part of enum migratetype (in include/linux/mmzone.h), thus, setting a pageblock to MIGRATE_ISOLATE overwrites its original migratetype. This causes pageblock migratetype loss during alloc_contig_range() and memory offline, especially when the process fails due to a failed pageblock isolation and the code tries to undo the finished pageblock isolations.
In terms of performance for changing pageblock types, no performance change is observed:
1. I used perf to collect stats of offlining and onlining all memory of a 40GB VM 10 times and see that get_pfnblock_flags_mask() and set_pfnblock_flags_mask() take about 0.12% and 0.02% of the whole process respectively with and without this patchset across 3 runs.
2. I used perf to collect stats of dd from /dev/random to a 40GB tmpfs file and find get_pfnblock_flags_mask() takes about 0.05% of the process with and without this patchset across 3 runs.
This patch (of 6):
No functional change is intended.
1. Add __NR_PAGEBLOCK_BITS for the number of pageblock flag bits and use roundup_pow_of_two(__NR_PAGEBLOCK_BITS) as NR_PAGEBLOCK_BITS to take right amount of bits for pageblock flags.
2. Rename PB_migrate_skip to PB_compact_skip.
3. Add {get,set,clear}_pfnblock_bit() to operate one a standalone bit, like PB_compact_skip.
3. Make {get,set}_pfnblock_flags_mask() internal functions and use {get,set}_pfnblock_migratetype() for pageblock migratetype operations.
4. Move pageblock flags common code to get_pfnblock_bitmap_bitidx().
3. Use MIGRATETYPE_MASK to get the migratetype of a pageblock from its flags.
4. Use PB_migrate_end in the definition of MIGRATETYPE_MASK instead of PB_migrate_bits.
5. Add a comment on is_migrate_cma_folio() to prevent one from changing it to use get_pageblock_migratetype() and causing issues.
---
Documentation/mm/physical_memory.rst | 2 include/linux/mmzone.h | 18 +- include/linux/page-isolation.h | 2 include/linux/pageblock-flags.h | 34 ++-- mm/memory_hotplug.c | 2 mm/page_alloc.c | 171 +++++++++++++++++++------ 6 files changed, 162 insertions(+), 67 deletions(-)
Documentation/mm/physical_memory.rst renamed from Documentation/mm/physical_memory.rst~mm-page_alloc-pageblock-flags-functions-clean-up +1 -1
@@ -584,7 +584,7 @@ Compaction control ``compact_blockskip_flush`` Set to true when compaction migration scanner and free scanner meet, which - means the ``PB_migrate_skip`` bits should be cleared. + means the ``PB_compact_skip`` bits should be cleared. ``contiguous`` Set to true when the zone is contiguous (in other words, no hole).
include/linux/mmzone.h renamed from include/linux/mmzone.h~mm-page_alloc-pageblock-flags-functions-clean-up +10 -8
@@ -92,8 +92,12 @@ extern const char * const migratetype_na#ifdef CONFIG_CMA # define is_migrate_cma (migratetype) unlikely((migratetype) == MIGRATE_CMA)# define is_migrate_cma_page (_page) (get_pageblock_migratetype(_page) == MIGRATE_CMA) -# define is_migrate_cma_folio (folio, pfn) (MIGRATE_CMA == \ - get_pfnblock_flags_mask(&folio->page, pfn, MIGRATETYPE_MASK)) +/* +* __dump_folio() in mm/debug.c passes a folio pointer to on-stack struct folio, +* so folio_pfn() cannot be used and pfn is needed. +*/ +# define is_migrate_cma_folio (folio, pfn) \ + (get_pfnblock_migratetype(&folio->page, pfn) == MIGRATE_CMA)#else # define is_migrate_cma (migratetype) false# define is_migrate_cma_page (_page) false
@@ -122,14 +126,12 @@ static inline bool migratetype_is_mergeaextern int page_group_by_mobility_disabled; -#define MIGRATETYPE_MASK ((1UL << PB_migratetype_bits) - 1) +#define get_pageblock_migratetype (page) \ + get_pfnblock_migratetype(page, page_to_pfn(page)) -#define get_pageblock_migratetype (page) \ - get_pfnblock_flags_mask(page, page_to_pfn(page), MIGRATETYPE_MASK) +#define folio_migratetype (folio) \ + get_pageblock_migratetype(&folio->page) -#define folio_migratetype (folio) \ - get_pfnblock_flags_mask(&folio->page, folio_pfn(folio), \ - MIGRATETYPE_MASK)struct free_area {struct list_head free_list[MIGRATE_TYPES ];unsigned long nr_free;
include/linux/pageblock-flags.h renamed from include/linux/pageblock-flags.h~mm-page_alloc-pageblock-flags-functions-clean-up +17 -17
@@ -19,15 +19,19 @@ enum pageblock_bits { PB_migrate, PB_migrate_end = PB_migrate + PB_migratetype_bits -1 ,/* 3 bits required for migrate types */ - PB_migrate_skip,/* If set the block is skipped by compaction */ + PB_compact_skip,/* If set the block is skipped by compaction */ /* * Assume the bits will always align on a word. If this assumption * changes then get/set pageblock needs updating. */ - NR_PAGEBLOCK_BITS + __NR_PAGEBLOCK_BITS }; +#define NR_PAGEBLOCK_BITS (roundup_pow_of_two(__NR_PAGEBLOCK_BITS)) + +#define MIGRATETYPE_MASK ((1UL << (PB_migrate_end + 1)) - 1) +#if defined(CONFIG_HUGETLB_PAGE )#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
@@ -65,27 +69,23 @@ extern unsigned int pageblock_order;/* Forward declaration */ struct page ; -unsigned long get_pfnblock_flags_mask (const struct page *page, -unsigned long pfn, -unsigned long mask); - -void set_pfnblock_flags_mask (struct page *page, -unsigned long flags, -unsigned long pfn, -unsigned long mask); +enum migratetype get_pfnblock_migratetype (const struct page *page, +unsigned long pfn); +bool get_pfnblock_bit (const struct page *page,unsigned long pfn, +enum pageblock_bits pb_bit); +void set_pfnblock_bit (const struct page *page,unsigned long pfn, +enum pageblock_bits pb_bit); +void clear_pfnblock_bit (const struct page *page,unsigned long pfn, +enum pageblock_bits pb_bit);/* Declarations for getting and setting flags. See mm/page_alloc.c */ #ifdef CONFIG_COMPACTION #define get_pageblock_skip (page) \ - get_pfnblock_flags_mask(page, page_to_pfn(page), \ - (1 << (PB_migrate_skip))) + get_pfnblock_bit(page, page_to_pfn(page), PB_compact_skip)#define clear_pageblock_skip (page) \ - set_pfnblock_flags_mask(page, 0, page_to_pfn(page), \ - (1 << PB_migrate_skip)) + clear_pfnblock_bit(page, page_to_pfn(page), PB_compact_skip)#define set_pageblock_skip (page) \ - set_pfnblock_flags_mask(page, (1 << PB_migrate_skip), \ - page_to_pfn(page), \ - (1 << PB_migrate_skip)) + set_pfnblock_bit(page, page_to_pfn(page), PB_compact_skip)#else static inline bool get_pageblock_skip (struct page *page) {
include/linux/page-isolation.h renamed from include/linux/page-isolation.h~mm-page_alloc-pageblock-flags-functions-clean-up +1 -1
@@ -25,7 +25,7 @@ static inline bool is_migrate_isolate(in#define MEMORY_OFFLINE 0x1#define REPORT_FAILURE 0x2 -void set_pageblock_migratetype (struct page *page,int migratetype); +void set_pageblock_migratetype (struct page *page,enum migratetype migratetype);bool move_freepages_block_isolate (struct zone *zone,struct page *page,int migratetype);
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-page_alloc-pageblock-flags-functions-clean-up +1 -1
@@ -774,7 +774,7 @@ void move_pfn_range_to_zone(struct zone/* * TODO now we have a visible range of pages which are not associated -* with their zone properly. Not nice but set_pfnblock_flags_mask +* with their zone properly. Not nice but set_pfnblock_migratetype() * expects the zone spans the pfn range. All the pages in the range * are reserved so nobody should be touching them so we should be safe */
mm/page_alloc.c renamed from mm/page_alloc.c~mm-page_alloc-pageblock-flags-functions-clean-up +132 -39
241 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are
selftests-mm-fix-split_huge_page_test-for-folio_split-tests.patch mm-huge_memory-move-unrelated-code-out-of-__split_unmapped_folio.patch mm-huge_memory-use-folio_expected_ref_count-to-calculate-ref_count.patch