[RESEND PATCH v2 06/12] mm: memcontrol: convert NR_FILE_PMDMAPPED account to pages

[Muchun Song]

Convert NR_FILE_PMDMAPPED account to pages

Signed-off-by: Muchun Song <songmuc...@bytedance.com>
---
 drivers/base/node.c | 3 +--
 fs/proc/meminfo.c   | 2 +-
 mm/rmap.c           | 6 ++++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/base/node.c b/drivers/base/node.c
index e5abc6144dab..f77652e6339f 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -465,8 +465,7 @@ static ssize_t node_read_meminfo(struct device *dev,
                             nid, K(node_page_state(pgdat, NR_SHMEM_THPS)),
                             nid, K(node_page_state(pgdat, NR_SHMEM_PMDMAPPED)),
                             nid, K(node_page_state(pgdat, NR_FILE_THPS)),
-                            nid, K(node_page_state(pgdat, NR_FILE_PMDMAPPED) *
-                                   HPAGE_PMD_NR)
+                            nid, K(node_page_state(pgdat, NR_FILE_PMDMAPPED))
 #endif
                            );
        len += hugetlb_report_node_meminfo(buf, len, nid);
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index 84886b2cc2f7..5a83012d8b72 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -137,7 +137,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
        show_val_kb(m, "FileHugePages:  ",
                    global_node_page_state(NR_FILE_THPS));
        show_val_kb(m, "FilePmdMapped:  ",
-                   global_node_page_state(NR_FILE_PMDMAPPED) * HPAGE_PMD_NR);
+                   global_node_page_state(NR_FILE_PMDMAPPED));
 #endif
 
 #ifdef CONFIG_CMA
diff --git a/mm/rmap.c b/mm/rmap.c
index 3089ad6bf468..e383c5619501 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1222,7 +1222,8 @@ void page_add_file_rmap(struct page *page, bool compound)
                        __mod_lruvec_page_state(page, NR_SHMEM_PMDMAPPED,
                                                HPAGE_PMD_NR);
                else
-                       __inc_node_page_state(page, NR_FILE_PMDMAPPED);
+                       __mod_lruvec_page_state(page, NR_FILE_PMDMAPPED,
+                                               HPAGE_PMD_NR);
        } else {
                if (PageTransCompound(page) && page_mapping(page)) {
                        VM_WARN_ON_ONCE(!PageLocked(page));
@@ -1264,7 +1265,8 @@ static void page_remove_file_rmap(struct page *page, bool 
compound)
                        __mod_lruvec_page_state(page, NR_SHMEM_PMDMAPPED,
                                                -HPAGE_PMD_NR);
                else
-                       __dec_node_page_state(page, NR_FILE_PMDMAPPED);
+                       __mod_lruvec_page_state(page, NR_FILE_PMDMAPPED,
+                                               -HPAGE_PMD_NR);
        } else {
                if (!atomic_add_negative(-1, &page->_mapcount))
                        return;
-- 
2.11.0