mm, rmap: account shmem thp pages

[linux-beck.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 847281eb74da92d5ba264ddedf5268226728d4c0..452513bf02ceca4d331a2bd1781d0e1f9ec47b79 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4312,6 +4312,9 @@ void show_free_areas(unsigned int filter)
                " unevictable:%lu dirty:%lu writeback:%lu unstable:%lu\n"
                " slab_reclaimable:%lu slab_unreclaimable:%lu\n"
                " mapped:%lu shmem:%lu pagetables:%lu bounce:%lu\n"
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+               " anon_thp: %lu shmem_thp: %lu shmem_pmdmapped: %lu\n"
+#endif
                " free:%lu free_pcp:%lu free_cma:%lu\n",
                global_page_state(NR_ACTIVE_ANON),
                global_page_state(NR_INACTIVE_ANON),
@@ -4329,6 +4332,11 @@ void show_free_areas(unsigned int filter)
                global_page_state(NR_SHMEM),
                global_page_state(NR_PAGETABLE),
                global_page_state(NR_BOUNCE),
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+               global_page_state(NR_ANON_THPS) * HPAGE_PMD_NR,
+               global_page_state(NR_SHMEM_THPS) * HPAGE_PMD_NR,
+               global_page_state(NR_SHMEM_PMDMAPPED) * HPAGE_PMD_NR,
+#endif
                global_page_state(NR_FREE_PAGES),
                free_pcp,
                global_page_state(NR_FREE_CMA_PAGES));
@@ -4363,6 +4371,11 @@ void show_free_areas(unsigned int filter)
                        " writeback:%lukB"
                        " mapped:%lukB"
                        " shmem:%lukB"
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+                       " shmem_thp: %lukB"
+                       " shmem_pmdmapped: %lukB"
+                       " anon_thp: %lukB"
+#endif
                        " slab_reclaimable:%lukB"
                        " slab_unreclaimable:%lukB"
                        " kernel_stack:%lukB"
@@ -4395,6 +4408,12 @@ void show_free_areas(unsigned int filter)
                        K(zone_page_state(zone, NR_WRITEBACK)),
                        K(zone_page_state(zone, NR_FILE_MAPPED)),
                        K(zone_page_state(zone, NR_SHMEM)),
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+                       K(zone_page_state(zone, NR_SHMEM_THPS) * HPAGE_PMD_NR),
+                       K(zone_page_state(zone, NR_SHMEM_PMDMAPPED)
+                                       * HPAGE_PMD_NR),
+                       K(zone_page_state(zone, NR_ANON_THPS) * HPAGE_PMD_NR),
+#endif
                        K(zone_page_state(zone, NR_SLAB_RECLAIMABLE)),
                        K(zone_page_state(zone, NR_SLAB_UNRECLAIMABLE)),
                        zone_page_state(zone, NR_KERNEL_STACK) *