rk: mm: CMA memory busy error may have a variety of reasons, in the larger one is:

the pages being used in the system come from CMA, and now need recycling
them for new CMA allocation, it need to allocate a new page for storing data
that will be reclaim CMA's pages, but new page may also be come from CMA memory
when memory allocate fall back to MIGRATE_CMA freelist.

Now we protect the CMA's pages in the memory fallback allocate

[ 1637.058550] alloc_contig_range test_pages_isolated(431a0, 431c0) failed

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 4cfdc64482c85a59dc3e242ef793bcbfb5456315..699bd7742877fa9387c31914dc0560246a4b5533 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1050,6 +1050,15 @@ __rmqueue_fallback(struct zone *zone, int order, int start_migratetype)
 
                        page = list_entry(area->free_list[migratetype].next,
                                        struct page, lru);
+
+#ifdef CONFIG_ARCH_ROCKCHIP
+                       if (is_migrate_cma(migratetype)){
+                               int mt = get_pageblock_migratetype(page);
+                               if (unlikely(is_migrate_isolate(mt)))
+                                       continue;
+                       }
+#endif
+
                        area->nr_free--;
 
                        /*