1 files changed, 27 insertions, 21 deletions

diff --git a/mm/compaction.c b/mm/compaction.c
index f9792ba3537c..1fc6736815e0 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1086,9 +1086,9 @@ static int compact_finished(struct zone *zone, struct compact_control *cc,
 
         /* Compaction run is not finished if the watermark is not met */
         watermark = low_wmark_pages(zone);
-        watermark += (1 << cc->order);
 
-        if (!zone_watermark_ok(zone, cc->order, watermark, 0, 0))
+        if (!zone_watermark_ok(zone, cc->order, watermark, cc->classzone_idx,
+                                                        cc->alloc_flags))
                 return COMPACT_CONTINUE;
 
         /* Direct compactor: Is a suitable page free? */
@@ -1114,7 +1114,8 @@ static int compact_finished(struct zone *zone, struct compact_control *cc,
  *   COMPACT_PARTIAL  - If the allocation would succeed without compaction
  *   COMPACT_CONTINUE - If compaction should run now
  */
-unsigned long compaction_suitable(struct zone *zone, int order)
+unsigned long compaction_suitable(struct zone *zone, int order,
+                                        int alloc_flags, int classzone_idx)
 {
         int fragindex;
         unsigned long watermark;
@@ -1126,21 +1127,30 @@ unsigned long compaction_suitable(struct zone *zone, int order)
         if (order == -1)
                 return COMPACT_CONTINUE;
 
+        watermark = low_wmark_pages(zone);
+        /*
+         * If watermarks for high-order allocation are already met, there
+         * should be no need for compaction at all.
+         */
+        if (zone_watermark_ok(zone, order, watermark, classzone_idx,
+                                                                alloc_flags))
+                return COMPACT_PARTIAL;
+
         /*
          * Watermarks for order-0 must be met for compaction. Note the 2UL.
          * This is because during migration, copies of pages need to be
          * allocated and for a short time, the footprint is higher
          */
-        watermark = low_wmark_pages(zone) + (2UL << order);
-        if (!zone_watermark_ok(zone, 0, watermark, 0, 0))
+        watermark += (2UL << order);
+        if (!zone_watermark_ok(zone, 0, watermark, classzone_idx, alloc_flags))
                 return COMPACT_SKIPPED;
 
         /*
          * fragmentation index determines if allocation failures are due to
          * low memory or external fragmentation
          *
-         * index of -1000 implies allocations might succeed depending on
-         * watermarks
+         * index of -1000 would imply allocations might succeed depending on
+         * watermarks, but we already failed the high-order watermark check
          * index towards 0 implies failure is due to lack of memory
          * index towards 1000 implies failure is due to fragmentation
          *
@@ -1150,10 +1160,6 @@ unsigned long compaction_suitable(struct zone *zone, int order)
         if (fragindex >= 0 && fragindex <= sysctl_extfrag_threshold)
                 return COMPACT_SKIPPED;
 
-        if (fragindex == -1000 && zone_watermark_ok(zone, order, watermark,
-            0, 0))
-                return COMPACT_PARTIAL;
-
         return COMPACT_CONTINUE;
 }
 
@@ -1165,7 +1171,8 @@ static int compact_zone(struct zone *zone, struct compact_control *cc)
         const int migratetype = gfpflags_to_migratetype(cc->gfp_mask);
         const bool sync = cc->mode != MIGRATE_ASYNC;
 
-        ret = compaction_suitable(zone, cc->order);
+        ret = compaction_suitable(zone, cc->order, cc->alloc_flags,
+                                                        cc->classzone_idx);
         switch (ret) {
         case COMPACT_PARTIAL:
         case COMPACT_SKIPPED:
@@ -1254,7 +1261,8 @@ out:
 }
 
 static unsigned long compact_zone_order(struct zone *zone, int order,
-                gfp_t gfp_mask, enum migrate_mode mode, int *contended)
+                gfp_t gfp_mask, enum migrate_mode mode, int *contended,
+                int alloc_flags, int classzone_idx)
 {
         unsigned long ret;
         struct compact_control cc = {
@@ -1264,6 +1272,8 @@ static unsigned long compact_zone_order(struct zone *zone, int order,
                 .gfp_mask = gfp_mask,
                 .zone = zone,
                 .mode = mode,
+                .alloc_flags = alloc_flags,
+                .classzone_idx = classzone_idx,
         };
         INIT_LIST_HEAD(&cc.freepages);
         INIT_LIST_HEAD(&cc.migratepages);
@@ -1295,6 +1305,7 @@ int sysctl_extfrag_threshold = 500;
 unsigned long try_to_compact_pages(struct zonelist *zonelist,
                         int order, gfp_t gfp_mask, nodemask_t *nodemask,
                         enum migrate_mode mode, int *contended,
+                        int alloc_flags, int classzone_idx,
                         struct zone **candidate_zone)
 {
         enum zone_type high_zoneidx = gfp_zone(gfp_mask);
@@ -1303,7 +1314,6 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist,
         struct zoneref *z;
         struct zone *zone;
         int rc = COMPACT_DEFERRED;
-        int alloc_flags = 0;
         int all_zones_contended = COMPACT_CONTENDED_LOCK; /* init for &= op */
 
         *contended = COMPACT_CONTENDED_NONE;
@@ -1312,10 +1322,6 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist,
         if (!order || !may_enter_fs || !may_perform_io)
                 return COMPACT_SKIPPED;
 
-#ifdef CONFIG_CMA
-        if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
-                alloc_flags |= ALLOC_CMA;
-#endif
         /* Compact each zone in the list */
         for_each_zone_zonelist_nodemask(zone, z, zonelist, high_zoneidx,
                                                                 nodemask) {
@@ -1326,7 +1332,7 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist,
                         continue;
 
                 status = compact_zone_order(zone, order, gfp_mask, mode,
-                                                        &zone_contended);
+                                &zone_contended, alloc_flags, classzone_idx);
                 rc = max(status, rc);
                 /*
                  * It takes at least one zone that wasn't lock contended
@@ -1335,8 +1341,8 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist,
                 all_zones_contended &= zone_contended;
 
                 /* If a normal allocation would succeed, stop compacting */
-                if (zone_watermark_ok(zone, order, low_wmark_pages(zone), 0,
-                                      alloc_flags)) {
+                if (zone_watermark_ok(zone, order, low_wmark_pages(zone),
+                                        classzone_idx, alloc_flags)) {
                         *candidate_zone = zone;
                         /*
                          * We think the allocation will succeed in this zone,