The patch titled Subject: drivers/cma: don't fail if migration returns -EAGAIN has been added to the -mm tree. Its filename is drivers-cma-dont-fail-if-migration-returns-eagain.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: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> Subject: drivers/cma: don't fail if migration returns -EAGAIN alloc_contig_range() might return -EAGAIN if migrate_pages() fails for some temporarily locked pages. Such a case should not be fatal to dma_alloc_from_contiguous(), which should retry the allocation, as in the -EBUSY case. Reported-by: Haojian Zhuang <haojian.zhuang@xxxxxxxxx> Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> Cc: Minchan Kim <minchan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/base/dma-contiguous.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/base/dma-contiguous.c~drivers-cma-dont-fail-if-migration-returns-eagain drivers/base/dma-contiguous.c --- a/drivers/base/dma-contiguous.c~drivers-cma-dont-fail-if-migration-returns-eagain +++ a/drivers/base/dma-contiguous.c @@ -346,7 +346,7 @@ struct page *dma_alloc_from_contiguous(s if (ret == 0) { bitmap_set(cma->bitmap, pageno, count); break; - } else if (ret != -EBUSY) { + } else if (ret != -EBUSY && ret != -EAGAIN) { goto error; } pr_debug("%s(): memory range at %p is busy, retrying\n", _ Subject: Subject: drivers/cma: don't fail if migration returns -EAGAIN Patches currently in -mm which might be from m.szyprowski@xxxxxxxxxxx are origin.patch linux-next.patch drivers-cma-dont-fail-if-migration-returns-eagain.patch mm-compaction-handle-incorrect-migrate_unmovable-type-pageblocks.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