From: Mel Gorman <mgorman@techsingularity.net> To: Andrew Morton <akpm@linux-foundation.org>, Linux-MM <linux-mm@kvack.org> Cc: Rik van Riel <riel@surriel.com>, Vlastimil Babka <vbabka@suse.cz>, Johannes Weiner <hannes@cmpxchg.org>, LKML <linux-kernel@vger.kernel.org>, Mel Gorman <mgorman@techsingularity.net> Subject: [PATCH 17/27] mm: Rename NR_ANON_PAGES to NR_ANON_MAPPED Date: Tue, 21 Jun 2016 15:15:56 +0100 [thread overview] Message-ID: <1466518566-30034-18-git-send-email-mgorman@techsingularity.net> (raw) In-Reply-To: <1466518566-30034-1-git-send-email-mgorman@techsingularity.net> NR_FILE_PAGES is the number of file pages. NR_FILE_MAPPED is the number of mapped file pages. NR_ANON_PAGES is the number of mapped anon pages. This is unhelpful naming as it's easy to confuse NR_FILE_MAPPED and NR_ANON_PAGES for mapped pages. This patch renames NR_ANON_PAGES so we have NR_FILE_PAGES is the number of file pages. NR_FILE_MAPPED is the number of mapped file pages. NR_ANON_MAPPED is the number of mapped anon pages. Signed-off-by: Mel Gorman <mgorman@techsingularity.net> Acked-by: Vlastimil Babka <vbabka@suse.cz> --- drivers/base/node.c | 2 +- fs/proc/meminfo.c | 2 +- include/linux/mmzone.h | 2 +- mm/migrate.c | 2 +- mm/rmap.c | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index 66aed68a0fdc..897b6bcb36be 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -120,7 +120,7 @@ static ssize_t node_read_meminfo(struct device *dev, nid, K(sum_zone_node_page_state(nid, NR_WRITEBACK)), nid, K(sum_zone_node_page_state(nid, NR_FILE_PAGES)), nid, K(node_page_state(pgdat, NR_FILE_MAPPED)), - nid, K(node_page_state(pgdat, NR_ANON_PAGES)), + nid, K(node_page_state(pgdat, NR_ANON_MAPPED)), nid, K(i.sharedram), nid, sum_zone_node_page_state(nid, NR_KERNEL_STACK) * THREAD_SIZE / 1024, diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 54e039682ec9..076afb43fc56 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -138,7 +138,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) K(i.freeswap), K(global_page_state(NR_FILE_DIRTY)), K(global_page_state(NR_WRITEBACK)), - K(global_node_page_state(NR_ANON_PAGES)), + K(global_node_page_state(NR_ANON_MAPPED)), K(global_node_page_state(NR_FILE_MAPPED)), K(i.sharedram), K(global_page_state(NR_SLAB_RECLAIMABLE) + diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 8fafbd5fe74a..6b1fea6cde9a 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -159,7 +159,7 @@ enum node_stat_item { WORKINGSET_REFAULT, WORKINGSET_ACTIVATE, WORKINGSET_NODERECLAIM, - NR_ANON_PAGES, /* Mapped anonymous pages */ + NR_ANON_MAPPED, /* Mapped anonymous pages */ NR_FILE_MAPPED, /* pagecache pages mapped into pagetables. only modified from process context */ NR_VM_NODE_STAT_ITEMS diff --git a/mm/migrate.c b/mm/migrate.c index ffd86850564c..1582c07205c6 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -501,7 +501,7 @@ int migrate_page_move_mapping(struct address_space *mapping, * new page and drop references to the old page. * * Note that anonymous pages are accounted for - * via NR_FILE_PAGES and NR_ANON_PAGES if they + * via NR_FILE_PAGES and NR_ANON_MAPPED if they * are mapped to swap space. */ if (newzone != oldzone) { diff --git a/mm/rmap.c b/mm/rmap.c index dea2d115d68f..1c1455d2d39d 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1219,7 +1219,7 @@ void do_page_add_anon_rmap(struct page *page, __inc_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES); } - __mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, nr); + __mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, nr); } if (unlikely(PageKsm(page))) return; @@ -1263,7 +1263,7 @@ void page_add_new_anon_rmap(struct page *page, /* increment count (starts at -1) */ atomic_set(&page->_mapcount, 0); } - __mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, nr); + __mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, nr); __page_set_anon_rmap(page, vma, address, 1); } @@ -1345,7 +1345,7 @@ static void page_remove_anon_compound_rmap(struct page *page) clear_page_mlock(page); if (nr) { - __mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, -nr); + __mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, -nr); deferred_split_huge_page(page); } } @@ -1377,7 +1377,7 @@ void page_remove_rmap(struct page *page, bool compound) * these counters are not modified in interrupt context, and * pte lock(a spinlock) is held, which implies preemption disabled. */ - __dec_node_page_state(page, NR_ANON_PAGES); + __dec_node_page_state(page, NR_ANON_MAPPED); if (unlikely(PageMlocked(page))) clear_page_mlock(page); -- 2.6.4
WARNING: multiple messages have this Message-ID (diff)
From: Mel Gorman <mgorman@techsingularity.net> To: Andrew Morton <akpm@linux-foundation.org>, Linux-MM <linux-mm@kvack.org> Cc: Rik van Riel <riel@surriel.com>, Vlastimil Babka <vbabka@suse.cz>, Johannes Weiner <hannes@cmpxchg.org>, LKML <linux-kernel@vger.kernel.org>, Mel Gorman <mgorman@techsingularity.net> Subject: [PATCH 17/27] mm: Rename NR_ANON_PAGES to NR_ANON_MAPPED Date: Tue, 21 Jun 2016 15:15:56 +0100 [thread overview] Message-ID: <1466518566-30034-18-git-send-email-mgorman@techsingularity.net> (raw) In-Reply-To: <1466518566-30034-1-git-send-email-mgorman@techsingularity.net> NR_FILE_PAGES is the number of file pages. NR_FILE_MAPPED is the number of mapped file pages. NR_ANON_PAGES is the number of mapped anon pages. This is unhelpful naming as it's easy to confuse NR_FILE_MAPPED and NR_ANON_PAGES for mapped pages. This patch renames NR_ANON_PAGES so we have NR_FILE_PAGES is the number of file pages. NR_FILE_MAPPED is the number of mapped file pages. NR_ANON_MAPPED is the number of mapped anon pages. Signed-off-by: Mel Gorman <mgorman@techsingularity.net> Acked-by: Vlastimil Babka <vbabka@suse.cz> --- drivers/base/node.c | 2 +- fs/proc/meminfo.c | 2 +- include/linux/mmzone.h | 2 +- mm/migrate.c | 2 +- mm/rmap.c | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index 66aed68a0fdc..897b6bcb36be 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -120,7 +120,7 @@ static ssize_t node_read_meminfo(struct device *dev, nid, K(sum_zone_node_page_state(nid, NR_WRITEBACK)), nid, K(sum_zone_node_page_state(nid, NR_FILE_PAGES)), nid, K(node_page_state(pgdat, NR_FILE_MAPPED)), - nid, K(node_page_state(pgdat, NR_ANON_PAGES)), + nid, K(node_page_state(pgdat, NR_ANON_MAPPED)), nid, K(i.sharedram), nid, sum_zone_node_page_state(nid, NR_KERNEL_STACK) * THREAD_SIZE / 1024, diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 54e039682ec9..076afb43fc56 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -138,7 +138,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) K(i.freeswap), K(global_page_state(NR_FILE_DIRTY)), K(global_page_state(NR_WRITEBACK)), - K(global_node_page_state(NR_ANON_PAGES)), + K(global_node_page_state(NR_ANON_MAPPED)), K(global_node_page_state(NR_FILE_MAPPED)), K(i.sharedram), K(global_page_state(NR_SLAB_RECLAIMABLE) + diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 8fafbd5fe74a..6b1fea6cde9a 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -159,7 +159,7 @@ enum node_stat_item { WORKINGSET_REFAULT, WORKINGSET_ACTIVATE, WORKINGSET_NODERECLAIM, - NR_ANON_PAGES, /* Mapped anonymous pages */ + NR_ANON_MAPPED, /* Mapped anonymous pages */ NR_FILE_MAPPED, /* pagecache pages mapped into pagetables. only modified from process context */ NR_VM_NODE_STAT_ITEMS diff --git a/mm/migrate.c b/mm/migrate.c index ffd86850564c..1582c07205c6 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -501,7 +501,7 @@ int migrate_page_move_mapping(struct address_space *mapping, * new page and drop references to the old page. * * Note that anonymous pages are accounted for - * via NR_FILE_PAGES and NR_ANON_PAGES if they + * via NR_FILE_PAGES and NR_ANON_MAPPED if they * are mapped to swap space. */ if (newzone != oldzone) { diff --git a/mm/rmap.c b/mm/rmap.c index dea2d115d68f..1c1455d2d39d 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1219,7 +1219,7 @@ void do_page_add_anon_rmap(struct page *page, __inc_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES); } - __mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, nr); + __mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, nr); } if (unlikely(PageKsm(page))) return; @@ -1263,7 +1263,7 @@ void page_add_new_anon_rmap(struct page *page, /* increment count (starts at -1) */ atomic_set(&page->_mapcount, 0); } - __mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, nr); + __mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, nr); __page_set_anon_rmap(page, vma, address, 1); } @@ -1345,7 +1345,7 @@ static void page_remove_anon_compound_rmap(struct page *page) clear_page_mlock(page); if (nr) { - __mod_node_page_state(page_pgdat(page), NR_ANON_PAGES, -nr); + __mod_node_page_state(page_pgdat(page), NR_ANON_MAPPED, -nr); deferred_split_huge_page(page); } } @@ -1377,7 +1377,7 @@ void page_remove_rmap(struct page *page, bool compound) * these counters are not modified in interrupt context, and * pte lock(a spinlock) is held, which implies preemption disabled. */ - __dec_node_page_state(page, NR_ANON_PAGES); + __dec_node_page_state(page, NR_ANON_MAPPED); if (unlikely(PageMlocked(page))) clear_page_mlock(page); -- 2.6.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-06-21 14:20 UTC|newest] Thread overview: 130+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-21 14:15 [PATCH 00/27] Move LRU page reclaim from zones to nodes v7 Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-21 14:15 ` [PATCH 01/27] mm, vmstat: Add infrastructure for per-node vmstats Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-21 14:15 ` [PATCH 02/27] mm, vmscan: Move lru_lock to the node Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-21 14:15 ` [PATCH 03/27] mm, vmscan: Move LRU lists to node Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-22 12:50 ` Vlastimil Babka 2016-06-22 12:50 ` Vlastimil Babka 2016-06-21 14:15 ` [PATCH 04/27] mm, vmscan: Begin reclaiming pages on a per-node basis Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-22 14:04 ` Vlastimil Babka 2016-06-22 14:04 ` Vlastimil Babka 2016-06-22 16:00 ` Vlastimil Babka 2016-06-22 16:00 ` Vlastimil Babka 2016-06-23 11:07 ` Mel Gorman 2016-06-23 11:07 ` Mel Gorman 2016-06-23 11:13 ` Michal Hocko 2016-06-23 11:13 ` Michal Hocko 2016-06-23 10:58 ` Mel Gorman 2016-06-23 10:58 ` Mel Gorman 2016-06-21 14:15 ` [PATCH 05/27] mm, vmscan: Have kswapd only scan based on the highest requested zone Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-21 14:15 ` [PATCH 06/27] mm, vmscan: Make kswapd reclaim in terms of nodes Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-21 14:15 ` [PATCH 07/27] mm, vmscan: Remove balance gap Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-21 14:15 ` [PATCH 08/27] mm, vmscan: Simplify the logic deciding whether kswapd sleeps Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-22 15:30 ` Vlastimil Babka 2016-06-22 15:30 ` Vlastimil Babka 2016-06-21 14:15 ` [PATCH 09/27] mm, vmscan: By default have direct reclaim only shrink once per node Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-21 14:15 ` [PATCH 10/27] mm, vmscan: Remove duplicate logic clearing node congestion and dirty state Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-21 14:15 ` [PATCH 11/27] mm: vmscan: Do not reclaim from kswapd if there is any eligible zone Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-21 14:15 ` [PATCH 12/27] mm, vmscan: Make shrink_node decisions more node-centric Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-22 13:20 ` Michal Hocko 2016-06-22 13:20 ` Michal Hocko 2016-06-22 15:42 ` Vlastimil Babka 2016-06-22 15:42 ` Vlastimil Babka 2016-06-21 14:15 ` [PATCH 13/27] mm, memcg: Move memcg limit enforcement from zones to nodes Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-22 13:15 ` Michal Hocko 2016-06-22 13:15 ` Michal Hocko 2016-06-21 14:15 ` [PATCH 14/27] mm, workingset: Make working set detection node-aware Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-21 14:15 ` [PATCH 15/27] mm, page_alloc: Consider dirtyable memory in terms of nodes Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-22 14:15 ` Michal Hocko 2016-06-22 14:15 ` Michal Hocko 2016-06-22 14:27 ` Michal Hocko 2016-06-22 14:27 ` Michal Hocko 2016-06-23 12:53 ` Mel Gorman 2016-06-23 12:53 ` Mel Gorman 2016-06-23 13:13 ` Michal Hocko 2016-06-23 13:13 ` Michal Hocko 2016-06-21 14:15 ` [PATCH 16/27] mm: Move page mapped accounting to the node Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-21 22:32 ` Andrew Morton 2016-06-21 22:32 ` Andrew Morton 2016-06-23 8:35 ` Mel Gorman 2016-06-23 8:35 ` Mel Gorman 2016-06-22 14:35 ` Michal Hocko 2016-06-22 14:35 ` Michal Hocko 2016-06-21 14:15 ` Mel Gorman [this message] 2016-06-21 14:15 ` [PATCH 17/27] mm: Rename NR_ANON_PAGES to NR_ANON_MAPPED Mel Gorman 2016-06-22 14:28 ` Michal Hocko 2016-06-22 14:28 ` Michal Hocko 2016-06-21 14:15 ` [PATCH 18/27] mm: Move most file-based accounting to the node Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-22 14:38 ` Michal Hocko 2016-06-22 14:38 ` Michal Hocko 2016-06-21 14:15 ` [PATCH 19/27] mm: Move vmscan writes and file write " Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-22 14:40 ` Michal Hocko 2016-06-22 14:40 ` Michal Hocko 2016-06-23 13:57 ` Mel Gorman 2016-06-23 13:57 ` Mel Gorman 2016-06-23 14:06 ` Vlastimil Babka 2016-06-23 14:06 ` Vlastimil Babka 2016-06-23 16:03 ` Mel Gorman 2016-06-23 16:03 ` Mel Gorman 2016-06-21 14:15 ` [PATCH 20/27] mm, vmscan: Update classzone_idx if buffer_heads_over_limit Mel Gorman 2016-06-21 14:15 ` Mel Gorman 2016-06-22 14:49 ` Michal Hocko 2016-06-22 14:49 ` Michal Hocko 2016-06-21 14:16 ` [PATCH 21/27] mm, vmscan: Only wakeup kswapd once per node for the requested classzone Mel Gorman 2016-06-21 14:16 ` Mel Gorman 2016-06-22 16:08 ` Vlastimil Babka 2016-06-22 16:08 ` Vlastimil Babka 2016-06-21 14:16 ` [PATCH 22/27] mm: Convert zone_reclaim to node_reclaim Mel Gorman 2016-06-21 14:16 ` Mel Gorman 2016-06-21 14:16 ` [PATCH 23/27] mm, vmscan: Add classzone information to tracepoints Mel Gorman 2016-06-21 14:16 ` Mel Gorman 2016-06-21 14:16 ` [PATCH 24/27] mm, page_alloc: Remove fair zone allocation policy Mel Gorman 2016-06-21 14:16 ` Mel Gorman 2016-06-21 14:16 ` [PATCH 25/27] mm: page_alloc: Cache the last node whose dirty limit is reached Mel Gorman 2016-06-21 14:16 ` Mel Gorman 2016-06-21 14:16 ` [PATCH 26/27] mm: vmstat: Replace __count_zone_vm_events with a zone id equivalent Mel Gorman 2016-06-21 14:16 ` Mel Gorman 2016-06-21 14:16 ` [PATCH 27/27] mm: vmstat: Account per-zone stalls and pages skipped during reclaim Mel Gorman 2016-06-21 14:16 ` Mel Gorman 2016-06-23 10:26 ` [PATCH 00/27] Move LRU page reclaim from zones to nodes v7 Mel Gorman 2016-06-23 10:26 ` Mel Gorman 2016-06-23 11:27 ` Michal Hocko 2016-06-23 11:27 ` Michal Hocko 2016-06-23 12:33 ` Mel Gorman 2016-06-23 12:33 ` Mel Gorman 2016-06-23 12:44 ` Michal Hocko 2016-06-23 12:44 ` Michal Hocko 2016-06-23 21:45 ` Andrew Morton 2016-06-23 21:45 ` Andrew Morton 2016-06-24 6:35 ` Balbir Singh 2016-06-24 6:35 ` Balbir Singh 2016-06-24 7:50 ` Mel Gorman 2016-06-24 7:50 ` Mel Gorman 2016-06-27 12:48 ` Balbir Singh 2016-06-27 12:48 ` Balbir Singh -- strict thread matches above, loose matches on Subject: below -- 2016-06-09 18:04 [PATCH 00/27] Move LRU page reclaim from zones to nodes v6 Mel Gorman 2016-06-09 18:04 ` [PATCH 17/27] mm: Rename NR_ANON_PAGES to NR_ANON_MAPPED Mel Gorman 2016-06-09 18:04 ` Mel Gorman 2016-06-17 8:28 ` Vlastimil Babka 2016-06-17 8:28 ` Vlastimil Babka 2016-04-15 9:13 [PATCH 00/27] Move LRU page reclaim from zones to nodes v5 Mel Gorman 2016-04-15 9:13 ` [PATCH 17/27] mm: Rename NR_ANON_PAGES to NR_ANON_MAPPED Mel Gorman 2016-04-15 9:13 ` Mel Gorman 2016-04-06 11:19 [RFC PATCH 00/27] Move LRU page reclaim from zones to nodes v3 Mel Gorman 2016-04-06 11:20 ` [PATCH 17/27] mm: Rename NR_ANON_PAGES to NR_ANON_MAPPED Mel Gorman 2016-04-06 11:20 ` Mel Gorman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1466518566-30034-18-git-send-email-mgorman@techsingularity.net \ --to=mgorman@techsingularity.net \ --cc=akpm@linux-foundation.org \ --cc=hannes@cmpxchg.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=riel@surriel.com \ --cc=vbabka@suse.cz \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.