Commit 4eb29bd9 authored Oct 15, 2020 by David Hildenbrand Committed by Linus Torvalds Oct 16, 2020

mm/page_alloc: drop stale pageblock comment in memmap_init_zone*()



Commit ac5d2539 ("mm: meminit: reduce number of times pageblocks are
set during struct page init") moved the actual zone range check, leaving
only the alignment check for pageblocks.

Let's drop the stale comment and make the pageblock check easier to read.

Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Wei Yang <richard.weiyang@linux.alibaba.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Charan Teja Reddy <charante@codeaurora.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Logan Gunthorpe <logang@deltatee.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michel Lespinasse <walken@google.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20200819175957.28465-9-david@redhat.com


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent aac65321

mm/page_alloc.c

+2 −12

Original line number	Diff line number	Diff line
		@@ -6042,13 +6042,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
		* to reserve their blocks rather than leaking throughout
		* the address space during boot when many long-lived
		* kernel allocations are made.
		*
		* bitmap is created for zone's valid pfn range. but memmap
		* can be created for invalid pages (for alignment)
		* check here not to call set_pageblock_migratetype() against
		* pfn out of zone.
		*/
		if (!(pfn & (pageblock_nr_pages - 1))) {
		if (IS_ALIGNED(pfn, pageblock_nr_pages)) {
		set_pageblock_migratetype(page, MIGRATE_MOVABLE);
		cond_resched();
		}
		@@ -6111,15 +6106,10 @@ void __ref memmap_init_zone_device(struct zone *zone,
		* the address space during boot when many long-lived
		* kernel allocations are made.
		*
		* bitmap is created for zone's valid pfn range. but memmap
		* can be created for invalid pages (for alignment)
		* check here not to call set_pageblock_migratetype() against
		* pfn out of zone.
		*
		* Please note that MEMINIT_HOTPLUG path doesn't clear memmap
		* because this is done early in section_activate()
		*/
		if (!(pfn & (pageblock_nr_pages - 1))) {
		if (IS_ALIGNED(pfn, pageblock_nr_pages)) {
		set_pageblock_migratetype(page, MIGRATE_MOVABLE);
		cond_resched();
		}

Admin message