mm-page_isolation-remove-migratetype-from-move_freepages_block_isolate.patch removed from -mm tree
The quilt patch titled
Subject: mm/page_isolation: remove migratetype from move_freepages_block_isolate()
has been removed from the -mm tree. Its filename was
mm-page_isolation-remove-migratetype-from-move_freepages_block_isolate.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_isolation: remove migratetype from move_freepages_block_isolate()
Date: Mon, 16 Jun 2025 22:11:12 -0400
Since migratetype is no longer overwritten during pageblock isolation, moving a pageblock out of MIGRATE_ISOLATE no longer needs a new migratetype.
Add pageblock_isolate_and_move_free_pages() and pageblock_unisolate_and_move_free_pages() to be explicit about the page isolation operations. Both share the common code in __move_freepages_block_isolate(), which is renamed from move_freepages_block_isolate().
Add toggle_pageblock_isolate() to flip pageblock isolation bit in __move_freepages_block_isolate().
Make set_pageblock_migratetype() only accept non MIGRATE_ISOLATE types, so that one should use set_pageblock_isolate() to isolate pageblocks. As a result, move pageblock migratetype code out of __move_freepages_block().
---
include/linux/page-isolation.h | 5 - mm/page_alloc.c | 80 ++++++++++++++++++++++++------- mm/page_isolation.c | 21 +++----- 3 files changed, 75 insertions(+), 31 deletions(-)
include/linux/page-isolation.h renamed from include/linux/page-isolation.h~mm-page_isolation-remove-migratetype-from-move_freepages_block_isolate +2 -3
@@ -44,10 +44,9 @@ static inline void set_pageblock_isolatevoid __meminit init_pageblock_migratetype (struct page *page,enum migratetype migratetype,bool isolate); -void set_pageblock_migratetype (struct page *page,enum migratetype migratetype); -bool move_freepages_block_isolate (struct zone *zone,struct page *page, -int migratetype); +bool pageblock_isolate_and_move_free_pages (struct zone *zone,struct page *page); +bool pageblock_unisolate_and_move_free_pages (struct zone *zone,struct page *page);int start_isolate_page_range (unsigned long start_pfn,unsigned long end_pfn,int migratetype,int flags);
mm/page_alloc.c renamed from mm/page_alloc.c~mm-page_isolation-remove-migratetype-from-move_freepages_block_isolate +63 -17
157 lines not on this page · raw message
mm/page_isolation.c renamed from mm/page_isolation.c~mm-page_isolation-remove-migratetype-from-move_freepages_block_isolate +10 -11
@@ -188,7 +188,7 @@ static int set_migratetype_isolate(struc unmovable =has_unmovable_pages (check_unmovable_start, check_unmovable_end, migratetype, isol_flags);if (!unmovable) { -if (!move_freepages_block_isolate (zone, page,MIGRATE_ISOLATE )) { +if (!pageblock_isolate_and_move_free_pages (zone, page)) {spin_unlock_irqrestore (&zone->lock, flags);return -EBUSY ; }
@@ -209,7 +209,7 @@ static int set_migratetype_isolate(strucreturn -EBUSY ; } -static void unset_migratetype_isolate (struct page *page,int migratetype) +static void unset_migratetype_isolate (struct page *page) {struct zone *zone;unsigned long flags;
@@ -262,10 +262,10 @@ static void unset_migratetype_isolate(st* Isolating this block already succeeded, so this * should not fail on zone boundaries. */ -WARN_ON_ONCE (!move_freepages_block_isolate (zone, page, migratetype)); +WARN_ON_ONCE (!pageblock_unisolate_and_move_free_pages (zone, page)); }else { -set_pageblock_migratetype (page, migratetype); -__putback_isolated_page (page, order, migratetype); +clear_pageblock_isolate (page); +__putback_isolated_page (page, order,get_pageblock_migratetype (page)); } zone->nr_isolate_pageblock--; out:
@@ -383,7 +383,7 @@ static int isolate_single_pageblock(unsiif (PageBuddy (page)) {int order =buddy_order (page); -/* move_freepages_block_isolate() handled this */ +/* pageblock_isolate_and_move_free_pages() handled this */ VM_WARN_ON_ONCE (pfn + (1 << order) > boundary_pfn); pfn +=1UL << order;
@@ -433,7 +433,7 @@ static int isolate_single_pageblock(unsi failed:/* restore the original migratetype */ if (!skip_isolation) -unset_migratetype_isolate (pfn_to_page (isolate_pageblock), migratetype); +unset_migratetype_isolate (pfn_to_page (isolate_pageblock));return -EBUSY ; }
@@ -504,7 +504,7 @@ int start_isolate_page_range(unsigned lo ret =isolate_single_pageblock (isolate_end, flags, true, skip_isolation, migratetype);if (ret) { -unset_migratetype_isolate (pfn_to_page (isolate_start), migratetype); +unset_migratetype_isolate (pfn_to_page (isolate_start));return ret; }
@@ -517,8 +517,7 @@ int start_isolate_page_range(unsigned lo start_pfn, end_pfn)) {undo_isolate_page_range (isolate_start, pfn, migratetype);unset_migratetype_isolate ( -pfn_to_page (isolate_end - pageblock_nr_pages), - migratetype); +pfn_to_page (isolate_end - pageblock_nr_pages));return -EBUSY ; } }
@@ -548,7 +547,7 @@ void undo_isolate_page_range(unsigned lo page =__first_valid_page (pfn, pageblock_nr_pages);if (!page || !is_migrate_isolate_page (page))continue ; -unset_migratetype_isolate (page, migratetype); +unset_migratetype_isolate (page); } }/*
_
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