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>

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 560751bad2947105a0d06e7650bf906c3e4f0de7..51c7db2c4ee2a6bc06cc5ee2c22758fc91cb7c66 100644 (file)
--- 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

diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index 83720460c5bc74c51a9caae002495b4d59d8a4c3..cf301a9ef5123ecd2f9a7f3705bbe026dea7558c 100644 (file)
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -105,6 +105,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
 #endif
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
                "AnonHugePages:  %8lu kB\n"
+               "ShmemHugePages: %8lu kB\n"
+               "ShmemPmdMapped: %8lu kB\n"
 #endif
 #ifdef CONFIG_CMA
                "CmaTotal:       %8lu kB\n"
@@ -162,8 +164,9 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
                , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
 #endif
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-               , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-                  HPAGE_PMD_NR)
+               , K(global_page_state(NR_ANON_THPS) * HPAGE_PMD_NR)
+               , K(global_page_state(NR_SHMEM_THPS) * HPAGE_PMD_NR)
+               , K(global_page_state(NR_SHMEM_PMDMAPPED) * HPAGE_PMD_NR)
 #endif
 #ifdef CONFIG_CMA
                , K(totalcma_pages)

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 4648c7f63ae28c1c5323de699e850bbb2f8405a4..187d84ef9de9d00cff139ffaa61a524af6b752c2 100644 (file)
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -448,6 +448,7 @@ struct mem_size_stats {
        unsigned long referenced;
        unsigned long anonymous;
        unsigned long anonymous_thp;
+       unsigned long shmem_thp;
        unsigned long swap;
        unsigned long shared_hugetlb;
        unsigned long private_hugetlb;
@@ -576,7 +577,12 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr,
        page = follow_trans_huge_pmd(vma, addr, pmd, FOLL_DUMP);
        if (IS_ERR_OR_NULL(page))
                return;
-       mss->anonymous_thp += HPAGE_PMD_SIZE;
+       if (PageAnon(page))
+               mss->anonymous_thp += HPAGE_PMD_SIZE;
+       else if (PageSwapBacked(page))
+               mss->shmem_thp += HPAGE_PMD_SIZE;
+       else
+               VM_BUG_ON_PAGE(1, page);
        smaps_account(mss, page, true, pmd_young(*pmd), pmd_dirty(*pmd));
 }
 #else
@@ -770,6 +776,7 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
                   "Referenced:     %8lu kB\n"
                   "Anonymous:      %8lu kB\n"
                   "AnonHugePages:  %8lu kB\n"
+                  "ShmemPmdMapped: %8lu kB\n"
                   "Shared_Hugetlb: %8lu kB\n"
                   "Private_Hugetlb: %7lu kB\n"
                   "Swap:           %8lu kB\n"
@@ -787,6 +794,7 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
                   mss.referenced >> 10,
                   mss.anonymous >> 10,
                   mss.anonymous_thp >> 10,
+                  mss.shmem_thp >> 10,
                   mss.shared_hugetlb >> 10,
                   mss.private_hugetlb >> 10,
                   mss.swap >> 10,

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 3d7ab30d4940c0db87147f7a4246f61354fd2397..19425e988bdc1a6b2d9fc75a71064a9a57be68b7 100644 (file)
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -154,7 +154,9 @@ enum zone_stat_item {
        WORKINGSET_REFAULT,
        WORKINGSET_ACTIVATE,
        WORKINGSET_NODERECLAIM,
-       NR_ANON_TRANSPARENT_HUGEPAGES,
+       NR_ANON_THPS,
+       NR_SHMEM_THPS,
+       NR_SHMEM_PMDMAPPED,
        NR_FREE_CMA_PAGES,
        NR_VM_ZONE_STAT_ITEMS };
 

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 3b74fea6b5db5906ff8488c670309a6196d73cad..6c524984931b9725d28ce3106efc38dadf01d548 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -3067,7 +3067,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
 
        if (atomic_add_negative(-1, compound_mapcount_ptr(page))) {
                /* Last compound_mapcount is gone. */
-               __dec_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES);
+               __dec_zone_page_state(page, NR_ANON_THPS);
                if (TestClearPageDoubleMap(page)) {
                        /* No need in mapcount reference anymore */
                        for (i = 0; i < HPAGE_PMD_NR; i++)
@@ -3539,6 +3539,8 @@ int split_huge_page_to_list(struct page *page, struct list_head *list)
                        pgdata->split_queue_len--;
                        list_del(page_deferred_list(head));
                }
