1 files changed, 54 insertions, 71 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index a500cb0594c4..a9559b91603c 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -676,9 +676,11 @@ static void disarm_static_keys(struct mem_cgroup *memcg)
 static void drain_all_stock_async(struct mem_cgroup *memcg);
 
 static struct mem_cgroup_per_zone *
-mem_cgroup_zoneinfo(struct mem_cgroup *memcg, int nid, int zid)
+mem_cgroup_zone_zoneinfo(struct mem_cgroup *memcg, struct zone *zone)
 {
-        VM_BUG_ON((unsigned)nid >= nr_node_ids);
+        int nid = zone_to_nid(zone);
+        int zid = zone_idx(zone);
+
         return &memcg->nodeinfo[nid]->zoneinfo[zid];
 }
 
@@ -688,12 +690,12 @@ struct cgroup_subsys_state *mem_cgroup_css(struct mem_cgroup *memcg)
 }
 
 static struct mem_cgroup_per_zone *
-page_cgroup_zoneinfo(struct mem_cgroup *memcg, struct page *page)
+mem_cgroup_page_zoneinfo(struct mem_cgroup *memcg, struct page *page)
 {
         int nid = page_to_nid(page);
         int zid = page_zonenum(page);
 
-        return mem_cgroup_zoneinfo(memcg, nid, zid);
+        return &memcg->nodeinfo[nid]->zoneinfo[zid];
 }
 
 static struct mem_cgroup_tree_per_zone *
@@ -711,11 +713,9 @@ soft_limit_tree_from_page(struct page *page)
         return &soft_limit_tree.rb_tree_per_node[nid]->rb_tree_per_zone[zid];
 }
 
