Subject: [to-be-updated] mm-compaction-break-out-of-loop-on-pagebuddy-in-isolate_freepages_block.patch removed from -mm tree To: lauraa@xxxxxxxxxxxxxx,b.zolnierkie@xxxxxxxxxxx,iamjoonsoo.kim@xxxxxxx,mgorman@xxxxxxx,mina86@xxxxxxxxxx,minchan@xxxxxxxxxx,vbabka@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 06 Mar 2014 16:24:01 -0800 The patch titled Subject: mm/compaction: break out of loop on !PageBuddy in isolate_freepages_block has been removed from the -mm tree. Its filename was mm-compaction-break-out-of-loop-on-pagebuddy-in-isolate_freepages_block.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Laura Abbott <lauraa@xxxxxxxxxxxxxx> Subject: mm/compaction: break out of loop on !PageBuddy in isolate_freepages_block We received several reports of bad page state when freeing CMA pages previously allocated with alloc_contig_range: <1>[ 1258.084111] BUG: Bad page state in process Binder_A pfn:63202 <1>[ 1258.089763] page:d21130b0 count:0 mapcount:1 mapping: (null) index:0x7dfbf <1>[ 1258.096109] page flags: 0x40080068(uptodate|lru|active|swapbacked) Based on the page state, it looks like the page was still in use. The page flags do not make sense for the use case though. Further debugging showed that despite alloc_contig_range returning success, at least one page in the range still remained in the buddy allocator. There is an issue with isolate_freepages_block. In strict mode (which CMA uses), if any pages in the range cannot be isolated, isolate_freepages_block should return failure 0. The current check keeps track of the total number of isolated pages and compares against the size of the range: if (strict && nr_strict_required > total_isolated) total_isolated = 0; After taking the zone lock, if one of the pages in the range is not in the buddy allocator, we continue through the loop and do not increment total_isolated. If we end up over isolating by more than one page (e.g. last since page needed is a higher order page), it is not possible to detect that the page was skipped. The fix is to bail out if the loop immediately if we are in strict mode. There's no benfit to continuing anyway since we need all pages to be isolated. Signed-off-by: Laura Abbott <lauraa@xxxxxxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Vlastimil Babka <vbabka@xxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx> Cc: Michal Nazarewicz <mina86@xxxxxxxxxx> Cc: Minchan Kim <minchan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/compaction.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff -puN mm/compaction.c~mm-compaction-break-out-of-loop-on-pagebuddy-in-isolate_freepages_block mm/compaction.c --- a/mm/compaction.c~mm-compaction-break-out-of-loop-on-pagebuddy-in-isolate_freepages_block +++ a/mm/compaction.c @@ -263,12 +263,21 @@ static unsigned long isolate_freepages_b struct page *page = cursor; nr_scanned++; - if (!pfn_valid_within(blockpfn)) - continue; + if (!pfn_valid_within(blockpfn)) { + if (strict) + break; + else + continue; + } + if (!valid_page) valid_page = page; - if (!PageBuddy(page)) - continue; + if (!PageBuddy(page)) { + if (strict) + break; + else + continue; + } /* * The zone lock must be held to isolate freepages. @@ -288,8 +297,12 @@ static unsigned long isolate_freepages_b break; /* Recheck this is a buddy page under lock */ - if (!PageBuddy(page)) - continue; + if (!PageBuddy(page)) { + if (strict) + break; + else + continue; + } /* Found a free page, break it into order-0 pages */ isolated = split_free_page(page); _ Patches currently in -mm which might be from lauraa@xxxxxxxxxxxxxx are linux-next.patch debugging-keep-track-of-page-owners.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