thp: account anon transparent huge pages into NR_ANON_PAGES

We use NR_ANON_PAGES as base for reporting AnonPages to user.  There's
not much sense in not accounting transparent huge pages there, but add
them on printing to user.

Let's account transparent huge pages in NR_ANON_PAGES in the first place.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Hugh Dickins <hughd@google.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Hillf Danton <dhillf@gmail.com>
Cc: Ning Qu <quning@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 9 insertions, 10 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 963e14c0486f..7cef0c098630 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1661,7 +1661,6 @@ static void __split_huge_page_refcount(struct page *page,
         BUG_ON(atomic_read(&page->_count) <= 0);
 
         __mod_zone_page_state(zone, NR_ANON_TRANSPARENT_HUGEPAGES, -1);
-        __mod_zone_page_state(zone, NR_ANON_PAGES, HPAGE_PMD_NR);
 
         ClearPageCompound(page);
         compound_unlock(page);
diff --git a/mm/rmap.c b/mm/rmap.c
index a21c976a8ec1..fd3ee7a54a13 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1052,11 +1052,11 @@ void do_page_add_anon_rmap(struct page *page,
 {
         int first = atomic_inc_and_test(&page->_mapcount);
         if (first) {
-                if (!PageTransHuge(page))
-                        __inc_zone_page_state(page, NR_ANON_PAGES);
-                else
+                if (PageTransHuge(page))
                         __inc_zone_page_state(page,
                                               NR_ANON_TRANSPARENT_HUGEPAGES);
+                __mod_zone_page_state(page_zone(page), NR_ANON_PAGES,
+                                hpage_nr_pages(page));
         }
         if (unlikely(PageKsm(page)))
                 return;
@@ -1085,10 +1085,10 @@ void page_add_new_anon_rmap(struct page *page,
         VM_BUG_ON(address < vma->vm_start || address >= vma->vm_end);
         SetPageSwapBacked(page);
         atomic_set(&page->_mapcount, 0); /* increment count (starts at -1) */
-        if (!PageTransHuge(page))
-                __inc_zone_page_state(page, NR_ANON_PAGES);
-        else
+        if (PageTransHuge(page))
                 __inc_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES);
+        __mod_zone_page_state(page_zone(page), NR_ANON_PAGES,
+                        hpage_nr_pages(page));
         __page_set_anon_rmap(page, vma, address, 1);
         if (!mlocked_vma_newpage(vma, page)) {
                 SetPageActive(page);
@@ -1148,11 +1148,11 @@ void page_remove_rmap(struct page *page)
                 goto out;
         if (anon) {
                 mem_cgroup_uncharge_page(page);
-                if (!PageTransHuge(page))
-                        __dec_zone_page_state(page, NR_ANON_PAGES);
-                else
+                if (PageTransHuge(page))
                         __dec_zone_page_state(page,
                                               NR_ANON_TRANSPARENT_HUGEPAGES);
+                __mod_zone_page_state(page_zone(page), NR_ANON_PAGES,
+                                -hpage_nr_pages(page));
         } else {
                 __dec_zone_page_state(page, NR_FILE_MAPPED);
                 mem_cgroup_dec_page_stat(page, MEM_CGROUP_STAT_FILE_MAPPED);