-static void
-__mem_cgroup_insert_exceeded(struct mem_cgroup *memcg,
-                                struct mem_cgroup_per_zone *mz,
-                                struct mem_cgroup_tree_per_zone *mctz,
-                                unsigned long long new_usage_in_excess)
+static void __mem_cgroup_insert_exceeded(struct mem_cgroup_per_zone *mz,
+                                         struct mem_cgroup_tree_per_zone *mctz,
+                                         unsigned long long new_usage_in_excess)
 {
         struct rb_node **p = &mctz->rb_root.rb_node;
         struct rb_node *parent = NULL;
@@ -745,10 +745,8 @@ __mem_cgroup_insert_exceeded(struct mem_cgroup *memcg,
         mz->on_tree = true;
 }
 
-static void
-__mem_cgroup_remove_exceeded(struct mem_cgroup *memcg,
-                                struct mem_cgroup_per_zone *mz,
-                                struct mem_cgroup_tree_per_zone *mctz)
+static void __mem_cgroup_remove_exceeded(struct mem_cgroup_per_zone *mz,
+                                         struct mem_cgroup_tree_per_zone *mctz)
 {
         if (!mz->on_tree)
                 return;
@@ -756,13 +754,11 @@ __mem_cgroup_remove_exceeded(struct mem_cgroup *memcg,
         mz->on_tree = false;
 }
 
-static void
-mem_cgroup_remove_exceeded(struct mem_cgroup *memcg,
-                                struct mem_cgroup_per_zone *mz,
-                                struct mem_cgroup_tree_per_zone *mctz)
+static void mem_cgroup_remove_exceeded(struct mem_cgroup_per_zone *mz,
+                                       struct mem_cgroup_tree_per_zone *mctz)
 {
         spin_lock(&mctz->lock);
-        __mem_cgroup_remove_exceeded(memcg, mz, mctz);
+        __mem_cgroup_remove_exceeded(mz, mctz);
         spin_unlock(&mctz->lock);
 }
 
@@ -772,16 +768,14 @@ static void mem_cgroup_update_tree(struct mem_cgroup *memcg, struct page *page)
         unsigned long long excess;
         struct mem_cgroup_per_zone *mz;
         struct mem_cgroup_tree_per_zone *mctz;
-        int nid = page_to_nid(page);
-        int zid = page_zonenum(page);
-        mctz = soft_limit_tree_from_page(page);
 
+        mctz = soft_limit_tree_from_page(page);
         /*
          * Necessary to update all ancestors when hierarchy is used.
          * because their event counter is not touched.
          */
         for (; memcg; memcg = parent_mem_cgroup(memcg)) {
-                mz = mem_cgroup_zoneinfo(memcg, nid, zid);
+                mz = mem_cgroup_page_zoneinfo(memcg, page);
                 excess = res_counter_soft_limit_excess(&memcg->res);
                 /*
                  * We have to update the tree if mz is on RB-tree or
@@ -791,12 +785,12 @@ static void mem_cgroup_update_tree(struct mem_cgroup *memcg, struct page *page)
                         spin_lock(&mctz->lock);
                         /* if on-tree, remove it */
                         if (mz->on_tree)
-                                __mem_cgroup_remove_exceeded(memcg, mz, mctz);
+                                __mem_cgroup_remove_exceeded(mz, mctz);
                         /*
                          * Insert again. mz->usage_in_excess will be updated.
                          * If excess is 0, no tree ops.
                          */
-                        __mem_cgroup_insert_exceeded(memcg, mz, mctz, excess);
+                        __mem_cgroup_insert_exceeded(mz, mctz, excess);
                         spin_unlock(&mctz->lock);
                 }
         }
@@ -804,15 +798,15 @@ static void mem_cgroup_update_tree(struct mem_cgroup *memcg, struct page *page)
 
 static void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg)
 {
-        int node, zone;
-        struct mem_cgroup_per_zone *mz;
         struct mem_cgroup_tree_per_zone *mctz;
+        struct mem_cgroup_per_zone *mz;
+        int nid, zid;
 
-        for_each_node(node) {
-                for (zone = 0; zone < MAX_NR_ZONES; zone++) {
-                        mz = mem_cgroup_zoneinfo(memcg, node, zone);
-                        mctz = soft_limit_tree_node_zone(node, zone);
-                        mem_cgroup_remove_exceeded(memcg, mz, mctz);
+        for_each_node(nid) {
+                for (zid = 0; zid < MAX_NR_ZONES; zid++) {
+                        mz = &memcg->nodeinfo[nid]->zoneinfo[zid];
+                        mctz = soft_limit_tree_node_zone(nid, zid);
+                        mem_cgroup_remove_exceeded(mz, mctz);
                 }
         }
 }
@@ -835,7 +829,7 @@ retry:
          * we will to add it back at the end of reclaim to its correct
          * position in the tree.
          */
-        __mem_cgroup_remove_exceeded(mz->memcg, mz, mctz);
+        __mem_cgroup_remove_exceeded(mz, mctz);
         if (!res_counter_soft_limit_excess(&mz->memcg->res) ||
                 !css_tryget(&mz->memcg->css))
                 goto retry;
@@ -946,8 +940,7 @@ static void mem_cgroup_charge_statistics(struct mem_cgroup *memcg,
         __this_cpu_add(memcg->stat->nr_page_events, nr_pages);
 }
 
-unsigned long
-mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list lru)
+unsigned long mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list lru)
 {
         struct mem_cgroup_per_zone *mz;
 
@@ -955,46 +948,38 @@ mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list lru)
         return mz->lru_size[lru];
 }
 
