4 files changed, 8 insertions, 5 deletions

diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 0fe0b6295ab5..db373b9d3223 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -541,7 +541,7 @@ static inline bool pm_suspended_storage(void)
 #if (defined(CONFIG_MEMORY_ISOLATION) && defined(CONFIG_COMPACTION)) || defined(CONFIG_CMA)
 /* The below functions must be run on a range from a single zone. */
 extern int alloc_contig_range(unsigned long start, unsigned long end,
-                              unsigned migratetype);
+                              unsigned migratetype, gfp_t gfp_mask);
 extern void free_contig_range(unsigned long pfn, unsigned nr_pages);
 #endif
 
diff --git a/mm/cma.c b/mm/cma.c
index 94b3460cd608..c6aed23ca6df 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -402,7 +402,8 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align)
 
                 pfn = cma->base_pfn + (bitmap_no << cma->order_per_bit);
                 mutex_lock(&cma_mutex);
-                ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA);
+                ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA,
+                                         GFP_KERNEL);
                 mutex_unlock(&cma_mutex);
                 if (ret == 0) {
                         page = pfn_to_page(pfn);
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 167fd0722c15..2e0e8159ce8e 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1052,7 +1052,8 @@ static int __alloc_gigantic_page(unsigned long start_pfn,
                                 unsigned long nr_pages)
 {
         unsigned long end_pfn = start_pfn + nr_pages;
-        return alloc_contig_range(start_pfn, end_pfn, MIGRATE_MOVABLE);
+        return alloc_contig_range(start_pfn, end_pfn, MIGRATE_MOVABLE,
+                                  GFP_KERNEL);
 }
 
 static bool pfn_range_valid_gigantic(struct zone *z,
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2d34cdb70f1d..8a0f33624335 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7399,6 +7399,7 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
  *                      #MIGRATE_MOVABLE or #MIGRATE_CMA).  All pageblocks
  *                      in range must have the same migratetype and it must
  *                      be either of the two.
+ * @gfp_mask:   GFP mask to use during compaction
  *
  * The PFN range does not have to be pageblock or MAX_ORDER_NR_PAGES
  * aligned, however it's the caller's responsibility to guarantee that
@@ -7412,7 +7413,7 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
  * need to be freed with free_contig_range().
  */
 int alloc_contig_range(unsigned long start, unsigned long end,
-                       unsigned migratetype)
+                       unsigned migratetype, gfp_t gfp_mask)
 {
         unsigned long outer_start, outer_end;
         unsigned int order;
@@ -7424,7 +7425,7 @@ int alloc_contig_range(unsigned long start, unsigned long end,
                 .zone = page_zone(pfn_to_page(start)),
                 .mode = MIGRATE_SYNC,
                 .ignore_skip_hint = true,
-                .gfp_mask = GFP_KERNEL,
+                .gfp_mask = memalloc_noio_flags(gfp_mask),
         };
         INIT_LIST_HEAD(&cc.migratepages);