Extend pageblock_data flags with PB_has_unmovable, PB_has_reclaimable, and PB_has_movable bits to track the actual types of pages allocated within a pageblock, independent of its intended migratetype. The flags are set at steal time in try_to_claim_block(), avoiding overhead on every allocation in __rmqueue_smallest(): 1. Allocation / steal time: when try_to_claim_block() claims a pageblock, set the PB_has_* flag corresponding to the allocation's migratetype. If unmovable or reclaimable pages are being placed into a pageblock that already has PB_has_movable set, queue async evacuation of the remaining movable pages. 2. Full pageblock free: when buddy merging reconstructs a complete pageblock in __free_one_page(), clear all PB_has_* flags since the block is now empty. 3. Migration scan: when isolate_migratepages_block() completes a full pageblock scan and finds no movable pages to isolate, clear PB_has_movable. This consolidates the clearing for all callers: evacuate_pageblock(), compaction, and alloc_contig_range(). This provides the foundation for superpageblock-level steering decisions: knowing which pageblocks actually contain unmovable/reclaimable pages allows directing future allocations to already-tainted regions, keeping clean regions available for large contiguous allocations. Signed-off-by: Rik van Riel Assisted-by: Claude:claude-opus-4.7 syzkaller --- include/linux/pageblock-flags.h | 9 ++++ mm/compaction.c | 17 ++++++ mm/page_alloc.c | 93 +++++++++++++++++++++++++-------- 3 files changed, 98 insertions(+), 21 deletions(-) diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h index e046278a01fa..21bfcdf80b2e 100644 --- a/include/linux/pageblock-flags.h +++ b/include/linux/pageblock-flags.h @@ -20,6 +20,15 @@ enum pageblock_bits { PB_migrate_2, PB_compact_skip,/* If set the block is skipped by compaction */ + /* + * Track actual page contents independent of the intended migratetype. + * Set at allocation time; cleared on full pageblock free or when + * migration confirms no pages of that type remain. + */ + PB_has_unmovable, + PB_has_reclaimable, + PB_has_movable, + #ifdef CONFIG_MEMORY_ISOLATION /* * Pageblock isolation is represented with a separate bit, so that diff --git a/mm/compaction.c b/mm/compaction.c index 3648ce22c807..e8ca651e2b07 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -867,6 +867,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, bool skip_on_failure = false; unsigned long next_skip_pfn = 0; bool skip_updated = false; + bool movable_skipped = false; int ret = 0; cc->migrate_pfn = low_pfn; @@ -1079,6 +1080,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, folio = page_folio(page); goto isolate_success; } + movable_skipped = true; } goto isolate_fail; @@ -1246,6 +1248,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, lruvec_unlock_irqrestore(locked, flags); locked = NULL; } + movable_skipped = true; folio_put(folio); isolate_fail: @@ -1309,6 +1312,20 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, if (!cc->no_set_skip_hint && valid_page && !skip_updated) set_pageblock_skip(valid_page); update_cached_migrate(cc, low_pfn); + + /* + * Full pageblock scanned with no movable pages isolated. + * Only clear PB_has_movable if no movable pages were + * seen at all. If movable pages exist but could not be + * isolated (pinned, writeback, dirty, etc.), leave the + * flag set so a future migration attempt can try again. + */ + if (!nr_isolated && !movable_skipped && valid_page && + get_pfnblock_bit(valid_page, pageblock_start_pfn(start_pfn), + PB_has_movable)) + clear_pfnblock_bit(valid_page, + pageblock_start_pfn(start_pfn), + PB_has_movable); } trace_mm_compaction_isolate_migratepages(start_pfn, low_pfn, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0f3d734bd296..23108cdcbbec 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -928,6 +928,30 @@ static void change_pageblock_range(struct page *pageblock_page, } } +/* + * mark_pageblock_free - handle a pageblock becoming fully free + * @page: page at the start of the pageblock + * @pfn: page frame number + * + * Clear stale PCP ownership and actual-contents tracking flags when + * buddy merging reconstructs a full pageblock or a whole pageblock is + * freed directly. No PCP can still hold pages from this block (otherwise + * the buddy merge couldn't have completed), so the ownership entry would + * just cause misrouted frees. + */ +static void mark_pageblock_free(struct page *page, unsigned long pfn) +{ + clear_pcpblock_owner(page); + + /* + * The entire block is now free -- clear actual-contents tracking + * flags since no allocated pages remain. + */ + clear_pfnblock_bit(page, pfn, PB_has_unmovable); + clear_pfnblock_bit(page, pfn, PB_has_reclaimable); + clear_pfnblock_bit(page, pfn, PB_has_movable); +} + /* * Freeing function for a buddy system allocator. * @@ -973,19 +997,14 @@ static inline void __free_one_page(struct page *page, account_freepages(zone, 1 << order, migratetype); /* - * For whole blocks, ownership returns to the zone. There are - * no more outstanding frees to route through that CPU's PCP, - * and we don't want to confuse any future users of the pages - * in this block. E.g. rmqueue_buddy(). - * - * Check here if a whole block came in directly: pre-merged in - * the PCP, or PCP contended and bypassed. - * - * There is another check in the loop below if a block merges - * up with pages already on the zone buddy. + * When freeing a whole pageblock, clear stale PCP ownership + * and actual-contents tracking flags up front. The in-loop + * check only fires when sub-pageblock pages merge *up to* + * pageblock_order, not when entering at pageblock_order + * directly. */ if (order == pageblock_order) - clear_pcpblock_owner(page); + mark_pageblock_free(page, pfn); while (order < MAX_PAGE_ORDER) { int buddy_mt = migratetype; @@ -1037,9 +1056,13 @@ static inline void __free_one_page(struct page *page, pfn = combined_pfn; order++; - /* Clear owner also when we merge up. See above */ + /* + * If merging has reconstructed a full pageblock, + * clear any stale PCP ownership and actual-contents + * tracking flags. + */ if (order == pageblock_order) - clear_pcpblock_owner(page); + mark_pageblock_free(page, pfn); } done_merging: @@ -2433,6 +2456,9 @@ try_to_claim_block(struct zone *zone, struct page *page, { int free_pages, movable_pages, alike_pages; unsigned long start_pfn; +#ifdef CONFIG_COMPACTION + struct page *start_page; +#endif /* * Don't steal from pageblocks that are isolated for @@ -2488,15 +2514,29 @@ try_to_claim_block(struct zone *zone, struct page *page, set_pageblock_migratetype(pfn_to_page(start_pfn), start_type); #ifdef CONFIG_COMPACTION /* - * A movable pageblock was just claimed for unmovable or - * reclaimable use. Queue async evacuation of the remaining - * movable pages so future unmovable/reclaimable allocations - * can stay concentrated in fewer pageblocks. + * Track actual page contents in pageblock flags. + * Mark the pageblock with the type being allocated, and + * if unmovable/reclaimable pages are being placed into a + * pageblock that already has movable pages, queue async + * evacuation of the movable pages. */ - if (block_type == MIGRATE_MOVABLE && - (start_type == MIGRATE_UNMOVABLE || - start_type == MIGRATE_RECLAIMABLE)) - queue_pageblock_evacuate(zone, start_pfn); + start_page = pfn_to_page(start_pfn); + if (start_type == MIGRATE_UNMOVABLE) { + set_pfnblock_bit(start_page, start_pfn, + PB_has_unmovable); + if (get_pfnblock_bit(start_page, start_pfn, + PB_has_movable)) + queue_pageblock_evacuate(zone, start_pfn); + } else if (start_type == MIGRATE_RECLAIMABLE) { + set_pfnblock_bit(start_page, start_pfn, + PB_has_reclaimable); + if (get_pfnblock_bit(start_page, start_pfn, + PB_has_movable)) + queue_pageblock_evacuate(zone, start_pfn); + } else if (start_type == MIGRATE_MOVABLE) { + set_pfnblock_bit(start_page, start_pfn, + PB_has_movable); + } #endif return __rmqueue_smallest(zone, order, start_type); } @@ -7307,6 +7347,17 @@ static void evacuate_pageblock(struct zone *zone, unsigned long start_pfn) if (!list_empty(&cc.migratepages)) putback_movable_pages(&cc.migratepages); + + /* + * Re-scan to let isolate_migratepages_block clear PB_has_movable + * if no movable pages remain after evacuation. + */ + cc.migrate_pfn = start_pfn; + cc.nr_migratepages = 0; + INIT_LIST_HEAD(&cc.migratepages); + isolate_migratepages_range(&cc, start_pfn, end_pfn); + if (!list_empty(&cc.migratepages)) + putback_movable_pages(&cc.migratepages); } static void evacuate_work_fn(struct work_struct *work) -- 2.54.0