mm, rmap: account shmem thp pages

Let's add ShmemHugePages and ShmemPmdMapped fields into meminfo and
smaps.  It indicates how many times we allocate and map shmem THP.

NR_ANON_TRANSPARENT_HUGEPAGES is renamed to NR_ANON_THPS.

Link: http://lkml.kernel.org/r/1466021202-61880-27-git-send-email-kirill.shutemov@linux.intel.com
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 560751bad294..51c7db2c4ee2 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -113,6 +113,8 @@ static ssize_t node_read_meminfo(struct device *dev,
                        "Node %d SUnreclaim:     %8lu kB\n"
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
                        "Node %d AnonHugePages:  %8lu kB\n"
+                       "Node %d ShmemHugePages: %8lu kB\n"
+                       "Node %d ShmemPmdMapped: %8lu kB\n"
 #endif
                         ,
                        nid, K(node_page_state(nid, NR_FILE_DIRTY)),
@@ -131,10 +133,13 @@ static ssize_t node_read_meminfo(struct device *dev,
                                 node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
                        nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)),
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-                       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))
-                        , nid,
-                        K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
-                        HPAGE_PMD_NR));
+                       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
+                       nid, K(node_page_state(nid, NR_ANON_THPS) *
+                                       HPAGE_PMD_NR),
+                       nid, K(node_page_state(nid, NR_SHMEM_THPS) *
+                                       HPAGE_PMD_NR),
+                       nid, K(node_page_state(nid, NR_SHMEM_PMDMAPPED) *
+                                       HPAGE_PMD_NR));
 #else
                        nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));
 #endif