Revert "mm: page_alloc: exclude unreclaimable allocations from zone fairness policy"
authorMel Gorman <mgorman@suse.de>
Fri, 20 Dec 2013 14:54:11 +0000 (14:54 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Dec 2013 20:19:18 +0000 (12:19 -0800)
This reverts commit 73f038b863df.  The NUMA behaviour of this patch is
less than ideal.  An alternative approch is to interleave allocations
only within local zones which is implemented in the next patch.

Cc: stable@vger.kernel.org
Signed-off-by: Mel Gorman <mgorman@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/page_alloc.c

index f861d02..580a5f0 100644 (file)
@@ -1920,8 +1920,7 @@ zonelist_scan:
                 * back to remote zones that do not partake in the
                 * fairness round-robin cycle of this zonelist.
                 */
-               if ((alloc_flags & ALLOC_WMARK_LOW) &&
-                   (gfp_mask & GFP_MOVABLE_MASK)) {
+               if (alloc_flags & ALLOC_WMARK_LOW) {
                        if (zone_page_state(zone, NR_ALLOC_BATCH) <= 0)
                                continue;
                        if (zone_reclaim_mode &&