Revert "mm: avoid waking kswapd for THP allocations when compaction is deferred or...

This reverts commit 782fd30406ecb9d9b082816abe0c6008fc72a7b0.

We are going to reinstate the __GFP_NO_KSWAPD flag that has been
removed, the removal reverted, and then removed again.  Making this
commit a pointless fixup for a problem that was caused by the removal of
__GFP_NO_KSWAPD flag.

The thing is, we really don't want to wake up kswapd for THP allocations
(because they fail quite commonly under any kind of memory pressure,
including when there is tons of memory free), and these patches were
just trying to fix up the underlying bug: the original removal of
__GFP_NO_KSWAPD in commit c654345924f7 ("mm: remove __GFP_NO_KSWAPD")
was simply bogus.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index a8f2c87792c33eb264cde47f1bb42db2e8a6c935..8193809f3de0e683b1bcfb95954f37316768c851 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2378,15 +2378,6 @@ bool gfp_pfmemalloc_allowed(gfp_t gfp_mask)
        return !!(gfp_to_alloc_flags(gfp_mask) & ALLOC_NO_WATERMARKS);
 }
 
-/* Returns true if the allocation is likely for THP */
-static bool is_thp_alloc(gfp_t gfp_mask, unsigned int order)
-{
-       if (order == pageblock_order &&
-           (gfp_mask & (__GFP_MOVABLE|__GFP_REPEAT)) == __GFP_MOVABLE)
-               return true;
-       return false;
-}
-
 static inline struct page *
 __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
        struct zonelist *zonelist, enum zone_type high_zoneidx,
@@ -2425,9 +2416,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
                goto nopage;
 
 restart:
-       /* The decision whether to wake kswapd for THP is made later */
-       if (!is_thp_alloc(gfp_mask, order))
-               wake_all_kswapd(order, zonelist, high_zoneidx,
+       wake_all_kswapd(order, zonelist, high_zoneidx,
                                        zone_idx(preferred_zone));
 
        /*
@@ -2498,21 +2487,15 @@ rebalance:
                goto got_pg;
        sync_migration = true;
 
-       if (is_thp_alloc(gfp_mask, order)) {
-               /*
-                * If compaction is deferred for high-order allocations, it is
-                * because sync compaction recently failed. If this is the case
-                * and the caller requested a movable allocation that does not
-                * heavily disrupt the system then fail the allocation instead
-                * of entering direct reclaim.
-                */
-               if (deferred_compaction || contended_compaction)
-                       goto nopage;
-
-               /* If process is willing to reclaim/compact then wake kswapd */
-               wake_all_kswapd(order, zonelist, high_zoneidx,
-                                       zone_idx(preferred_zone));
-       }
+       /*
+        * If compaction is deferred for high-order allocations, it is because
+        * sync compaction recently failed. In this is the case and the caller
+        * requested a movable allocation that does not heavily disrupt the
+        * system then fail the allocation instead of entering direct reclaim.
+        */
+       if ((deferred_compaction || contended_compaction) &&
+           (gfp_mask & (__GFP_MOVABLE|__GFP_REPEAT)) == __GFP_MOVABLE)
+               goto nopage;
 
        /* Try direct reclaim and then allocating */
        page = __alloc_pages_direct_reclaim(gfp_mask, order,