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, 8 insertions, 6 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index fba770c54d84..ed0268268e93 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -505,15 +505,17 @@ int migrate_page_move_mapping(struct address_space *mapping,
          * are mapped to swap space.
          */
         if (newzone != oldzone) {
-                __dec_zone_state(oldzone, NR_FILE_PAGES);
-                __inc_zone_state(newzone, NR_FILE_PAGES);
+                __dec_node_state(oldzone->zone_pgdat, NR_FILE_PAGES);
+                __inc_node_state(newzone->zone_pgdat, NR_FILE_PAGES);
                 if (PageSwapBacked(page) && !PageSwapCache(page)) {
-                        __dec_zone_state(oldzone, NR_SHMEM);
-                        __inc_zone_state(newzone, NR_SHMEM);
+                        __dec_node_state(oldzone->zone_pgdat, NR_SHMEM);
+                        __inc_node_state(newzone->zone_pgdat, NR_SHMEM);
                 }
                 if (dirty && mapping_cap_account_dirty(mapping)) {
-                        __dec_zone_state(oldzone, NR_FILE_DIRTY);
-                        __inc_zone_state(newzone, NR_FILE_DIRTY);
+                        __dec_node_state(oldzone->zone_pgdat, NR_FILE_DIRTY);
+                        __dec_zone_state(oldzone, NR_ZONE_WRITE_PENDING);
+                        __inc_node_state(newzone->zone_pgdat, NR_FILE_DIRTY);
+                        __inc_zone_state(newzone, NR_ZONE_WRITE_PENDING);
                 }
         }
         local_irq_enable();