mm: have zonelist contains structs with both a zone pointer and zone_idx

Filtering zonelists requires very frequent use of zone_idx().  This is costly
as it involves a lookup of another structure and a substraction operation.  As
the zone_idx is often required, it should be quickly accessible.  The node idx
could also be stored here if it was found that accessing zone->node is
significant which may be the case on workloads where nodemasks are heavily
used.

This patch introduces a struct zoneref to store a zone pointer and a zone
index.  The zonelist then consists of an array of these struct zonerefs which
are looked up as necessary.  Helpers are given for accessing the zone index as
well as the node index.

[kamezawa.hiroyu@jp.fujitsu.com: Suggested struct zoneref instead of embedding information in pointers]
[hugh@veritas.com: mm-have-zonelist: fix memcg ooms]
[hugh@veritas.com: just return do_try_to_free_pages]
[hugh@veritas.com: do_try_to_free_pages gfp_mask redundant]
Signed-off-by: Mel Gorman <mel@csn.ul.ie>
Acked-by: Christoph Lameter <clameter@sgi.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Christoph Lameter <clameter@sgi.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

12 files changed, 158 insertions, 100 deletions

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 9bb6136d77c2..1f012843150f 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -608,7 +608,7 @@ void show_mem(void)
                 for (i = 0; i < npmem_ranges; i++) {
                         zl = node_zonelist(i);
                         for (j = 0; j < MAX_NR_ZONES; j++) {
-                                struct zone **z;
+                                struct zoneref *z;
                                 struct zone *zone;
 
                                 printk("Zone list for zone %d on node %d: ", j, i);
diff --git a/fs/buffer.c b/fs/buffer.c
index 9b5434a80479..ac84cd13075d 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -360,16 +360,16 @@ void invalidate_bdev(struct block_device *bdev)
  */
 static void free_more_memory(void)
 {
-        struct zone **zones;
+        struct zoneref *zrefs;
         int nid;
 
         wakeup_pdflush(1024);
         yield();
 
         for_each_online_node(nid) {
-                zones = first_zones_zonelist(node_zonelist(nid, GFP_NOFS),
+                zrefs = first_zones_zonelist(node_zonelist(nid, GFP_NOFS),
                                                 gfp_zone(GFP_NOFS));
-                if (*zones)
+                if (zrefs->zone)
                         try_to_free_pages(node_zonelist(nid, GFP_NOFS), 0,
                                                 GFP_NOFS);
         }
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index d5c33a0b89e9..d34b4c290017 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -469,6 +469,15 @@ struct zonelist_cache;
 #endif
 
 /*
+ * This struct contains information about a zone in a zonelist. It is stored
+ * here to avoid dereferences into large structures and lookups of tables
+ */
+struct zoneref {
+        struct zone *zone;      /* Pointer to actual zone */
+        int zone_idx;           /* zone_idx(zoneref->zone) */
+};
+
+/*
  * One allocation request operates on a zonelist. A zonelist
  * is a list of zones, the first one is the 'goal' of the
  * allocation, the other zones are fallback zones, in decreasing
@@ -476,11 +485,18 @@ struct zonelist_cache;
  *
  * If zlcache_ptr is not NULL, then it is just the address of zlcache,
  * as explained above.  If zlcache_ptr is NULL, there is no zlcache.
+ * *
+ * To speed the reading of the zonelist, the zonerefs contain the zone index
+ * of the entry being read. Helper functions to access information given
+ * a struct zoneref are
+ *
+ * zonelist_zone()      - Return the struct zone * for an entry in _zonerefs
+ * zonelist_zone_idx()  - Return the index of the zone for an entry
+ * zonelist_node_idx()  - Return the index of the node for an entry
  */
-
 struct zonelist {
         struct zonelist_cache *zlcache_ptr;                  // NULL or &zlcache
-        struct zone *zones[MAX_ZONES_PER_ZONELIST + 1];      // NULL delimited
+        struct zoneref _zonerefs[MAX_ZONES_PER_ZONELIST + 1];
 #ifdef CONFIG_NUMA
         struct zonelist_cache zlcache;                       // optional ...
 #endif
@@ -713,26 +729,52 @@ extern struct zone *next_zone(struct zone *zone);
              zone;                                      \
              zone = next_zone(zone))
 
+static inline struct zone *zonelist_zone(struct zoneref *zoneref)
+{
+        return zoneref->zone;
+}
+
+static inline int zonelist_zone_idx(struct zoneref *zoneref)
+{
+        return zoneref->zone_idx;
+}
+
+static inline int zonelist_node_idx(struct zoneref *zoneref)
+{
+#ifdef CONFIG_NUMA
+        /* zone_to_nid not available in this context */
+        return zoneref->zone->node;
+#else
+        return 0;
+#endif /* CONFIG_NUMA */
+}
+
+static inline void zoneref_set_zone(struct zone *zone, struct zoneref *zoneref)
+{
+        zoneref->zone = zone;
+        zoneref->zone_idx = zone_idx(zone);
+}
+
 /* Returns the first zone at or below highest_zoneidx in a zonelist */
-static inline struct zone **first_zones_zonelist(struct zonelist *zonelist,
+static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist,
                                         enum zone_type highest_zoneidx)
 {
-        struct zone **z;
+        struct zoneref *z;
 
         /* Find the first suitable zone to use for the allocation */
-        z = zonelist->zones;
-        while (*z && zone_idx(*z) > highest_zoneidx)
+        z = zonelist->_zonerefs;
+        while (zonelist_zone_idx(z) > highest_zoneidx)
                 z++;
 
         return z;
 }
 
 /* Returns the next zone at or below highest_zoneidx in a zonelist */
-static inline struct zone **next_zones_zonelist(struct zone **z,
+static inline struct zoneref *next_zones_zonelist(struct zoneref *z,
                                         enum zone_type highest_zoneidx)
 {
         /* Find the next suitable zone to use for the allocation */
-        while (*z && zone_idx(*z) > highest_zoneidx)
+        while (zonelist_zone_idx(z) > highest_zoneidx)
                 z++;
 
         return z;
@@ -748,9 +790,11 @@ static inline struct zone **next_zones_zonelist(struct zone **z,
  * This iterator iterates though all zones at or below a given zone index.
  */
 #define for_each_zone_zonelist(zone, z, zlist, highidx) \
-        for (z = first_zones_zonelist(zlist, highidx), zone = *z++;     \
+        for (z = first_zones_zonelist(zlist, highidx),                  \
+                                        zone = zonelist_zone(z++);      \
                 zone;                                                   \
-                z = next_zones_zonelist(z, highidx), zone = *z++)
+                z = next_zones_zonelist(z, highidx),                    \
+                                        zone = zonelist_zone(z++))
 
 #ifdef CONFIG_SPARSEMEM
 #include <asm/sparsemem.h>
diff --git a/include/linux/oom.h b/include/linux/oom.h
index 3852436b652a..a7979baf1e39 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -23,8 +23,8 @@ enum oom_constraint {
         CONSTRAINT_MEMORY_POLICY,
 };
 
-extern int try_set_zone_oom(struct zonelist *zonelist);
-extern void clear_zonelist_oom(struct zonelist *zonelist);
+extern int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_flags);
+extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
 
 extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order);
 extern int register_oom_notifier(struct notifier_block *nb);
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 8b35fbd8292f..a220b13cbfaf 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1967,8 +1967,8 @@ int cpuset_zonelist_valid_mems_allowed(struct zonelist *zl)
 {
         int i;
 
-        for (i = 0; zl->zones[i]; i++) {
-                int nid = zone_to_nid(zl->zones[i]);
+        for (i = 0; zl->_zonerefs[i].zone; i++) {
+                int nid = zonelist_node_idx(&zl->_zonerefs[i]);
 
                 if (node_isset(nid, current->mems_allowed))
                         return 1;
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index ddd141cad77f..4bced0d705ca 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -97,7 +97,8 @@ static struct page *dequeue_huge_page_vma(struct vm_area_struct *vma,
         struct mempolicy *mpol;
         struct zonelist *zonelist = huge_zonelist(vma, address,
                                         htlb_alloc_mask, &mpol);
-        struct zone *zone, **z;
+        struct zone *zone;
+        struct zoneref *z;
 
         for_each_zone_zonelist(zone, z, zonelist, MAX_NR_ZONES - 1) {
                 nid = zone_to_nid(zone);
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 5d20bf44062f..90193a2a915b 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -186,7 +186,7 @@ static struct zonelist *bind_zonelist(nodemask_t *nodes)
                 for_each_node_mask(nd, *nodes) { 
                         struct zone *z = &NODE_DATA(nd)->node_zones[k];
                         if (z->present_pages > 0) 
-                                zl->zones[num++] = z;
+                                zoneref_set_zone(z, &zl->_zonerefs[num++]);
                 }
                 if (k == 0)
                         break;
@@ -196,7 +196,8 @@ static struct zonelist *bind_zonelist(nodemask_t *nodes)
                 kfree(zl);
                 return ERR_PTR(-EINVAL);
         }
-        zl->zones[num] = NULL;
+        zl->_zonerefs[num].zone = NULL;
+        zl->_zonerefs[num].zone_idx = 0;
         return zl;
 }
 
@@ -504,9 +505,11 @@ static void get_zonemask(struct mempolicy *p, nodemask_t *nodes)
         nodes_clear(*nodes);
         switch (p->policy) {
         case MPOL_BIND:
-                for (i = 0; p->v.zonelist->zones[i]; i++)
-                        node_set(zone_to_nid(p->v.zonelist->zones[i]),
-                                *nodes);
+                for (i = 0; p->v.zonelist->_zonerefs[i].zone; i++) {
+                        struct zoneref *zref;
+                        zref = &p->v.zonelist->_zonerefs[i];
+                        node_set(zonelist_node_idx(zref), *nodes);
+                }
                 break;
         case MPOL_DEFAULT:
                 break;
@@ -1212,12 +1215,13 @@ unsigned slab_node(struct mempolicy *policy)
         case MPOL_INTERLEAVE:
                 return interleave_nodes(policy);
 
-        case MPOL_BIND:
+        case MPOL_BIND: {
                 /*
                  * Follow bind policy behavior and start allocation at the
                  * first node.
                  */
-                return zone_to_nid(policy->v.zonelist->zones[0]);
+                return zonelist_node_idx(policy->v.zonelist->_zonerefs);
+        }
 
         case MPOL_PREFERRED:
                 if (policy->v.preferred_node >= 0)
@@ -1323,7 +1327,7 @@ static struct page *alloc_page_interleave(gfp_t gfp, unsigned order,
 
         zl = node_zonelist(nid, gfp);
         page = __alloc_pages(gfp, order, zl);
-        if (page && page_zone(page) == zl->zones[0])
+        if (page && page_zone(page) == zonelist_zone(&zl->_zonerefs[0]))
                 inc_zone_page_state(page, NUMA_INTERLEAVE_HIT);
         return page;
 }
@@ -1463,10 +1467,14 @@ int __mpol_equal(struct mempolicy *a, struct mempolicy *b)
                 return a->v.preferred_node == b->v.preferred_node;
         case MPOL_BIND: {
                 int i;
-                for (i = 0; a->v.zonelist->zones[i]; i++)
-                        if (a->v.zonelist->zones[i] != b->v.zonelist->zones[i])
+                for (i = 0; a->v.zonelist->_zonerefs[i].zone; i++) {
+                        struct zone *za, *zb;
+                        za = zonelist_zone(&a->v.zonelist->_zonerefs[i]);
+                        zb = zonelist_zone(&b->v.zonelist->_zonerefs[i]);
+                        if (za != zb)
                                 return 0;
-                return b->v.zonelist->zones[i] == NULL;
+                }
+                return b->v.zonelist->_zonerefs[i].zone == NULL;
         }
         default:
                 BUG();
@@ -1785,12 +1793,12 @@ static void mpol_rebind_policy(struct mempolicy *pol,
                 break;
         case MPOL_BIND: {
                 nodemask_t nodes;
-                struct zone **z;
+                struct zoneref *z;
                 struct zonelist *zonelist;
 
                 nodes_clear(nodes);
-                for (z = pol->v.zonelist->zones; *z; z++)
-                        node_set(zone_to_nid(*z), nodes);
+                for (z = pol->v.zonelist->_zonerefs; z->zone; z++)
+                        node_set(zonelist_node_idx(z), nodes);
                 nodes_remap(tmp, nodes, *mpolmask, *newmask);
                 nodes = tmp;
 
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 2c93502cfcb4..e41504aa5da9 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -176,7 +176,7 @@ static inline enum oom_constraint constrained_alloc(struct zonelist *zonelist,
 {
 #ifdef CONFIG_NUMA
         struct zone *zone;
-        struct zone **z;
+        struct zoneref *z;
         enum zone_type high_zoneidx = gfp_zone(gfp_mask);
         nodemask_t nodes = node_states[N_HIGH_MEMORY];
 
@@ -462,29 +462,29 @@ EXPORT_SYMBOL_GPL(unregister_oom_notifier);
  * if a parallel OOM killing is already taking place that includes a zone in
  * the zonelist.  Otherwise, locks all zones in the zonelist and returns 1.
  */
-int try_set_zone_oom(struct zonelist *zonelist)
+int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_mask)
 {
-        struct zone **z;
+        struct zoneref *z;
+        struct zone *zone;
         int ret = 1;
 
-        z = zonelist->zones;
-
         spin_lock(&zone_scan_mutex);
-        do {
-                if (zone_is_oom_locked(*z)) {
+        for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) {
+                if (zone_is_oom_locked(zone)) {
                         ret = 0;
                         goto out;
                 }
-        } while (*(++z) != NULL);
+        }
+
+        for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) {
+                /*
+                 * Lock each zone in the zonelist under zone_scan_mutex so a
+                 * parallel invocation of try_set_zone_oom() doesn't succeed
+                 * when it shouldn't.
+                 */
+                zone_set_flag(zone, ZONE_OOM_LOCKED);
+        }
 
-        /*
-         * Lock each zone in the zonelist under zone_scan_mutex so a parallel
-         * invocation of try_set_zone_oom() doesn't succeed when it shouldn't.
-         */
-        z = zonelist->zones;
-        do {
-                zone_set_flag(*z, ZONE_OOM_LOCKED);
-        } while (*(++z) != NULL);
 out:
         spin_unlock(&zone_scan_mutex);
         return ret;
@@ -495,16 +495,15 @@ out:
  * allocation attempts with zonelists containing them may now recall the OOM
  * killer, if necessary.
  */
-void clear_zonelist_oom(struct zonelist *zonelist)
+void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_mask)
 {
-        struct zone **z;
-
-        z = zonelist->zones;
+        struct zoneref *z;
+        struct zone *zone;
 
         spin_lock(&zone_scan_mutex);
-        do {
-                zone_clear_flag(*z, ZONE_OOM_LOCKED);
-        } while (*(++z) != NULL);
+        for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) {
+                zone_clear_flag(zone, ZONE_OOM_LOCKED);
+        }
         spin_unlock(&zone_scan_mutex);
 }
 
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 4ccb8651cf22..6d94d04ea784 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1317,7 +1317,7 @@ static nodemask_t *zlc_setup(struct zonelist *zonelist, int alloc_flags)
  * We are low on memory in the second scan, and should leave no stone
  * unturned looking for a free page.
  */
-static int zlc_zone_worth_trying(struct zonelist *zonelist, struct zone **z,
+static int zlc_zone_worth_trying(struct zonelist *zonelist, struct zoneref *z,
                                                 nodemask_t *allowednodes)
 {
         struct zonelist_cache *zlc;     /* cached zonelist speedup info */
@@ -1328,7 +1328,7 @@ static int zlc_zone_worth_trying(struct zonelist *zonelist, struct zone **z,
         if (!zlc)
                 return 1;
 
-        i = z - zonelist->zones;
+        i = z - zonelist->_zonerefs;
         n = zlc->z_to_n[i];
 
         /* This zone is worth trying if it is allowed but not full */
@@ -1340,7 +1340,7 @@ static int zlc_zone_worth_trying(struct zonelist *zonelist, struct zone **z,
  * zlc->fullzones, so that subsequent attempts to allocate a page
  * from that zone don't waste time re-examining it.
  */
-static void zlc_mark_zone_full(struct zonelist *zonelist, struct zone **z)
+static void zlc_mark_zone_full(struct zonelist *zonelist, struct zoneref *z)
 {
         struct zonelist_cache *zlc;     /* cached zonelist speedup info */
         int i;                          /* index of *z in zonelist zones */
@@ -1349,7 +1349,7 @@ static void zlc_mark_zone_full(struct zonelist *zonelist, struct zone **z)
         if (!zlc)
                 return;
 
-        i = z - zonelist->zones;
+        i = z - zonelist->_zonerefs;
 
         set_bit(i, zlc->fullzones);
 }
@@ -1361,13 +1361,13 @@ static nodemask_t *zlc_setup(struct zonelist *zonelist, int alloc_flags)
         return NULL;
 }
 
-static int zlc_zone_worth_trying(struct zonelist *zonelist, struct zone **z,
+static int zlc_zone_worth_trying(struct zonelist *zonelist, struct zoneref *z,
                                 nodemask_t *allowednodes)
 {
         return 1;
 }
 
-static void zlc_mark_zone_full(struct zonelist *zonelist, struct zone **z)
+static void zlc_mark_zone_full(struct zonelist *zonelist, struct zoneref *z)
 {
 }
 #endif  /* CONFIG_NUMA */
@@ -1380,7 +1380,7 @@ static struct page *
 get_page_from_freelist(gfp_t gfp_mask, unsigned int order,
                 struct zonelist *zonelist, int high_zoneidx, int alloc_flags)
 {
-        struct zone **z;
+        struct zoneref *z;
         struct page *page = NULL;
         int classzone_idx;
         struct zone *zone, *preferred_zone;
@@ -1389,8 +1389,8 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order,
         int did_zlc_setup = 0;          /* just call zlc_setup() one time */
 
         z = first_zones_zonelist(zonelist, high_zoneidx);
-        classzone_idx = zone_idx(*z);
-        preferred_zone = *z;
+        classzone_idx = zonelist_zone_idx(z);
+        preferred_zone = zonelist_zone(z);
 
 zonelist_scan:
         /*
@@ -1453,7 +1453,8 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
 {
         const gfp_t wait = gfp_mask & __GFP_WAIT;
         enum zone_type high_zoneidx = gfp_zone(gfp_mask);
-        struct zone **z;
+        struct zoneref *z;
+        struct zone *zone;
         struct page *page;
         struct reclaim_state reclaim_state;
         struct task_struct *p = current;
@@ -1467,9 +1468,9 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
                 return NULL;
 
 restart:
-        z = zonelist->zones;  /* the list of zones suitable for gfp_mask */
+        z = zonelist->_zonerefs;  /* the list of zones suitable for gfp_mask */
 
-        if (unlikely(*z == NULL)) {
+        if (unlikely(!z->zone)) {
                 /*
                  * Happens if we have an empty zonelist as a result of
                  * GFP_THISNODE being used on a memoryless node
@@ -1493,8 +1494,8 @@ restart:
         if (NUMA_BUILD && (gfp_mask & GFP_THISNODE) == GFP_THISNODE)
                 goto nopage;
 
-        for (z = zonelist->zones; *z; z++)
-                wakeup_kswapd(*z, order);
+        for_each_zone_zonelist(zone, z, zonelist, high_zoneidx)
+                wakeup_kswapd(zone, order);
 
         /*
          * OK, we're below the kswapd watermark and have kicked background
@@ -1575,7 +1576,7 @@ nofail_alloc:
                 if (page)
                         goto got_pg;
         } else if ((gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY)) {
-                if (!try_set_zone_oom(zonelist)) {
+                if (!try_set_zone_oom(zonelist, gfp_mask)) {
                         schedule_timeout_uninterruptible(1);
                         goto restart;
                 }
@@ -1589,18 +1590,18 @@ nofail_alloc:
                 page = get_page_from_freelist(gfp_mask|__GFP_HARDWALL, order,
                         zonelist, high_zoneidx, ALLOC_WMARK_HIGH|ALLOC_CPUSET);
                 if (page) {
-                        clear_zonelist_oom(zonelist);
+                        clear_zonelist_oom(zonelist, gfp_mask);
                         goto got_pg;
                 }
 
                 /* The OOM killer will not help higher order allocs so fail */
                 if (order > PAGE_ALLOC_COSTLY_ORDER) {
-                        clear_zonelist_oom(zonelist);
+                        clear_zonelist_oom(zonelist, gfp_mask);
                         goto nopage;
                 }
 
                 out_of_memory(zonelist, gfp_mask, order);
-                clear_zonelist_oom(zonelist);
+                clear_zonelist_oom(zonelist, gfp_mask);
                 goto restart;
         }
 
@@ -1702,7 +1703,7 @@ EXPORT_SYMBOL(free_pages);
 
 static unsigned int nr_free_zone_pages(int offset)
 {
-        struct zone **z;
+        struct zoneref *z;
         struct zone *zone;
 
         /* Just pick one node, since fallback list is circular */
@@ -1896,7 +1897,8 @@ static int build_zonelists_node(pg_data_t *pgdat, struct zonelist *zonelist,
                 zone_type--;
                 zone = pgdat->node_zones + zone_type;
                 if (populated_zone(zone)) {
-                        zonelist->zones[nr_zones++] = zone;
+                        zoneref_set_zone(zone,
+                                &zonelist->_zonerefs[nr_zones++]);
                         check_highest_zone(zone_type);
                 }
 
@@ -2072,11 +2074,12 @@ static void build_zonelists_in_node_order(pg_data_t *pgdat, int node)
         struct zonelist *zonelist;
 
         zonelist = &pgdat->node_zonelists[0];
-        for (j = 0; zonelist->zones[j] != NULL; j++)
+        for (j = 0; zonelist->_zonerefs[j].zone != NULL; j++)
                 ;
         j = build_zonelists_node(NODE_DATA(node), zonelist, j,
                                                         MAX_NR_ZONES - 1);
-        zonelist->zones[j] = NULL;
+        zonelist->_zonerefs[j].zone = NULL;
+        zonelist->_zonerefs[j].zone_idx = 0;
 }
 
 /*
@@ -2089,7 +2092,8 @@ static void build_thisnode_zonelists(pg_data_t *pgdat)
 
         zonelist = &pgdat->node_zonelists[1];
         j = build_zonelists_node(pgdat, zonelist, 0, MAX_NR_ZONES - 1);
-        zonelist->zones[j] = NULL;
+        zonelist->_zonerefs[j].zone = NULL;
+        zonelist->_zonerefs[j].zone_idx = 0;
 }
 
 /*
@@ -2114,12 +2118,14 @@ static void build_zonelists_in_zone_order(pg_data_t *pgdat, int nr_nodes)
                         node = node_order[j];
                         z = &NODE_DATA(node)->node_zones[zone_type];
                         if (populated_zone(z)) {
-                                zonelist->zones[pos++] = z;
+                                zoneref_set_zone(z,
+                                        &zonelist->_zonerefs[pos++]);
                                 check_highest_zone(zone_type);
                         }
                 }
         }
-        zonelist->zones[pos] = NULL;
+        zonelist->_zonerefs[pos].zone = NULL;
+        zonelist->_zonerefs[pos].zone_idx = 0;
 }
 
 static int default_zonelist_order(void)
@@ -2196,7 +2202,8 @@ static void build_zonelists(pg_data_t *pgdat)
         /* initialize zonelists */
         for (i = 0; i < MAX_ZONELISTS; i++) {
                 zonelist = pgdat->node_zonelists + i;
-                zonelist->zones[0] = NULL;
+                zonelist->_zonerefs[0].zone = NULL;
+                zonelist->_zonerefs[0].zone_idx = 0;
         }
 
         /* NUMA-aware ordering of nodes */
@@ -2248,13 +2255,13 @@ static void build_zonelist_cache(pg_data_t *pgdat)
 {
         struct zonelist *zonelist;
         struct zonelist_cache *zlc;
-        struct zone **z;
+        struct zoneref *z;
 
         zonelist = &pgdat->node_zonelists[0];
         zonelist->zlcache_ptr = zlc = &zonelist->zlcache;
         bitmap_zero(zlc->fullzones, MAX_ZONES_PER_ZONELIST);
-        for (z = zonelist->zones; *z; z++)
-                zlc->z_to_n[z - zonelist->zones] = zone_to_nid(*z);
+        for (z = zonelist->_zonerefs; z->zone; z++)
+                zlc->z_to_n[z - zonelist->_zonerefs] = zonelist_node_idx(z);
 }
 
 
@@ -2297,7 +2304,8 @@ static void build_zonelists(pg_data_t *pgdat)
                                                         MAX_NR_ZONES - 1);
         }
 
-        zonelist->zones[j] = NULL;
+        zonelist->_zonerefs[j].zone = NULL;
+        zonelist->_zonerefs[j].zone_idx = 0;
 }
 
 /* non-NUMA variant of zonelist performance cache - just NULL zlcache_ptr */
diff --git a/mm/slab.c b/mm/slab.c
index 29851841da62..7bc4a136846e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3242,7 +3242,7 @@ static void *fallback_alloc(struct kmem_cache *cache, gfp_t flags)
 {
         struct zonelist *zonelist;
         gfp_t local_flags;
-        struct zone **z;
+        struct zoneref *z;
         struct zone *zone;
         enum zone_type high_zoneidx = gfp_zone(flags);
         void *obj = NULL;
diff --git a/mm/slub.c b/mm/slub.c
index 80d20cc1c0f8..48fff83a1e9d 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1284,7 +1284,7 @@ static struct page *get_any_partial(struct kmem_cache *s, gfp_t flags)
 {
 #ifdef CONFIG_NUMA
         struct zonelist *zonelist;
-        struct zone **z;
+        struct zoneref *z;
         struct zone *zone;
         enum zone_type high_zoneidx = gfp_zone(flags);
         struct page *page;
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 0515b8f44894..eceac9f9032f 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1251,7 +1251,7 @@ static unsigned long shrink_zones(int priority, struct zonelist *zonelist,
 {
         enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask);
         unsigned long nr_reclaimed = 0;
-        struct zone **z;
+        struct zoneref *z;
         struct zone *zone;
 
         sc->all_unreclaimable = 1;
@@ -1301,7 +1301,7 @@ static unsigned long shrink_zones(int priority, struct zonelist *zonelist,
  * allocation attempt will fail.
  */
 static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
-                                        gfp_t gfp_mask, struct scan_control *sc)
+                                        struct scan_control *sc)
 {
         int priority;
         int ret = 0;
@@ -1309,9 +1309,9 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
         unsigned long nr_reclaimed = 0;
         struct reclaim_state *reclaim_state = current->reclaim_state;
         unsigned long lru_pages = 0;
-        struct zone **z;
+        struct zoneref *z;
         struct zone *zone;
-        enum zone_type high_zoneidx = gfp_zone(gfp_mask);
+        enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask);
 
         if (scan_global_lru(sc))
                 count_vm_event(ALLOCSTALL);
@@ -1339,7 +1339,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
                  * over limit cgroups
                  */
                 if (scan_global_lru(sc)) {
-                        shrink_slab(sc->nr_scanned, gfp_mask, lru_pages);
+                        shrink_slab(sc->nr_scanned, sc->gfp_mask, lru_pages);
                         if (reclaim_state) {
                                 nr_reclaimed += reclaim_state->reclaimed_slab;
                                 reclaim_state->reclaimed_slab = 0;
@@ -1410,7 +1410,7 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
                 .isolate_pages = isolate_pages_global,
         };
 
-        return do_try_to_free_pages(zonelist, gfp_mask, &sc);
+        return do_try_to_free_pages(zonelist, &sc);
 }
 
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR
@@ -1419,7 +1419,6 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont,
                                                 gfp_t gfp_mask)
 {
         struct scan_control sc = {
-                .gfp_mask = gfp_mask,
                 .may_writepage = !laptop_mode,
                 .may_swap = 1,
                 .swap_cluster_max = SWAP_CLUSTER_MAX,
@@ -1429,12 +1428,11 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont,
                 .isolate_pages = mem_cgroup_isolate_pages,
         };
         struct zonelist *zonelist;
-        int target_zone = gfp_zone(GFP_HIGHUSER_MOVABLE);
 
-        zonelist = &NODE_DATA(numa_node_id())->node_zonelists[target_zone];
-        if (do_try_to_free_pages(zonelist, sc.gfp_mask, &sc))
-                return 1;
-        return 0;
+        sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) |
+                        (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK);
+        zonelist = NODE_DATA(numa_node_id())->node_zonelists;
+        return do_try_to_free_pages(zonelist, &sc);
 }
 #endif