The following patch is still missing from linux-next/akpm so am
resending in case it got lost in the mess.
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>
diff --git a/mm/compaction.c b/mm/compaction.c
index 136debd..ed3b8f1 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -282,6 +282,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc,
{
int nr_scanned = 0, total_isolated = 0;
struct page *cursor, *valid_page = NULL;
+ unsigned long nr_strict_required = end_pfn - blockpfn;
unsigned long flags;
bool locked = false;
@@ -342,10 +343,10 @@ static unsigned long isolate_freepages_block(struct compact_control *cc,
/*
* 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)
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>