vmscan: Use an indexed array for LRU variables

Currently we are defining explicit variables for the inactive and active
list.  An indexed array can be more generic and avoid repeating similar
code in several places in the reclaim code.

We are saving a few bytes in terms of code size:

Before:

   text    data     bss     dec     hex filename
4097753  573120 4092484 8763357  85b7dd vmlinux

After:

   text    data     bss     dec     hex filename
4097729  573120 4092484 8763333  85b7c5 vmlinux

Having an easy way to add new lru lists may ease future work on the
reclaim code.

Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Signed-off-by: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

5 files changed, 108 insertions, 141 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 36896f3eb7f5..c0cbd7790c51 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -32,6 +32,7 @@
 #include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/vmalloc.h>
+#include <linux/mm_inline.h>
 
 #include <asm/uaccess.h>
 
@@ -85,22 +86,13 @@ static s64 mem_cgroup_read_stat(struct mem_cgroup_stat *stat,
 /*
  * per-zone information in memory controller.
  */
-
-enum mem_cgroup_zstat_index {
-        MEM_CGROUP_ZSTAT_ACTIVE,
-        MEM_CGROUP_ZSTAT_INACTIVE,
-
-        NR_MEM_CGROUP_ZSTAT,
-};
-
 struct mem_cgroup_per_zone {
         /*
          * spin_lock to protect the per cgroup LRU
          */
         spinlock_t              lru_lock;
-        struct list_head        active_list;
-        struct list_head        inactive_list;
-        unsigned long count[NR_MEM_CGROUP_ZSTAT];
+        struct list_head        lists[NR_LRU_LISTS];
+        unsigned long           count[NR_LRU_LISTS];
 };
 /* Macro for accessing counter */
 #define MEM_CGROUP_ZSTAT(mz, idx)       ((mz)->count[(idx)])
@@ -227,7 +219,7 @@ page_cgroup_zoneinfo(struct page_cgroup *pc)
 }
 
 static unsigned long mem_cgroup_get_all_zonestat(struct mem_cgroup *mem,
-                                        enum mem_cgroup_zstat_index idx)
+                                        enum lru_list idx)
 {
         int nid, zid;
         struct mem_cgroup_per_zone *mz;
@@ -297,11 +289,9 @@ static void __mem_cgroup_remove_list(struct mem_cgroup_per_zone *mz,
                         struct page_cgroup *pc)
 {
         int from = pc->flags & PAGE_CGROUP_FLAG_ACTIVE;
+        int lru = !!from;
 
-        if (from)
-                MEM_CGROUP_ZSTAT(mz, MEM_CGROUP_ZSTAT_ACTIVE) -= 1;
-        else
-                MEM_CGROUP_ZSTAT(mz, MEM_CGROUP_ZSTAT_INACTIVE) -= 1;
+        MEM_CGROUP_ZSTAT(mz, lru) -= 1;
 
         mem_cgroup_charge_statistics(pc->mem_cgroup, pc->flags, false);
         list_del(&pc->lru);
@@ -310,37 +300,35 @@ static void __mem_cgroup_remove_list(struct mem_cgroup_per_zone *mz,
 static void __mem_cgroup_add_list(struct mem_cgroup_per_zone *mz,
                                 struct page_cgroup *pc)
 {
-        int to = pc->flags & PAGE_CGROUP_FLAG_ACTIVE;
+        int lru = LRU_INACTIVE;
+
+        if (pc->flags & PAGE_CGROUP_FLAG_ACTIVE)
+                lru += LRU_ACTIVE;
+
+        MEM_CGROUP_ZSTAT(mz, lru) += 1;
+        list_add(&pc->lru, &mz->lists[lru]);
 
-        if (!to) {
-                MEM_CGROUP_ZSTAT(mz, MEM_CGROUP_ZSTAT_INACTIVE) += 1;
-                list_add(&pc->lru, &mz->inactive_list);
-        } else {
-                MEM_CGROUP_ZSTAT(mz, MEM_CGROUP_ZSTAT_ACTIVE) += 1;
-                list_add(&pc->lru, &mz->active_list);
-        }
         mem_cgroup_charge_statistics(pc->mem_cgroup, pc->flags, true);
 }
 
 static void __mem_cgroup_move_lists(struct page_cgroup *pc, bool active)
 {
-        int from = pc->flags & PAGE_CGROUP_FLAG_ACTIVE;
         struct mem_cgroup_per_zone *mz = page_cgroup_zoneinfo(pc);
+        int lru = LRU_INACTIVE;
 
-        if (from)
-                MEM_CGROUP_ZSTAT(mz, MEM_CGROUP_ZSTAT_ACTIVE) -= 1;
-        else
-                MEM_CGROUP_ZSTAT(mz, MEM_CGROUP_ZSTAT_INACTIVE) -= 1;
+        if (pc->flags & PAGE_CGROUP_FLAG_ACTIVE)
+                lru += LRU_ACTIVE;
 
-        if (active) {
-                MEM_CGROUP_ZSTAT(mz, MEM_CGROUP_ZSTAT_ACTIVE) += 1;
+        MEM_CGROUP_ZSTAT(mz, lru) -= 1;
+
+        if (active)
                 pc->flags |= PAGE_CGROUP_FLAG_ACTIVE;
-                list_move(&pc->lru, &mz->active_list);
-        } else {
-                MEM_CGROUP_ZSTAT(mz, MEM_CGROUP_ZSTAT_INACTIVE) += 1;
+        else
                 pc->flags &= ~PAGE_CGROUP_FLAG_ACTIVE;
-                list_move(&pc->lru, &mz->inactive_list);
-        }
+
+        lru = !!active;
+        MEM_CGROUP_ZSTAT(mz, lru) += 1;
+        list_move(&pc->lru, &mz->lists[lru]);
 }
 
 int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *mem)
@@ -412,8 +400,8 @@ long mem_cgroup_reclaim_imbalance(struct mem_cgroup *mem)
 {
         unsigned long active, inactive;
         /* active and inactive are the number of pages. 'long' is ok.*/
-        active = mem_cgroup_get_all_zonestat(mem, MEM_CGROUP_ZSTAT_ACTIVE);
-        inactive = mem_cgroup_get_all_zonestat(mem, MEM_CGROUP_ZSTAT_INACTIVE);
+        active = mem_cgroup_get_all_zonestat(mem, LRU_ACTIVE);
+        inactive = mem_cgroup_get_all_zonestat(mem, LRU_INACTIVE);
         return (long) (active / (inactive + 1));
 }
 
@@ -444,28 +432,17 @@ void mem_cgroup_record_reclaim_priority(struct mem_cgroup *mem, int priority)
  * (see include/linux/mmzone.h)
  */
 
-long mem_cgroup_calc_reclaim_active(struct mem_cgroup *mem,
-                                   struct zone *zone, int priority)
+long mem_cgroup_calc_reclaim(struct mem_cgroup *mem, struct zone *zone,
+                                        int priority, enum lru_list lru)
 {
-        long nr_active;
+        long nr_pages;
         int nid = zone->zone_pgdat->node_id;
         int zid = zone_idx(zone);
         struct mem_cgroup_per_zone *mz = mem_cgroup_zoneinfo(mem, nid, zid);
 
-        nr_active = MEM_CGROUP_ZSTAT(mz, MEM_CGROUP_ZSTAT_ACTIVE);
-        return (nr_active >> priority);
-}
-
-long mem_cgroup_calc_reclaim_inactive(struct mem_cgroup *mem,
-                                        struct zone *zone, int priority)
-{
-        long nr_inactive;
-        int nid = zone->zone_pgdat->node_id;
-        int zid = zone_idx(zone);
-        struct mem_cgroup_per_zone *mz = mem_cgroup_zoneinfo(mem, nid, zid);
+        nr_pages = MEM_CGROUP_ZSTAT(mz, lru);
 
-        nr_inactive = MEM_CGROUP_ZSTAT(mz, MEM_CGROUP_ZSTAT_INACTIVE);
-        return (nr_inactive >> priority);
+        return (nr_pages >> priority);
 }
 
 unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
@@ -484,14 +461,11 @@ unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
         int nid = z->zone_pgdat->node_id;
         int zid = zone_idx(z);
         struct mem_cgroup_per_zone *mz;
+        int lru = !!active;
 
         BUG_ON(!mem_cont);
         mz = mem_cgroup_zoneinfo(mem_cont, nid, zid);
-        if (active)
-                src = &mz->active_list;
-        else
-                src = &mz->inactive_list;
-
+        src = &mz->lists[lru];
 
         spin_lock(&mz->lru_lock);
         scan = 0;
@@ -863,7 +837,7 @@ int mem_cgroup_resize_limit(struct mem_cgroup *memcg, unsigned long long val)
 #define FORCE_UNCHARGE_BATCH    (128)
 static void mem_cgroup_force_empty_list(struct mem_cgroup *mem,
                             struct mem_cgroup_per_zone *mz,
-                            int active)
+                            enum lru_list lru)
 {
         struct page_cgroup *pc;
         struct page *page;
@@ -871,10 +845,7 @@ static void mem_cgroup_force_empty_list(struct mem_cgroup *mem,
         unsigned long flags;
         struct list_head *list;
 
-        if (active)
-                list = &mz->active_list;
-        else
-                list = &mz->inactive_list;
+        list = &mz->lists[lru];
 
         spin_lock_irqsave(&mz->lru_lock, flags);
         while (!list_empty(list)) {
@@ -922,11 +893,10 @@ static int mem_cgroup_force_empty(struct mem_cgroup *mem)
                 for_each_node_state(node, N_POSSIBLE)
                         for (zid = 0; zid < MAX_NR_ZONES; zid++) {
                                 struct mem_cgroup_per_zone *mz;
+                                enum lru_list l;
                                 mz = mem_cgroup_zoneinfo(mem, node, zid);
-                                /* drop all page_cgroup in active_list */
-                                mem_cgroup_force_empty_list(mem, mz, 1);
-                                /* drop all page_cgroup in inactive_list */
-                                mem_cgroup_force_empty_list(mem, mz, 0);
+                                for_each_lru(l)
+                                        mem_cgroup_force_empty_list(mem, mz, l);
                         }
         }
         ret = 0;
@@ -1015,9 +985,9 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,
                 unsigned long active, inactive;
 
                 inactive = mem_cgroup_get_all_zonestat(mem_cont,
-                                                MEM_CGROUP_ZSTAT_INACTIVE);
+                                                LRU_INACTIVE);
                 active = mem_cgroup_get_all_zonestat(mem_cont,
-                                                MEM_CGROUP_ZSTAT_ACTIVE);
+                                                LRU_ACTIVE);
                 cb->fill(cb, "active", (active) * PAGE_SIZE);
                 cb->fill(cb, "inactive", (inactive) * PAGE_SIZE);
         }
