mm-page_alloc-simplify-pageblock-migratetype-check-in-__free_one_page.patch removed from -mm tree
The quilt patch titled
Subject: mm: page_alloc: simplify pageblock migratetype check in __free_one_page()
has been removed from the -mm tree. Its filename was
mm-page_alloc-simplify-pageblock-migratetype-check-in-__free_one_page.patch
This patch was dropped because it was merged into mm-stable
------------------------------------------------------
From: Zi Yan <[email protected]>
Subject: mm: page_alloc: simplify pageblock migratetype check in __free_one_page()
Move pageblock migratetype check code in the while loop to simplify the logic. It also saves redundant buddy page checking code.
---
mm/page_alloc.c | 46 +++++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 29 deletions(-)
mm/page_alloc.c renamed from mm/page_alloc.c~mm-page_alloc-simplify-pageblock-migratetype-check-in-__free_one_page +17 -29
@@ -1053,7 +1053,6 @@ static inline void __free_one_page(struc int migratetype, fpi_t fpi_flags) {struct capture_control *capc =task_capc (zone); -unsigned int max_order = pageblock_order;unsigned long buddy_pfn;unsigned long combined_pfn;struct page *buddy;
@@ -1069,8 +1068,7 @@ static inline void __free_one_page(strucVM_BUG_ON_PAGE (pfn & ((1 << order) -1 ), page);VM_BUG_ON_PAGE (bad_range (zone, page), page); -continue_merging: -while (order < max_order) { +while (order <MAX_ORDER -1 ) {if (compaction_capture (capc, page, order, migratetype)) {__mod_zone_freepage_state (zone, -(1 << order), migratetype);
@@ -1081,6 +1079,22 @@ continue_merging:if (!page_is_buddy (page, buddy, order)) goto done_merging; + +if (unlikely (order >= pageblock_order)) { +/* +* We want to prevent merge between freepages on pageblock +* without fallbacks and normal pageblock. Without this, +* pageblock isolation could cause incorrect freepage or CMA +* accounting or HIGHATOMIC accounting. +*/ +int buddy_mt =get_pageblock_migratetype (buddy); + +if (migratetype != buddy_mt + && (!migratetype_is_mergeable (migratetype) || + !migratetype_is_mergeable (buddy_mt))) + goto done_merging; + } +/* * Our buddy is free or it is CONFIG_DEBUG_PAGEALLOC guard page, * merge with it and move up one order.
@@ -1094,32 +1108,6 @@ continue_merging: pfn = combined_pfn; order++; } -if (order <MAX_ORDER -1 ) { -/* If we are here, it means order is >= pageblock_order. -* We want to prevent merge between freepages on pageblock -* without fallbacks and normal pageblock. Without this, -* pageblock isolation could cause incorrect freepage or CMA -* accounting or HIGHATOMIC accounting. -* -* We don't want to hit this code for the more frequent -* low-order merging. -*/ -int buddy_mt; - - buddy_pfn =__find_buddy_pfn (pfn, order); - buddy = page + (buddy_pfn - pfn); - -if (!page_is_buddy (page, buddy, order)) - goto done_merging; - buddy_mt =get_pageblock_migratetype (buddy); - -if (migratetype != buddy_mt - && (!migratetype_is_mergeable (migratetype) || - !migratetype_is_mergeable (buddy_mt))) - goto done_merging; - max_order = order +1 ; - goto continue_merging; - } done_merging:set_buddy_order (page, order);
_
Patches currently in -mm which might be from [email protected] are
mm-page_isolation-move-has_unmovable_pages-to-mm-page_isolationc.patch mm-page_isolation-check-specified-range-for-unmovable-pages.patch mm-make-alloc_contig_range-work-at-pageblock-granularity.patch mm-make-alloc_contig_range-work-at-pageblock-granularity-fix.patch mm-page_isolation-enable-arbitrary-range-page-isolation.patch mm-cma-use-pageblock_order-as-the-single-alignment.patch drivers-virtio_mem-use-pageblock-size-as-the-minimum-virtio_mem-size.patch