The quilt patch titled Subject: mm/compaction: avoid missing last page block in section after skip offline sections has been removed from the -mm tree. Its filename was mm-compaction-skip-the-memory-hole-rapidly-when-isolating-free-pages-fix.patch This patch was dropped because it was folded into mm-compaction-skip-the-memory-hole-rapidly-when-isolating-free-pages.patch ------------------------------------------------------ From: Kemeng Shi <shikemeng@xxxxxxxxxxxxxxx> Subject: mm/compaction: avoid missing last page block in section after skip offline sections Date: Fri, 4 Aug 2023 19:04:47 +0800 skip_offline_sections_reverse will return the last pfn in found online section. Then we set block_start_pfn to start of page block which contains the last pfn in section. Then we continue, move one page block forward and ignore the last page block in the online section. Make block_start_pfn point to first page block after online section to fix this: 1. make skip_offline_sections_reverse return end pfn of online section, i.e. pfn of page block after online section. 2. assign block_start_pfn with next_pfn. Link: https://lkml.kernel.org/r/20230804110454.2935878-1-shikemeng@xxxxxxxxxxxxxxx Link: https://lkml.kernel.org/r/20230804110454.2935878-2-shikemeng@xxxxxxxxxxxxxxx Fixes: f63224525309 ("mm: compaction: skip the memory hole rapidly when isolating free pages") Signed-off-by: Kemeng Shi <shikemeng@xxxxxxxxxxxxxxx> Acked-by: David Hildenbrand <david@xxxxxxxxxx> Cc: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx> Cc: David Hildenbrand <david@xxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/compaction.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- a/mm/compaction.c~mm-compaction-skip-the-memory-hole-rapidly-when-isolating-free-pages-fix +++ a/mm/compaction.c @@ -250,6 +250,11 @@ static unsigned long skip_offline_sectio return 0; } +/* + * If the PFN falls into an offline section, return the end PFN of the + * next online section in reverse. If the PFN falls into an online section + * or if there is no next online section in reverse, return 0. + */ static unsigned long skip_offline_sections_reverse(unsigned long start_pfn) { unsigned long start_nr = pfn_to_section_nr(start_pfn); @@ -259,7 +264,7 @@ static unsigned long skip_offline_sectio while (start_nr-- > 0) { if (online_section_nr(start_nr)) - return section_nr_to_pfn(start_nr) + PAGES_PER_SECTION - 1; + return section_nr_to_pfn(start_nr) + PAGES_PER_SECTION; } return 0; @@ -1694,8 +1699,7 @@ static void isolate_freepages(struct com next_pfn = skip_offline_sections_reverse(block_start_pfn); if (next_pfn) - block_start_pfn = max(pageblock_start_pfn(next_pfn), - low_pfn); + block_start_pfn = max(next_pfn, low_pfn); continue; } _ Patches currently in -mm which might be from shikemeng@xxxxxxxxxxxxxxx are mm-correct-stale-comment-of-function-check_pte.patch mm-compaction-skip-the-memory-hole-rapidly-when-isolating-free-pages.patch mm-page_table_check-remove-unused-parameters-in-page_table_check_clear.patch mm-page_table_check-remove-unused-parameters-in-page_table_check_set.patch mm-page_table_check-remove-unused-parameter-in-page_table_check_pte_clear.patch mm-page_table_check-remove-unused-parameter-in-page_table_check_pmd_clear.patch mm-page_table_check-remove-unused-parameter-in-page_table_check_pud_clear.patch mm-page_table_check-remove-unused-parameter-in-page_table_check_pte_set.patch mm-page_table_check-remove-unused-parameter-in-page_table_check_pmd_set.patch mm-page_table_check-remove-unused-parameter-in-page_table_check_pud_set.patch mm-page_ext-remove-unused-return-value-of-offline_page_ext.patch mm-page_ext-remove-rollback-for-untouched-mem_section-in-online_page_ext.patch mm-page_ext-move-functions-around-for-minor-cleanups-to-page_ext.patch mm-rmap-correct-stale-comment-of-rmap_walk_anon-and-rmap_walk_file.patch mm-page_ext-add-common-function-to-get-client-data-from-page_ext.patch mm-page_ext-use-page_ext_data-helper-in-page_table_check.patch mm-page_ext-use-page_ext_data-helper-in-page_owner.patch mm-page_poison-remove-unused-page_exth-from-page_poison.patch mm-vmstat-remove-unused-page_exth-from-vmstat.patch mm-page_ext-move-page_ext_operations-definition-under-config_page_extension.patch mm-compaction-set-compact_cached_free_pfn-correctly-in-update_pageblock_skip.patch mm-compaction-remove-unnecessary-cursor-page-in-isolate_freepages_block.patch mm-compaction-remove-unnecessary-else-continue-at-end-of-loop-in-isolate_freepages_block.patch mm-compaction-correct-last_migrated_pfn-update-in-compact_zone.patch mm-compaction-skip-page-block-marked-skip-in-isolate_migratepages_block.patch mm-compaction-correct-comment-of-fast_find_migrateblock-in-isolate_migratepages.patch mm-compaction-correct-comment-of-cached-migrate-pfn-update.patch mm-compaction-correct-comment-to-complete-migration-failure.patch mm-compaction-remove-unnecessary-return-for-void-function.patch mm-compaction-only-set-skip-flag-if-cc-no_set_skip_hint-is-false.patch mm-page_alloc-remove-track-of-active-pcp-lists-range-in-bulk-free.patch mm-page_alloc-remove-unnecessary-parameter-batch-of-nr_pcp_free.patch mm-compaction-remove-unused-parameter-pgdata-of-fragmentation_score_wmark.patch mm-page_alloc-remove-unnecessary-inner-__get_pfnblock_flags_mask.patch mm-page_alloc-use-get_pfnblock_migratetype-to-avoid-extra-page_to_pfn.patch