@@ -1062,6 +1032,7 @@ static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *mem, int node)
 {
         struct mem_cgroup_per_node *pn;
         struct mem_cgroup_per_zone *mz;
+        enum lru_list l;
         int zone, tmp = node;
         /*
          * This routine is called against possible nodes.
@@ -1082,9 +1053,9 @@ static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *mem, int node)
 
         for (zone = 0; zone < MAX_NR_ZONES; zone++) {
                 mz = &pn->zoneinfo[zone];
-                INIT_LIST_HEAD(&mz->active_list);
-                INIT_LIST_HEAD(&mz->inactive_list);
                 spin_lock_init(&mz->lru_lock);
+                for_each_lru(l)
+                        INIT_LIST_HEAD(&mz->lists[l]);
         }
         return 0;
 }
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 9eb9eb928285..ee7a96ef40dc 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3414,6 +3414,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
         for (j = 0; j < MAX_NR_ZONES; j++) {
                 struct zone *zone = pgdat->node_zones + j;
                 unsigned long size, realsize, memmap_pages;
+                enum lru_list l;
 
                 size = zone_spanned_pages_in_node(nid, j, zones_size);
                 realsize = size - zone_absent_pages_in_node(nid, j,
@@ -3465,10 +3466,10 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
                 zone->prev_priority = DEF_PRIORITY;
 
                 zone_pcp_init(zone);
-                INIT_LIST_HEAD(&zone->active_list);
-                INIT_LIST_HEAD(&zone->inactive_list);
-                zone->nr_scan_active = 0;
-                zone->nr_scan_inactive = 0;
+                for_each_lru(l) {
+                        INIT_LIST_HEAD(&zone->lru[l].list);
+                        zone->lru[l].nr_scan = 0;
+                }
                 zap_zone_vm_stats(zone);
                 zone->flags = 0;
                 if (!size)
diff --git a/mm/swap.c b/mm/swap.c
index 9e0cb3118079..82c2b3a76f94 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -117,7 +117,7 @@ static void pagevec_move_tail(struct pagevec *pvec)
                         spin_lock(&zone->lru_lock);
                 }
                 if (PageLRU(page) && !PageActive(page)) {
-                        list_move_tail(&page->lru, &zone->inactive_list);
+                        list_move_tail(&page->lru, &zone->lru[LRU_INACTIVE].list);
                         pgmoved++;
                 }
         }
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 1fd4912a596c..46fdaa546b8d 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -819,10 +819,10 @@ static unsigned long isolate_pages_global(unsigned long nr,
                                         int active)
 {
         if (active)
-                return isolate_lru_pages(nr, &z->active_list, dst,
+                return isolate_lru_pages(nr, &z->lru[LRU_ACTIVE].list, dst,
                                                 scanned, order, mode);
         else
-                return isolate_lru_pages(nr, &z->inactive_list, dst,
+                return isolate_lru_pages(nr, &z->lru[LRU_INACTIVE].list, dst,
                                                 scanned, order, mode);
 }
 
@@ -973,10 +973,7 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
                         VM_BUG_ON(PageLRU(page));
                         SetPageLRU(page);
                         list_del(&page->lru);
-                        if (PageActive(page))
-                                add_page_to_active_list(zone, page);
-                        else
-                                add_page_to_inactive_list(zone, page);
+                        add_page_to_lru_list(zone, page, page_lru(page));
                         if (!pagevec_add(&pvec, page)) {
                                 spin_unlock_irq(&zone->lru_lock);
                                 __pagevec_release(&pvec);
@@ -1144,8 +1141,8 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
         int pgdeactivate = 0;
         unsigned long pgscanned;
         LIST_HEAD(l_hold);      /* The pages which were snipped off */
-        LIST_HEAD(l_inactive);  /* Pages to go onto the inactive_list */
-        LIST_HEAD(l_active);    /* Pages to go onto the active_list */
+        LIST_HEAD(l_active);
+        LIST_HEAD(l_inactive);
         struct page *page;
         struct pagevec pvec;
         int reclaim_mapped = 0;
@@ -1194,7 +1191,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
                 VM_BUG_ON(!PageActive(page));
                 ClearPageActive(page);
 
-                list_move(&page->lru, &zone->inactive_list);
+                list_move(&page->lru, &zone->lru[LRU_INACTIVE].list);
                 mem_cgroup_move_lists(page, false);
                 pgmoved++;
                 if (!pagevec_add(&pvec, page)) {
@@ -1224,7 +1221,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
                 SetPageLRU(page);
                 VM_BUG_ON(!PageActive(page));
 
-                list_move(&page->lru, &zone->active_list);
+                list_move(&page->lru, &zone->lru[LRU_ACTIVE].list);
                 mem_cgroup_move_lists(page, true);
                 pgmoved++;
                 if (!pagevec_add(&pvec, page)) {
@@ -1244,65 +1241,64 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
         pagevec_release(&pvec);
 }
 
+static unsigned long shrink_list(enum lru_list l, unsigned long nr_to_scan,
+        struct zone *zone, struct scan_control *sc, int priority)
+{
+        if (l == LRU_ACTIVE) {
+                shrink_active_list(nr_to_scan, zone, sc, priority);
+                return 0;
+        }
+        return shrink_inactive_list(nr_to_scan, zone, sc);
+}
+
 /*
  * This is a basic per-zone page freer.  Used by both kswapd and direct reclaim.
  */
 static unsigned long shrink_zone(int priority, struct zone *zone,
                                 struct scan_control *sc)
 {
-        unsigned long nr_active;
-        unsigned long nr_inactive;
+        unsigned long nr[NR_LRU_LISTS];
         unsigned long nr_to_scan;
         unsigned long nr_reclaimed = 0;
+        enum lru_list l;
 
         if (scan_global_lru(sc)) {
                 /*
                  * Add one to nr_to_scan just to make sure that the kernel
                  * will slowly sift through the active list.
                  */
-                zone->nr_scan_active +=
-                        (zone_page_state(zone, NR_ACTIVE) >> priority) + 1;
-                nr_active = zone->nr_scan_active;
-                zone->nr_scan_inactive +=
-                        (zone_page_state(zone, NR_INACTIVE) >> priority) + 1;
-                nr_inactive = zone->nr_scan_inactive;
-                if (nr_inactive >= sc->swap_cluster_max)
-                        zone->nr_scan_inactive = 0;
-                else
-                        nr_inactive = 0;
-
-                if (nr_active >= sc->swap_cluster_max)
-                        zone->nr_scan_active = 0;
-                else
-                        nr_active = 0;
+                for_each_lru(l) {
+                        zone->lru[l].nr_scan += (zone_page_state(zone,
+                                        NR_LRU_BASE + l)  >> priority) + 1;
+                        nr[l] = zone->lru[l].nr_scan;
+                        if (nr[l] >= sc->swap_cluster_max)
+                                zone->lru[l].nr_scan = 0;
+                        else
+                                nr[l] = 0;
+                }
         } else {
                 /*
                  * This reclaim occurs not because zone memory shortage but
                  * because memory controller hits its limit.
                  * Then, don't modify zone reclaim related data.
                  */
-                nr_active = mem_cgroup_calc_reclaim_active(sc->mem_cgroup,
-                                        zone, priority);
+                nr[LRU_ACTIVE] = mem_cgroup_calc_reclaim(sc->mem_cgroup,
+                                        zone, priority, LRU_ACTIVE);
 
-                nr_inactive = mem_cgroup_calc_reclaim_inactive(sc->mem_cgroup,
-                                        zone, priority);
+                nr[LRU_INACTIVE] = mem_cgroup_calc_reclaim(sc->mem_cgroup,
+                                        zone, priority, LRU_INACTIVE);
         }
 
-
-        while (nr_active || nr_inactive) {
-                if (nr_active) {
-                        nr_to_scan = min(nr_active,
+        while (nr[LRU_ACTIVE] || nr[LRU_INACTIVE]) {
+                for_each_lru(l) {
+                        if (nr[l]) {
+                                nr_to_scan = min(nr[l],
                                         (unsigned long)sc->swap_cluster_max);
-                        nr_active -= nr_to_scan;
-                        shrink_active_list(nr_to_scan, zone, sc, priority);
-                }
+                                nr[l] -= nr_to_scan;
 
-                if (nr_inactive) {
-                        nr_to_scan = min(nr_inactive,
-                                        (unsigned long)sc->swap_cluster_max);
-                        nr_inactive -= nr_to_scan;
-                        nr_reclaimed += shrink_inactive_list(nr_to_scan, zone,
-                                                                sc);
+                                nr_reclaimed += shrink_list(l, nr_to_scan,
+                                                        zone, sc, priority);
+                        }
                 }
         }
 
@@ -1819,6 +1815,7 @@ static unsigned long shrink_all_zones(unsigned long nr_pages, int prio,
 {
         struct zone *zone;
         unsigned long nr_to_scan, ret = 0;
+        enum lru_list l;
 
         for_each_zone(zone) {
 
@@ -1828,28 +1825,25 @@ static unsigned long shrink_all_zones(unsigned long nr_pages, int prio,
                 if (zone_is_all_unreclaimable(zone) && prio != DEF_PRIORITY)
                         continue;
 
-                /* For pass = 0 we don't shrink the active list */
-                if (pass > 0) {
-                        zone->nr_scan_active +=
-                                (zone_page_state(zone, NR_ACTIVE) >> prio) + 1;
-                        if (zone->nr_scan_active >= nr_pages || pass > 3) {
-                                zone->nr_scan_active = 0;
+                for_each_lru(l) {
+                        /* For pass = 0 we don't shrink the active list */
+                        if (pass == 0 && l == LRU_ACTIVE)
+                                continue;
+
+                        zone->lru[l].nr_scan +=
+                                (zone_page_state(zone, NR_LRU_BASE + l)
+                                                                >> prio) + 1;
+                        if (zone->lru[l].nr_scan >= nr_pages || pass > 3) {
+                                zone->lru[l].nr_scan = 0;
                                 nr_to_scan = min(nr_pages,
-                                        zone_page_state(zone, NR_ACTIVE));
-                                shrink_active_list(nr_to_scan, zone, sc, prio);
+                                        zone_page_state(zone,
+                                                        NR_LRU_BASE + l));
+                                ret += shrink_list(l, nr_to_scan, zone,
+                                                                sc, prio);
+                                if (ret >= nr_pages)
+                                        return ret;
                         }
                 }
-
-                zone->nr_scan_inactive +=
-                        (zone_page_state(zone, NR_INACTIVE) >> prio) + 1;
-                if (zone->nr_scan_inactive >= nr_pages || pass > 3) {
-                        zone->nr_scan_inactive = 0;
-                        nr_to_scan = min(nr_pages,
-                                zone_page_state(zone, NR_INACTIVE));
-                        ret += shrink_inactive_list(nr_to_scan, zone, sc);
-                        if (ret >= nr_pages)
-                                return ret;
-                }
         }
 
         return ret;
diff --git a/mm/vmstat.c b/mm/vmstat.c
index d7826af2fb07..52c0335c1b71 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -696,7 +696,8 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
                    zone->pages_low,
                    zone->pages_high,
                    zone->pages_scanned,
-                   zone->nr_scan_active, zone->nr_scan_inactive,
+                   zone->lru[LRU_ACTIVE].nr_scan,
+                   zone->lru[LRU_INACTIVE].nr_scan,
                    zone->spanned_pages,
                    zone->present_pages);