Subject: + mm-compaction-cleanup-isolate_freepages.patch added to -mm tree To: vbabka@xxxxxxx,b.zolnierkie@xxxxxxxxxxx,cl@xxxxxxxxx,d.j.shin@xxxxxxxxxxx,iamjoonsoo.kim@xxxxxxx,mgorman@xxxxxxx,mina86@xxxxxxxxxx,minchan@xxxxxxxxxx,n-horiguchi@xxxxxxxxxxxxx,riel@xxxxxxxxxx,sunghwan.yun@xxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 21 Apr 2014 12:41:55 -0700 The patch titled Subject: mm/compaction: cleanup isolate_freepages() has been added to the -mm tree. Its filename is mm-compaction-cleanup-isolate_freepages.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-compaction-cleanup-isolate_freepages.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-compaction-cleanup-isolate_freepages.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Vlastimil Babka <vbabka@xxxxxxx> Subject: mm/compaction: cleanup isolate_freepages() isolate_freepages() is currently somewhat hard to follow thanks to many looks like it is related to the 'low_pfn' variable, but in fact it is not. This patch renames the 'high_pfn' variable to a hopefully less confusing name, and slightly changes its handling without a functional change. A comment made obsolete by recent changes is also updated. Signed-off-by: Vlastimil Babka <vbabka@xxxxxxx> Cc: Minchan Kim <minchan@xxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx> Cc: Michal Nazarewicz <mina86@xxxxxxxxxx> Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> Cc: Christoph Lameter <cl@xxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Dongjun Shin <d.j.shin@xxxxxxxxxxx> Cc: Sunghwan Yun <sunghwan.yun@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/compaction.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff -puN mm/compaction.c~mm-compaction-cleanup-isolate_freepages mm/compaction.c --- a/mm/compaction.c~mm-compaction-cleanup-isolate_freepages +++ a/mm/compaction.c @@ -662,7 +662,7 @@ static void isolate_freepages(struct zon struct compact_control *cc) { struct page *page; - unsigned long high_pfn, low_pfn, pfn, z_end_pfn; + unsigned long pfn, low_pfn, next_free_pfn, z_end_pfn; int nr_freepages = cc->nr_freepages; struct list_head *freelist = &cc->freepages; @@ -679,11 +679,10 @@ static void isolate_freepages(struct zon low_pfn = ALIGN(cc->migrate_pfn + 1, pageblock_nr_pages); /* - * Take care that if the migration scanner is at the end of the zone - * that the free scanner does not accidentally move to the next zone - * in the next isolation cycle. + * Seed the value for max(next_free_pfn, pfn) updates. If there are + * none, the pfn < low_pfn check will kick in. */ - high_pfn = min(low_pfn, pfn); + next_free_pfn = 0; z_end_pfn = zone_end_pfn(zone); @@ -744,7 +743,7 @@ static void isolate_freepages(struct zon */ if (isolated) { cc->finished_update_free = true; - high_pfn = max(high_pfn, pfn); + next_free_pfn = max(next_free_pfn, pfn); } } @@ -756,9 +755,9 @@ static void isolate_freepages(struct zon * so that compact_finished() may detect this */ if (pfn < low_pfn) - cc->free_pfn = max(pfn, zone->zone_start_pfn); - else - cc->free_pfn = high_pfn; + next_free_pfn = max(pfn, zone->zone_start_pfn); + + cc->free_pfn = next_free_pfn; cc->nr_freepages = nr_freepages; } _ Patches currently in -mm which might be from vbabka@xxxxxxx are mm-compaction-make-isolate_freepages-start-at-pageblock-boundary.patch mm-compactionc-isolate_freepages_block-small-tuneup.patch mm-page_alloc-prevent-migrate_reserve-pages-from-being-misplaced.patch mm-page_alloc-debug_vm-checks-for-free_list-placement-of-cma-and-reserve-pages.patch mm-compaction-clean-up-unused-code-lines.patch mm-compaction-cleanup-isolate_freepages.patch mm-compaction-cleanup-isolate_freepages-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html