Commit 1bc3587a authored by Zi Yan's avatar Zi Yan Committed by Andrew Morton
Browse files

mm/page_alloc: add support for initializing pageblock as isolated 

MIGRATE_ISOLATE is a standalone bit, so a pageblock cannot be initialized
to just MIGRATE_ISOLATE.  Add init_pageblock_migratetype() to enable
initialize a pageblock with a migratetype and isolated.

Link: https://lkml.kernel.org/r/20250617021115.2331563-4-ziy@nvidia.com


Signed-off-by: default avatarZi Yan <ziy@nvidia.com>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Brendan Jackman <jackmanb@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kirill A. Shuemov <kirill.shutemov@linux.intel.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Richard Chang <richardycc@google.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e904bce2

include/linux/memory_hotplug.h

+2 −1
Original line number Diff line number Diff line
@@ -314,7 +314,8 @@ extern int add_memory_driver_managed(int nid, u64 start, u64 size, 
				     mhp_t mhp_flags);

extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,

				   unsigned long nr_pages,

				   struct vmem_altmap *altmap, int migratetype);

				   struct vmem_altmap *altmap, int migratetype,

				   bool isolate_pageblock);

extern void remove_pfn_range_from_zone(struct zone *zone,

				       unsigned long start_pfn,

				       unsigned long nr_pages);

include/linux/page-isolation.h

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ static inline void set_pageblock_isolate(struct page *page) 
#define MEMORY_OFFLINE	0x1

#define REPORT_FAILURE	0x2



void __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,

kernel/kexec_handover.c

+2 −2
Original line number Diff line number Diff line
@@ -1100,8 +1100,8 @@ static void __init kho_release_scratch(void) 
		ulong pfn;



		for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages)

			set_pageblock_migratetype(pfn_to_page(pfn),

						  MIGRATE_CMA);

			init_pageblock_migratetype(pfn_to_page(pfn),

						   MIGRATE_CMA, false);

	}

}

mm/hugetlb.c

+2 −2
Original line number Diff line number Diff line
@@ -3297,8 +3297,8 @@ static void __init hugetlb_bootmem_init_migratetype(struct folio *folio, 
		if (folio_test_hugetlb_cma(folio))

			init_cma_pageblock(folio_page(folio, i));

		else

			set_pageblock_migratetype(folio_page(folio, i),

					  MIGRATE_MOVABLE);

			init_pageblock_migratetype(folio_page(folio, i),

					  MIGRATE_MOVABLE, false);

	}

}

mm/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -820,7 +820,8 @@ extern void *memmap_alloc(phys_addr_t size, phys_addr_t align, 
			  int nid, bool exact_nid);



void memmap_init_range(unsigned long, int, unsigned long, unsigned long,

		unsigned long, enum meminit_context, struct vmem_altmap *, int);

		unsigned long, enum meminit_context, struct vmem_altmap *, int,

		bool);



#if defined CONFIG_COMPACTION || defined CONFIG_CMA