-static unsigned long
-mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, int nid, int zid,
-                        unsigned int lru_mask)
+static unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg,
+                                                  int nid,
+                                                  unsigned int lru_mask)
 {
-        struct mem_cgroup_per_zone *mz;
-        enum lru_list lru;
-        unsigned long ret = 0;
-
-        mz = mem_cgroup_zoneinfo(memcg, nid, zid);
-
-        for_each_lru(lru) {
-                if (BIT(lru) & lru_mask)
-                        ret += mz->lru_size[lru];
-        }
-        return ret;
-}
-
-static unsigned long
-mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg,
-                        int nid, unsigned int lru_mask)
-{
-        u64 total = 0;
+        unsigned long nr = 0;
         int zid;
 
-        for (zid = 0; zid < MAX_NR_ZONES; zid++)
-                total += mem_cgroup_zone_nr_lru_pages(memcg,
-                                                nid, zid, lru_mask);
+        VM_BUG_ON((unsigned)nid >= nr_node_ids);
 
-        return total;
+        for (zid = 0; zid < MAX_NR_ZONES; zid++) {
+                struct mem_cgroup_per_zone *mz;
+                enum lru_list lru;
+
+                for_each_lru(lru) {
+                        if (!(BIT(lru) & lru_mask))
+                                continue;
+                        mz = &memcg->nodeinfo[nid]->zoneinfo[zid];
+                        nr += mz->lru_size[lru];
+                }
+        }
+        return nr;
 }
 
 static unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg,
                         unsigned int lru_mask)
 {
+        unsigned long nr = 0;
         int nid;
-        u64 total = 0;
 
         for_each_node_state(nid, N_MEMORY)
-                total += mem_cgroup_node_nr_lru_pages(memcg, nid, lru_mask);
-        return total;
+                nr += mem_cgroup_node_nr_lru_pages(memcg, nid, lru_mask);
+        return nr;
 }
 
 static bool mem_cgroup_event_ratelimit(struct mem_cgroup *memcg,
@@ -1242,11 +1227,9 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root,
                 int uninitialized_var(seq);
 
                 if (reclaim) {
-                        int nid = zone_to_nid(reclaim->zone);
-                        int zid = zone_idx(reclaim->zone);
                         struct mem_cgroup_per_zone *mz;
 
-                        mz = mem_cgroup_zoneinfo(root, nid, zid);
+                        mz = mem_cgroup_zone_zoneinfo(root, reclaim->zone);
                         iter = &mz->reclaim_iter[reclaim->priority];
                         if (prev && reclaim->generation != iter->generation) {
                                 iter->last_visited = NULL;
@@ -1353,7 +1336,7 @@ struct lruvec *mem_cgroup_zone_lruvec(struct zone *zone,
                 goto out;
         }
 
-        mz = mem_cgroup_zoneinfo(memcg, zone_to_nid(zone), zone_idx(zone));
+        mz = mem_cgroup_zone_zoneinfo(memcg, zone);
         lruvec = &mz->lruvec;
 out:
         /*
@@ -1412,7 +1395,7 @@ struct lruvec *mem_cgroup_page_lruvec(struct page *page, struct zone *zone)
         if (!PageLRU(page) && !PageCgroupUsed(pc) && memcg != root_mem_cgroup)
                 pc->mem_cgroup = memcg = root_mem_cgroup;
 
-        mz = page_cgroup_zoneinfo(memcg, page);
+        mz = mem_cgroup_page_zoneinfo(memcg, page);
         lruvec = &mz->lruvec;
 out:
         /*
@@ -1550,7 +1533,7 @@ static unsigned long mem_cgroup_margin(struct mem_cgroup *memcg)
 int mem_cgroup_swappiness(struct mem_cgroup *memcg)
 {
         /* root ? */
-        if (!css_parent(&memcg->css))
+        if (mem_cgroup_disabled() || !css_parent(&memcg->css))
                 return vm_swappiness;
 
         return memcg->swappiness;
@@ -4597,7 +4580,7 @@ unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
                                         break;
                         } while (1);
                 }
-                __mem_cgroup_remove_exceeded(mz->memcg, mz, mctz);
+                __mem_cgroup_remove_exceeded(mz, mctz);
                 excess = res_counter_soft_limit_excess(&mz->memcg->res);
                 /*
                  * One school of thought says that we should not add
@@ -4608,7 +4591,7 @@ unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
                  * term TODO.
                  */
                 /* If excess == 0, no tree ops */
-                __mem_cgroup_insert_exceeded(mz->memcg, mz, mctz, excess);
+                __mem_cgroup_insert_exceeded(mz, mctz, excess);
                 spin_unlock(&mctz->lock);
                 css_put(&mz->memcg->css);
                 loop++;
@@ -5305,7 +5288,7 @@ static int memcg_stat_show(struct seq_file *m, void *v)
 
                 for_each_online_node(nid)
                         for (zid = 0; zid < MAX_NR_ZONES; zid++) {
-                                mz = mem_cgroup_zoneinfo(memcg, nid, zid);
+                                mz = &memcg->nodeinfo[nid]->zoneinfo[zid];
                                 rstat = &mz->lruvec.reclaim_stat;
 
                                 recent_rotated[0] += rstat->recent_rotated[0];