mm: remove pfn_valid_within() and CONFIG_HOLES_IN_ZONE
Subsystems (6)
Mike Rapoport
reviewercover mm: remove pfn_valid_within() and CONFIG_HOLES_IN_ZONE
From: Mike Rapoport <[email protected]>
Hi,
After recent updates to freeing unused parts of the memory map, no architecture can have holes in the memory map within a pageblock. This makes pfn_valid_within() check and CONFIG_HOLES_IN_ZONE configuration option redundant.
The first patch removes them both in a mechanical way and the second patch simplifies memory_hotplug::test_pages_in_a_zone() that had pfn_valid_within() surrounded by more logic than simple if.
Mike Rapoport (2):
mm: remove pfn_valid_within() and CONFIG_HOLES_IN_ZONE
mm: memory_hotplug: cleanup after removal of pfn_valid_within()
drivers/base/node.c | 2 -- include/linux/mmzone.h | 12 ------------ mm/Kconfig | 3 --- mm/compaction.c | 20 +++++++------------- mm/memory_hotplug.c | 13 +++---------- mm/page_alloc.c | 24 ++---------------------- mm/page_isolation.c | 7 +------ mm/page_owner.c | 14 +------------- 8 files changed, 14 insertions(+), 81 deletions(-)
base-commit: e73f0f0ee7541171d89f2e2491130c7771ba58d3
Signature · 1 line
2.28.0
Mike Rapoport
reviewerPATCH 1/2 mm: remove pfn_valid_within() and CONFIG_HOLES_IN_ZONE
From: Mike Rapoport <[email protected]>
After recent changes in freeing of the unused parts of the memory map and rework of pfn_valid() in arm and arm64 there are no architectures that can have holes in the memory map within a pageblock and so nothing can enable CONFIG_HOLES_IN_ZONE which guards non trivial implementation of pfn_valid_within().
With that, pfn_valid_within() is always hardwired to 1 and can be completely removed.
Remove calls to pfn_valid_within() and CONFIG_HOLES_IN_ZONE.
--- drivers/base/node.c | 2 -- include/linux/mmzone.h | 12 ------------ mm/Kconfig | 3 --- mm/compaction.c | 20 +++++++------------- mm/memory_hotplug.c | 4 ---- mm/page_alloc.c | 24 ++---------------------- mm/page_isolation.c | 7 +------ mm/page_owner.c | 14 +------------- 8 files changed, 11 insertions(+), 75 deletions(-)
drivers/base/node.c +0 -2
@@ -768,8 +768,6 @@ int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE static int __ref get_nid_for_pfn (unsigned long pfn) { -if (!pfn_valid_within (pfn)) -return -1 ;#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT if (system_state <SYSTEM_RUNNING )return early_pfn_to_nid (pfn);
include/linux/mmzone.h +0 -12
@@ -1525,18 +1525,6 @@ void sparse_init(void);#define subsection_map_init (_pfn, _nr_pages) do {} while (0)#endif /* CONFIG_SPARSEMEM */ -/* -* If it is possible to have holes within a MAX_ORDER_NR_PAGES, then we -* need to check pfn validity within that MAX_ORDER_NR_PAGES block. -* pfn_valid_within() should be used in this case; we optimise this away -* when we have no holes within a MAX_ORDER_NR_PAGES block. -*/ -#ifdef CONFIG_HOLES_IN_ZONE -#define pfn_valid_within (pfn) pfn_valid(pfn) -#else -#define pfn_valid_within (pfn) (1) -#endif -#endif /* !__GENERATING_BOUNDS.H */ #endif /* !__ASSEMBLY__ */ #endif /* _LINUX_MMZONE_H */
mm/Kconfig +0 -3
@@ -96,9 +96,6 @@ config HAVE_FAST_GUP depends on MMU bool -config HOLES_IN_ZONE - bool - # Don't discard allocated memory used to track "memory" and "reserved" memblocks # after early boot, so it can still be used to test for validity of memory. # Also, memblocks are updated with memory hot(un)plug.
mm/compaction.c +7 -13
@@ -306,16 +306,14 @@ __reset_isolation_pfn(struct zone *zone, unsigned long pfn, bool check_source,* is necessary for the block to be a migration source/target. */ do { - if (pfn_valid_within(pfn)) { - if (check_source && PageLRU(page)) { - clear_pageblock_skip(page); - return true; - } + if (check_source && PageLRU(page)) { + clear_pageblock_skip(page); + return true; + } - if (check_target && PageBuddy(page)) { - clear_pageblock_skip(page); - return true; - } + if (check_target && PageBuddy(page)) { + clear_pageblock_skip(page); + return true; } page += (1 << PAGE_ALLOC_COSTLY_ORDER);
@@ -585,8 +583,6 @@ static unsigned long isolate_freepages_block(struct compact_control *cc,break ; nr_scanned++; -if (!pfn_valid_within (blockpfn)) - goto isolate_fail;/* * For compound pages such as THP and hugetlbfs, we can save
@@ -885,8 +881,6 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,cond_resched (); } -if (!pfn_valid_within (low_pfn)) - goto isolate_fail; nr_scanned++; page =pfn_to_page (low_pfn);
mm/memory_hotplug.c +0 -4
@@ -1308,10 +1308,6 @@ struct zone *test_pages_in_a_zone(unsigned long start_pfn,for (; pfn < sec_end_pfn && pfn < end_pfn; pfn +=MAX_ORDER_NR_PAGES ) { i =0 ; -/* This is just a CONFIG_HOLES_IN_ZONE check.*/ -while ((i <MAX_ORDER_NR_PAGES ) && - !pfn_valid_within (pfn + i)) - i++;if (i ==MAX_ORDER_NR_PAGES || pfn + i >= end_pfn)continue ;/* Check if we got outside of the zone */
mm/page_alloc.c +2 -22
@@ -594,8 +594,6 @@ static int page_outside_zone_boundaries(struct zone *zone, struct page *page)static int page_is_consistent (struct zone *zone,struct page *page) { -if (!pfn_valid_within (page_to_pfn (page))) -return 0 ;if (zone !=page_zone (page))return 0 ;
@@ -1022,16 +1020,12 @@ buddy_merge_likely(unsigned long pfn, unsigned long buddy_pfn,if (order >=MAX_ORDER -2 )return false; -if (!pfn_valid_within (buddy_pfn)) -return false; - combined_pfn = buddy_pfn & pfn; higher_page = page + (combined_pfn - pfn); buddy_pfn =__find_buddy_pfn (combined_pfn, order +1 ); higher_buddy = higher_page + (buddy_pfn - combined_pfn); -return pfn_valid_within (buddy_pfn) && -page_is_buddy (higher_page, higher_buddy, order +1 ); +return page_is_buddy (higher_page, higher_buddy, order +1 ); }/*
@@ -1092,8 +1086,6 @@ static inline void __free_one_page(struct page *page, buddy_pfn =__find_buddy_pfn (pfn, order); buddy = page + (buddy_pfn - pfn); -if (!pfn_valid_within (buddy_pfn)) - goto done_merging;if (!page_is_buddy (page, buddy, order)) goto done_merging;/*
@@ -1751,9 +1743,7 @@ void __init memblock_free_pages(struct page *page, unsigned long pfn,/* * Check that the whole (or subset of) a pageblock given by the interval of * [start_pfn, end_pfn) is valid and within the same zone, before scanning it -* with the migration of free compaction scanner. The scanners then need to -* use only pfn_valid_within() check for arches that allow holes within -* pageblocks. +* with the migration of free compaction scanner. * * Return struct page pointer of start_pfn, or NULL if checks were not passed. *
@@ -1869,8 +1859,6 @@ static inline void __init pgdat_init_report_one_done(void)*/ static inline bool __init deferred_pfn_valid (unsigned long pfn) { -if (!pfn_valid_within (pfn)) -return false;if (!(pfn & (pageblock_nr_pages -1 )) && !pfn_valid (pfn))return false;return true;
@@ -2517,11 +2505,6 @@ static int move_freepages(struct zone *zone,int pages_moved =0 ;for (pfn = start_pfn; pfn <= end_pfn;) { -if (!pfn_valid_within (pfn)) { - pfn++; -continue ; - } - page =pfn_to_page (pfn);if (!PageBuddy (page)) {/*
@@ -8798,9 +8781,6 @@ struct page *has_unmovable_pages(struct zone *zone, struct page *page, }for (; iter < pageblock_nr_pages - offset; iter++) { -if (!pfn_valid_within (pfn + iter)) -continue ; - page =pfn_to_page (pfn + iter);/*
mm/page_isolation.c +1 -6
@@ -93,8 +93,7 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype) buddy_pfn =__find_buddy_pfn (pfn, order); buddy = page + (buddy_pfn - pfn); -if (pfn_valid_within (buddy_pfn) && - !is_migrate_isolate_page (buddy)) { +if (!is_migrate_isolate_page (buddy)) {__isolate_free_page (page, order); isolated_page = true; }
@@ -250,10 +249,6 @@ __test_page_isolated_in_pageblock(unsigned long pfn, unsigned long end_pfn,struct page *page;while (pfn < end_pfn) { -if (!pfn_valid_within (pfn)) { - pfn++; -continue ; - } page =pfn_to_page (pfn);if (PageBuddy (page))/*
mm/page_owner.c +1 -13
@@ -276,9 +276,6 @@ void pagetypeinfo_showmixedcount_print(struct seq_file *m, pageblock_mt =get_pageblock_migratetype (page);for (; pfn < block_end_pfn; pfn++) { -if (!pfn_valid_within (pfn)) -continue ; -/* The pageblock is online, no need to recheck. */ page =pfn_to_page (pfn);
@@ -479,10 +476,6 @@ read_page_owner(struct file *file, char __user *buf, size_t count, loff_t *ppos)continue ; } -/* Check for holes within a MAX_ORDER area */ -if (!pfn_valid_within (pfn)) -continue ; - page =pfn_to_page (pfn);if (PageBuddy (page)) {unsigned long freepage_order =buddy_order_unsafe (page);
@@ -560,14 +553,9 @@ static void init_pages_in_zone(pg_data_t *pgdat, struct zone *zone) block_end_pfn =min (block_end_pfn, end_pfn);for (; pfn < block_end_pfn; pfn++) { -struct page *page; +struct page *page =pfn_to_page (pfn);struct page_ext *page_ext; -if (!pfn_valid_within (pfn)) -continue ; - - page =pfn_to_page (pfn); -if (page_zone (page) != zone)continue ;
Signature · 1 line
2.28.0
Quoted 8 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
After recent changes in freeing of the unused parts of the memory map and rework of
pfn_valid()in arm and arm64 there are no architectures that can have holes in the memory map within a pageblock and so nothing can enableCONFIG_HOLES_IN_ZONEwhich guards non trivial implementation ofpfn_valid_within().
Quoted 6 lines
With that,
pfn_valid_within()is always hardwired to 1 and can be completely removed.Remove calls to
pfn_valid_within()andCONFIG_HOLES_IN_ZONE.Signed-off-by Mike Rapoport <[email protected]>
There is currently the discussion to increase MAX_ORDER, for example, to cover 1GiB instead of 4MiB on x86-64. This would mean that we could suddenly, again, have holes insides MAX_ORDER - 1 pages.
So I assume if we ever go down that path, we'll need something like this again.
For now, this looks like the right thing to do
Signature · 3 lines
Thanks, David / dhildenb
Mike Rapoport
reviewerQuoted 14 lines · David Hildenbrand
Quoted 13 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
After recent changes in freeing of the unused parts of the memory map and rework of
pfn_valid()in arm and arm64 there are no architectures that can have holes in the memory map within a pageblock and so nothing can enableCONFIG_HOLES_IN_ZONEwhich guards non trivial implementation ofpfn_valid_within().With that,
pfn_valid_within()is always hardwired to 1 and can be completely removed.Remove calls to
pfn_valid_within()andCONFIG_HOLES_IN_ZONE.
Quoted 8 lines
Quoted 1 line
Signed-off-by Mike Rapoport <[email protected]>There is currently the discussion to increase
MAX_ORDER, for example, to cover 1GiB instead of 4MiB on x86-64. This would mean that we could suddenly, again, have holes insidesMAX_ORDER- 1 pages.So I assume if we ever go down that path, we'll need something like this again.
It depends whether pageblock_order will be also increased. PFN walkers rely on continuity of pageblocks rather than MAX_ORDER chunks, so if pageblock_order won't change, there won't be need to check for pfn_valid() inside a pageblock.
Quoted 3 lines
For now, this looks like the right thing to do
Thanks!
Signature · 2 lines
Sincerely yours, Mike.
Quoted 21 lines · Mike Rapoport
Quoted 20 lines · David Hildenbrand
Quoted 8 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
After recent changes in freeing of the unused parts of the memory map and rework of
pfn_valid()in arm and arm64 there are no architectures that can have holes in the memory map within a pageblock and so nothing can enableCONFIG_HOLES_IN_ZONEwhich guards non trivial implementation ofpfn_valid_within().Quoted 6 lines
With that,
pfn_valid_within()is always hardwired to 1 and can be completely removed.Remove calls to
pfn_valid_within()andCONFIG_HOLES_IN_ZONE.Signed-off-by Mike Rapoport <[email protected]>There is currently the discussion to increase
MAX_ORDER, for example, to cover 1GiB instead of 4MiB on x86-64. This would mean that we could suddenly, again, have holes insidesMAX_ORDER- 1 pages.
Quoted 7 lines
Quoted 2 lines
So I assume if we ever go down that path, we'll need something like this again.
It depends whether
pageblock_orderwill be also increased. PFN walkers rely on continuity of pageblocks rather thanMAX_ORDERchunks, so ifpageblock_orderwon't change, there won't be need to check forpfn_valid()inside a pageblock.
I'm pushing for letting pageblocks stay untouched, so good to know!
(we still have this crazy special case of pageblocks > MAX_ORDER - 1 right now, which I think we should just eliminate)
Signature · 3 lines
Thanks, David / dhildenb
Zi Yan
reviewerQuoted 25 lines · David Hildenbrand
Quoted 24 lines · Mike Rapoport
Quoted 22 lines · David Hildenbrand
Quoted 8 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
After recent changes in freeing of the unused parts of the memory map and rework of
pfn_valid()in arm and arm64 there are no architectures that can have holes in the memory map within a pageblock and so nothing can enableCONFIG_HOLES_IN_ZONEwhich guards non trivial implementation ofpfn_valid_within().Quoted 6 lines
With that,
pfn_valid_within()is always hardwired to 1 and can be completely removed.Remove calls to
pfn_valid_within()andCONFIG_HOLES_IN_ZONE.Signed-off-by Mike Rapoport <[email protected]>There is currently the discussion to increase
MAX_ORDER, for example, to cover 1GiB instead of 4MiB on x86-64. This would mean that we could suddenly, again, have holes insidesMAX_ORDER- 1 pages.So I assume if we ever go down that path, we'll need something like this again.
Quoted 8 lines
Quoted 4 lines
It depends whether
pageblock_orderwill be also increased. PFN walkers rely on continuity of pageblocks rather thanMAX_ORDERchunks, so ifpageblock_orderwon't change, there won't be need to check forpfn_valid()inside a pageblock.I'm pushing for letting pageblocks stay untouched, so good to know!
(we still have this crazy special case of pageblocks >
MAX_ORDER- 1 right now, which I think we should just eliminate)
I am working on this right now. After I increase MAX_ORDER above SECTION_SIZE_BITS, holes can appear in a zone even on x86_64 and pfn_valid_within(), which is currently set to 1, is needed to be pfn_valid(). That seems to be sufficient to make increasing MAX_ORDER work.
For my use case, I might revive pfn_valid_within() if MAX_ORDER is configured to be above SECTION_SIZE_BITS. Let me know if there is any better alternative. Thanks.
—
Best Regards,
Yan, Zi
Mike Rapoport
reviewerPATCH 2/2 mm: memory_hotplug: cleanup after removal of pfn_valid_within()
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
When test_pages_in_a_zone() used pfn_valid_within() is has some logic surrounding pfn_valid_within() checks.
Since pfn_valid_within() is gone, this logic can be removed.
--- mm/memory_hotplug.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
mm/memory_hotplug.c +3 -6
@@ -1298,7 +1298,7 @@ struct zone *test_pages_in_a_zone(unsigned long start_pfn,unsigned long pfn, sec_end_pfn;struct zone *zone =NULL ;struct page *page; -int i; +for (pfn = start_pfn, sec_end_pfn =SECTION_ALIGN_UP (start_pfn +1 ); pfn < end_pfn; pfn = sec_end_pfn, sec_end_pfn +=PAGES_PER_SECTION ) {
@@ -1307,13 +1307,10 @@ struct zone *test_pages_in_a_zone(unsigned long start_pfn,continue ;for (; pfn < sec_end_pfn && pfn < end_pfn; pfn +=MAX_ORDER_NR_PAGES ) { - i =0 ; -if (i ==MAX_ORDER_NR_PAGES || pfn + i >= end_pfn) -continue ;/* Check if we got outside of the zone */ -if (zone && !zone_spans_pfn (zone, pfn + i)) +if (zone && !zone_spans_pfn (zone, pfn))return NULL ; - page =pfn_to_page (pfn + i); + page =pfn_to_page (pfn);if (zone &&page_zone (page) != zone)return NULL ; zone =page_zone (page);
Signature · 1 line
2.28.0
Re: [PATCH 2/2] mm: memory_hotplug: cleanup after removal of pfn_valid_within()
Quoted 32 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
When
test_pages_in_a_zone()usedpfn_valid_within()is has some logic surroundingpfn_valid_within()checks.Since
pfn_valid_within()is gone, this logic can be removed.Signed-off-by Mike Rapoport <[email protected]>--- mm/memory_hotplug.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)mm/memory_hotplug.c +1
-3@@ -1298,7 +1298,7 @@ struct zone *test_pages_in_a_zone(unsigned long start_pfn,unsigned long pfn, sec_end_pfn;struct zone *zone =NULL ;struct page *page; -int i; +for (pfn = start_pfn, sec_end_pfn =SECTION_ALIGN_UP (start_pfn +1 ); pfn < end_pfn; pfn = sec_end_pfn, sec_end_pfn +=PAGES_PER_SECTION ) {@@ -1307,13 +1307,10 @@ struct zone *test_pages_in_a_zone(unsigned long start_pfn,continue ;for (; pfn < sec_end_pfn && pfn < end_pfn; pfn +=MAX_ORDER_NR_PAGES ) { - i =0 ; -if (i ==MAX_ORDER_NR_PAGES || pfn + i >= end_pfn)
mm/memory_hotplug.c struct zone *test_pages_in_a_zone(unsigned long start_pfn, · line 1316
Quoted 10 lines
mm/memory_hotplug.c +2
-3-continue ;/* Check if we got outside of the zone */ -if (zone && !zone_spans_pfn (zone, pfn + i)) +if (zone && !zone_spans_pfn (zone, pfn))return NULL ; - page =pfn_to_page (pfn + i); + page =pfn_to_page (pfn);if (zone &&page_zone (page) != zone)return NULL ; zone =page_zone (page);
I'd just squash that into the previous commit.
Signature · 3 lines
Thanks, David / dhildenb