+               if (mapping)
+                       __dec_zone_page_state(page, NR_SHMEM_THPS);
                spin_unlock(&pgdata->split_queue_lock);
                __split_huge_page(page, list, flags);
                ret = 0;

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) *

diff --git a/mm/rmap.c b/mm/rmap.c
index 9d643b7a99ce70b59e4e60c7ad58a1ec7291c3b4..8a13d9f7b5666b153d64788576f46029bdc1d99f 100644 (file)
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1212,10 +1212,8 @@ void do_page_add_anon_rmap(struct page *page,
                 * pte lock(a spinlock) is held, which implies preemption
                 * disabled.
                 */
-               if (compound) {
-                       __inc_zone_page_state(page,
-                                             NR_ANON_TRANSPARENT_HUGEPAGES);
-               }
+               if (compound)
+                       __inc_zone_page_state(page, NR_ANON_THPS);
                __mod_zone_page_state(page_zone(page), NR_ANON_PAGES, nr);
        }
        if (unlikely(PageKsm(page)))
@@ -1253,7 +1251,7 @@ void page_add_new_anon_rmap(struct page *page,
                VM_BUG_ON_PAGE(!PageTransHuge(page), page);
                /* increment count (starts at -1) */
                atomic_set(compound_mapcount_ptr(page), 0);
-               __inc_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES);
+               __inc_zone_page_state(page, NR_ANON_THPS);
        } else {
                /* Anon THP always mapped first with PMD */
                VM_BUG_ON_PAGE(PageTransCompound(page), page);
@@ -1283,6 +1281,8 @@ void page_add_file_rmap(struct page *page, bool compound)
                }
                if (!atomic_inc_and_test(compound_mapcount_ptr(page)))
                        goto out;
+               VM_BUG_ON_PAGE(!PageSwapBacked(page), page);
+               __inc_zone_page_state(page, NR_SHMEM_PMDMAPPED);
        } else {
                if (PageTransCompound(page)) {
                        VM_BUG_ON_PAGE(!PageLocked(page), page);
@@ -1321,6 +1321,8 @@ static void page_remove_file_rmap(struct page *page, bool compound)
                }
                if (!atomic_add_negative(-1, compound_mapcount_ptr(page)))
                        goto out;
+               VM_BUG_ON_PAGE(!PageSwapBacked(page), page);
+               __dec_zone_page_state(page, NR_SHMEM_PMDMAPPED);
        } else {
                if (!atomic_add_negative(-1, &page->_mapcount))
                        goto out;
@@ -1354,7 +1356,7 @@ static void page_remove_anon_compound_rmap(struct page *page)
        if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE))
                return;
 
-       __dec_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES);
+       __dec_zone_page_state(page, NR_ANON_THPS);
 
        if (TestClearPageDoubleMap(page)) {
                /*

diff --git a/mm/vmstat.c b/mm/vmstat.c
index cff2f4ec9ccec47ef6f7103ac8fd7baafeb002aa..7997f52935c9b39a07ef67ef90de6bffffa3ab53 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -733,6 +733,8 @@ const char * const vmstat_text[] = {
        "workingset_activate",
        "workingset_nodereclaim",
        "nr_anon_transparent_hugepages",
+       "nr_shmem_hugepages",
+       "nr_shmem_pmdmapped",
        "nr_free_cma",
 
        /* enum writeback_stat_item counters */