1 files changed, 37 insertions, 10 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index fbb60b103e64..07bf3ec13a07 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -120,6 +120,14 @@ static const char * const mem_cgroup_events_names[] = {
         "pgmajfault",
 };
 
+static const char * const mem_cgroup_lru_names[] = {
+        "inactive_anon",
+        "active_anon",
+        "inactive_file",
+        "active_file",
+        "unevictable",
+};
+
 /*
  * Per memcg event counter is incremented at every pagein/pageout. With THP,
  * it will be incremated by the number of pages. This counter is used for
@@ -1524,8 +1532,9 @@ static void move_unlock_mem_cgroup(struct mem_cgroup *memcg,
         spin_unlock_irqrestore(&memcg->move_lock, *flags);
 }
 
+#define K(x) ((x) << (PAGE_SHIFT-10))
 /**
- * mem_cgroup_print_oom_info: Called from OOM with tasklist_lock held in read mode.
+ * mem_cgroup_print_oom_info: Print OOM information relevant to memory controller.
  * @memcg: The memory cgroup that went over limit
  * @p: Task that is going to be killed
  *
@@ -1543,8 +1552,10 @@ void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
          */
         static char memcg_name[PATH_MAX];
         int ret;
+        struct mem_cgroup *iter;
+        unsigned int i;
 
-        if (!memcg || !p)
+        if (!p)
                 return;
 
         rcu_read_lock();
@@ -1592,6 +1603,30 @@ done:
                 res_counter_read_u64(&memcg->kmem, RES_USAGE) >> 10,
                 res_counter_read_u64(&memcg->kmem, RES_LIMIT) >> 10,
                 res_counter_read_u64(&memcg->kmem, RES_FAILCNT));
+
+        for_each_mem_cgroup_tree(iter, memcg) {
+                pr_info("Memory cgroup stats");
+
+                rcu_read_lock();
+                ret = cgroup_path(iter->css.cgroup, memcg_name, PATH_MAX);
+                if (!ret)
+                        pr_cont(" for %s", memcg_name);
+                rcu_read_unlock();
+                pr_cont(":");
+
+                for (i = 0; i < MEM_CGROUP_STAT_NSTATS; i++) {
+                        if (i == MEM_CGROUP_STAT_SWAP && !do_swap_account)
+                                continue;
+                        pr_cont(" %s:%ldKB", mem_cgroup_stat_names[i],
+                                K(mem_cgroup_read_stat(iter, i)));
+                }
+
+                for (i = 0; i < NR_LRU_LISTS; i++)
+                        pr_cont(" %s:%luKB", mem_cgroup_lru_names[i],
+                                K(mem_cgroup_nr_lru_pages(iter, BIT(i))));
+
+                pr_cont("\n");
+        }
 }
 
 /*
@@ -5214,14 +5249,6 @@ static int memcg_numa_stat_show(struct cgroup *cont, struct cftype *cft,
 }
 #endif /* CONFIG_NUMA */
 
-static const char * const mem_cgroup_lru_names[] = {
-        "inactive_anon",
-        "active_anon",
-        "inactive_file",
-        "active_file",
-        "unevictable",
-};
-
 static inline void mem_cgroup_lru_names_not_uptodate(void)
 {
         BUILD_BUG_ON(ARRAY_SIZE(mem_cgroup_lru_names) != NR_LRU_LISTS);