The patch titled Subject: mm-compaction-acquire-the-zone-lock-as-late-as-possible-fix-3 has been removed from the -mm tree. Its filename was mm-compaction-acquire-the-zone-lock-as-late-as-possible-fix-3.patch This patch was dropped because it was folded into mm-compaction-acquire-the-zone-lock-as-late-as-possible.patch ------------------------------------------------------ From: Mel Gorman <mgorman@xxxxxxx> Subject: mm-compaction-acquire-the-zone-lock-as-late-as-possible-fix-3 mm: compaction: Iron out isolate_freepages_block() and isolate_freepages_range() -fix1 CMA is reported to be broken in next-20120926. Minchan Kim pointed out that this was due to nr_scanned != total_isolated in the case of CMA because PageBuddy pages are one scan but many isolations in CMA. This patch should address the problem. This patch is a fix for mm-compaction-acquire-the-zone-lock-as-late-as-possible-fix-2.patch Signed-off-by: Mel Gorman <mgorman@xxxxxxx> Tested-by: Peter Ujfalusi <peter.ujfalusi@xxxxxx> Cc: Thierry Reding <thierry.reding@xxxxxxxxxxxxxxxxx> Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> Cc: Michal Nazarewicz <mina86@xxxxxxxxxx> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx> Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/compaction.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN mm/compaction.c~mm-compaction-acquire-the-zone-lock-as-late-as-possible-fix-3 mm/compaction.c --- a/mm/compaction.c~mm-compaction-acquire-the-zone-lock-as-late-as-possible-fix-3 +++ a/mm/compaction.c @@ -182,6 +182,7 @@ static unsigned long isolate_freepages_b { int nr_scanned = 0, total_isolated = 0; struct page *cursor; + unsigned long nr_strict_required = end_pfn - blockpfn; unsigned long flags; bool locked = false; @@ -240,10 +241,10 @@ static unsigned long isolate_freepages_b /* * If strict isolation is requested by CMA then check that all the - * pages scanned were isolated. If there were any failures, 0 is + * pages requested were isolated. If there were any failures, 0 is * returned and CMA will fail. */ - if (strict && nr_scanned != total_isolated) + if (strict && nr_strict_required != total_isolated) total_isolated = 0; if (locked) _ Patches currently in -mm which might be from mgorman@xxxxxxx are mm-remove-__gfp_no_kswapd.patch mm-compaction-update-comment-in-try_to_compact_pages.patch mm-vmscan-scale-number-of-pages-reclaimed-by-reclaim-compaction-based-on-failures.patch mm-compaction-capture-a-suitable-high-order-page-immediately-when-it-is-made-available.patch revert-mm-mempolicy-let-vma_merge-and-vma_split-handle-vma-vm_policy-linkages.patch mempolicy-remove-mempolicy-sharing.patch mempolicy-fix-a-race-in-shared_policy_replace.patch mempolicy-fix-refcount-leak-in-mpol_set_shared_policy.patch mempolicy-fix-a-memory-corruption-by-refcount-imbalance-in-alloc_pages_vma.patch mm-cma-discard-clean-pages-during-contiguous-allocation-instead-of-migration.patch mm-fix-tracing-in-free_pcppages_bulk.patch cma-fix-counting-of-isolated-pages.patch cma-count-free-cma-pages.patch cma-fix-watermark-checking.patch mm-page_alloc-use-get_freepage_migratetype-instead-of-page_private.patch mm-remain-migratetype-in-freed-page.patch memory-hotplug-bug-fix-race-between-isolation-and-allocation.patch memory-hotplug-fix-pages-missed-by-race-rather-than-failing.patch mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long.patch mm-compaction-move-fatal-signal-check-out-of-compact_checklock_irqsave.patch mm-compaction-update-try_to_compact_pageskerneldoc-comment.patch mm-compaction-acquire-the-zone-lru_lock-as-late-as-possible.patch mm-compaction-acquire-the-zone-lock-as-late-as-possible.patch revert-mm-have-order-0-compaction-start-off-where-it-left.patch mm-compaction-cache-if-a-pageblock-was-scanned-and-no-pages-were-isolated.patch mm-compaction-cache-if-a-pageblock-was-scanned-and-no-pages-were-isolated-fix.patch mm-compaction-cache-if-a-pageblock-was-scanned-and-no-pages-were-isolated-fix2.patch mm-compaction-cache-if-a-pageblock-was-scanned-and-no-pages-were-isolated-fix3.patch mm-compaction-restart-compaction-from-near-where-it-left-off.patch mm-compaction-restart-compaction-from-near-where-it-left-off-fix.patch mm-compaction-clear-pg_migrate_skip-based-on-compaction-and-reclaim-activity.patch mm-numa-reclaim-from-all-nodes-within-reclaim-distance.patch mm-numa-reclaim-from-all-nodes-within-reclaim-distance-fix.patch mm-numa-reclaim-from-all-nodes-within-reclaim-distance-fix-fix.patch mm-thp-fix-pmd_present-for-split_huge_page-and-prot_none-with-thp.patch mm-revert-0def08e3-mm-mempolicyc-check-return-code-of-check_range.patch mm-revert-0def08e3-mm-mempolicyc-check-return-code-of-check_range-fix.patch cma-migrate-mlocked-pages.patch cma-migrate-mlocked-pages-fix.patch cma-decrease-ccnr_migratepages-after-reclaiming-pagelist.patch make-gfp_notrack-definition-unconditional.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