Unevictable LRU Page Statistics

Report unevictable pages per zone and system wide.

Kosaki Motohiro added support for memory controller unevictable
statistics.

[riel@redhat.com: fix printk in show_free_areas()]
[akpm@linux-foundation.org: fix units in /proc/vmstats]
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Debugged-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 25 insertions, 2 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 82c065e7551e..e93a4db93fbe 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1006,6 +1006,7 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,
         {
                 unsigned long active_anon, inactive_anon;
                 unsigned long active_file, inactive_file;
+                unsigned long unevictable;
 
                 inactive_anon = mem_cgroup_get_all_zonestat(mem_cont,
                                                 LRU_INACTIVE_ANON);
@@ -1015,10 +1016,15 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,
                                                 LRU_INACTIVE_FILE);
                 active_file = mem_cgroup_get_all_zonestat(mem_cont,
                                                 LRU_ACTIVE_FILE);
+                unevictable = mem_cgroup_get_all_zonestat(mem_cont,
+                                                        LRU_UNEVICTABLE);
+
                 cb->fill(cb, "active_anon", (active_anon) * PAGE_SIZE);
                 cb->fill(cb, "inactive_anon", (inactive_anon) * PAGE_SIZE);
                 cb->fill(cb, "active_file", (active_file) * PAGE_SIZE);
                 cb->fill(cb, "inactive_file", (inactive_file) * PAGE_SIZE);
+                cb->fill(cb, "unevictable", unevictable * PAGE_SIZE);
+
         }
         return 0;
 }
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 79c0981b1d32..4125230a1b2c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1864,13 +1864,21 @@ void show_free_areas(void)
                 }
         }
 
-        printk("Active_anon:%lu active_file:%lu inactive_anon%lu\n"
-                " inactive_file:%lu dirty:%lu writeback:%lu unstable:%lu\n"
+        printk("Active_anon:%lu active_file:%lu inactive_anon:%lu\n"
+                " inactive_file:%lu"
+//TODO:  check/adjust line lengths
+#ifdef CONFIG_UNEVICTABLE_LRU
+                " unevictable:%lu"
+#endif
+                " dirty:%lu writeback:%lu unstable:%lu\n"
                 " free:%lu slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n",
                 global_page_state(NR_ACTIVE_ANON),
                 global_page_state(NR_ACTIVE_FILE),
                 global_page_state(NR_INACTIVE_ANON),
                 global_page_state(NR_INACTIVE_FILE),
+#ifdef CONFIG_UNEVICTABLE_LRU
+                global_page_state(NR_UNEVICTABLE),
+#endif
                 global_page_state(NR_FILE_DIRTY),
                 global_page_state(NR_WRITEBACK),
                 global_page_state(NR_UNSTABLE_NFS),
@@ -1897,6 +1905,9 @@ void show_free_areas(void)
                         " inactive_anon:%lukB"
                         " active_file:%lukB"
                         " inactive_file:%lukB"
+#ifdef CONFIG_UNEVICTABLE_LRU
+                        " unevictable:%lukB"
+#endif
                         " present:%lukB"
                         " pages_scanned:%lu"
                         " all_unreclaimable? %s"
@@ -1910,6 +1921,9 @@ void show_free_areas(void)
                         K(zone_page_state(zone, NR_INACTIVE_ANON)),
                         K(zone_page_state(zone, NR_ACTIVE_FILE)),
                         K(zone_page_state(zone, NR_INACTIVE_FILE)),
+#ifdef CONFIG_UNEVICTABLE_LRU
+                        K(zone_page_state(zone, NR_UNEVICTABLE)),
+#endif
                         K(zone->present_pages),
                         zone->pages_scanned,
                         (zone_is_all_unreclaimable(zone) ? "yes" : "no")
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 6cb08cdd4f03..6db2f6319313 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -623,6 +623,9 @@ static const char * const vmstat_text[] = {
         "nr_active_anon",
         "nr_inactive_file",
         "nr_active_file",
+#ifdef CONFIG_UNEVICTABLE_LRU
+        "nr_unevictable",
+#endif
         "nr_anon_pages",
         "nr_mapped",
         "nr_file_pages",