mm: move most file-based accounting to the node

There are now a number of accounting oddities such as mapped file pages
being accounted for on the node while the total number of file pages are
accounted on the zone.  This can be coped with to some extent but it's
confusing so this patch moves the relevant file-based accounted.  Due to
throttling logic in the page allocator for reliable OOM detection, it is
still necessary to track dirty and writeback pages on a per-zone basis.

[mgorman@techsingularity.net: fix NR_ZONE_WRITE_PENDING accounting]
  Link: http://lkml.kernel.org/r/1468404004-5085-5-git-send-email-mgorman@techsingularity.net
Link: http://lkml.kernel.org/r/1467970510-21195-20-git-send-email-mgorman@techsingularity.net
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@surriel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 7ec50bd6f88c..c5f5e46c6f7f 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -218,11 +218,11 @@ void __delete_from_page_cache(struct page *page, void *shadow)
 
         /* hugetlb pages do not participate in page cache accounting. */
         if (!PageHuge(page))
-                __mod_zone_page_state(page_zone(page), NR_FILE_PAGES, -nr);
+                __mod_node_page_state(page_pgdat(page), NR_FILE_PAGES, -nr);
         if (PageSwapBacked(page)) {
-                __mod_zone_page_state(page_zone(page), NR_SHMEM, -nr);
+                __mod_node_page_state(page_pgdat(page), NR_SHMEM, -nr);
                 if (PageTransHuge(page))
-                        __dec_zone_page_state(page, NR_SHMEM_THPS);
+                        __dec_node_page_state(page, NR_SHMEM_THPS);
         } else {
                 VM_BUG_ON_PAGE(PageTransHuge(page) && !PageHuge(page), page);
         }
@@ -568,9 +568,9 @@ int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask)
                  * hugetlb pages do not participate in page cache accounting.
                  */
                 if (!PageHuge(new))
-                        __inc_zone_page_state(new, NR_FILE_PAGES);
+                        __inc_node_page_state(new, NR_FILE_PAGES);
                 if (PageSwapBacked(new))
-                        __inc_zone_page_state(new, NR_SHMEM);
+                        __inc_node_page_state(new, NR_SHMEM);
                 spin_unlock_irqrestore(&mapping->tree_lock, flags);
                 mem_cgroup_migrate(old, new);
                 radix_tree_preload_end();
@@ -677,7 +677,7 @@ static int __add_to_page_cache_locked(struct page *page,
 
         /* hugetlb pages do not participate in page cache accounting. */
         if (!huge)
-                __inc_zone_page_state(page, NR_FILE_PAGES);
+                __inc_node_page_state(page, NR_FILE_PAGES);
         spin_unlock_irq(&mapping->tree_lock);
         if (!huge)
                 mem_cgroup_commit_charge(page, memcg, false, false);