summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMel Gorman <mgorman@suse.de>2014-08-28 19:35:44 +0100
committerJiri Slaby <jslaby@suse.cz>2014-09-26 11:52:10 +0200
commit51aad0a51582e4147380137ba34785663a1b5f93 (patch)
treefeacb20551a7632cd84bbe3f41dfac6ac2b39ae6
parentfc915114c8369c660b6876b06519902de3bd10c6 (diff)
mm: page_alloc: abort fair zone allocation policy when remotes nodes are encountered
commit f7b5d647946aae1647bf5cd26c16b3a793c1ac49 upstream. The purpose of numa_zonelist_order=zone is to preserve lower zones for use with 32-bit devices. If locality is preferred then the numa_zonelist_order=node policy should be used. Unfortunately, the fair zone allocation policy overrides this by skipping zones on remote nodes until the lower one is found. While this makes sense from a page aging and performance perspective, it breaks the expected zonelist policy. This patch restores the expected behaviour for zone-list ordering. Signed-off-by: Mel Gorman <mgorman@suse.de> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Mel Gorman <mgorman@suse.de> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--mm/page_alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ee24ebbb8284..16e67402ae6f 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1955,7 +1955,7 @@ zonelist_scan:
*/
if (alloc_flags & ALLOC_FAIR) {
if (!zone_local(preferred_zone, zone))
- continue;
+ break;
if (zone_page_state(zone, NR_ALLOC_BATCH) <= 0)
continue;
}