The patch titled Subject: mm/cma: always check which page cause allocation failure has been removed from the -mm tree. Its filename was mm-cma-always-check-which-page-cause-allocation-failure-v2.patch This patch was dropped because it was folded into mm-cma-always-check-which-page-cause-allocation-failure.patch ------------------------------------------------------ From: Joonsoo Kim <js1304@xxxxxxxxx> Subject: mm/cma: always check which page cause allocation failure Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Acked-by: Vlastimil Babka <vbabka@xxxxxxx> Acked-by: Michal Nazarewicz <mina86@xxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Minchan Kim <minchan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff -puN mm/page_alloc.c~mm-cma-always-check-which-page-cause-allocation-failure-v2 mm/page_alloc.c --- a/mm/page_alloc.c~mm-cma-always-check-which-page-cause-allocation-failure-v2 +++ a/mm/page_alloc.c @@ -6763,6 +6763,19 @@ int alloc_contig_range(unsigned long sta outer_start &= ~0UL << order; } + if (outer_start != start) { + order = page_order(pfn_to_page(outer_start)); + + /* + * outer_start page could be small order buddy page and + * it doesn't include start page. Adjust outer_start + * in this case to report failed page properly + * on tracepoint in test_pages_isolated() + */ + if (outer_start + (1UL << order) <= start) + outer_start = start; + } + /* Make sure the range is really isolated. */ if (test_pages_isolated(outer_start, end, false)) { pr_info("%s: [%lx, %lx) PFNs busy\n", _ Patches currently in -mm which might be from js1304@xxxxxxxxx are mm-page_isolation-return-last-tested-pfn-rather-than-failure-indicator.patch mm-page_isolation-add-new-tracepoint-test_pages_isolated.patch mm-cma-always-check-which-page-cause-allocation-failure.patch mm-compaction-__compact_pgdat-code-cleanuup.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