From: Yang Shi <yang.shi@linux.alibaba.com>
To: mhocko@suse.com, mgorman@techsingularity.net, riel@surriel.com,
hannes@cmpxchg.org, akpm@linux-foundation.org,
dave.hansen@intel.com, keith.busch@intel.com,
dan.j.williams@intel.com, fengguang.wu@intel.com,
fan.du@intel.com, ying.huang@intel.com
Cc: yang.shi@linux.alibaba.com, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 07/10] mm: vmscan: add page demotion counter
Date: Sat, 23 Mar 2019 12:44:32 +0800 [thread overview]
Message-ID: <1553316275-21985-8-git-send-email-yang.shi@linux.alibaba.com> (raw)
In-Reply-To: <1553316275-21985-1-git-send-email-yang.shi@linux.alibaba.com>
Demoted pages are counted into reclaim_state->nr_demoted instead of
nr_reclaimed since they are not reclaimed actually. They are still in
memory, but just migrated to PMEM.
Add pgdemote_kswapd and pgdemote_direct VM counters showed in
/proc/vmstat.
Signed-off-by: Yang Shi <yang.shi@linux.alibaba.com>
---
include/linux/vm_event_item.h | 2 ++
include/linux/vmstat.h | 1 +
mm/vmscan.c | 14 ++++++++++++++
mm/vmstat.c | 2 ++
4 files changed, 19 insertions(+)
diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h
index 47a3441..499a3aa 100644
--- a/include/linux/vm_event_item.h
+++ b/include/linux/vm_event_item.h
@@ -32,6 +32,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
PGREFILL,
PGSTEAL_KSWAPD,
PGSTEAL_DIRECT,
+ PGDEMOTE_KSWAPD,
+ PGDEMOTE_DIRECT,
PGSCAN_KSWAPD,
PGSCAN_DIRECT,
PGSCAN_DIRECT_THROTTLE,
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index 2db8d60..eb5d21c 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -29,6 +29,7 @@ struct reclaim_stat {
unsigned nr_activate;
unsigned nr_ref_keep;
unsigned nr_unmap_fail;
+ unsigned nr_demoted;
};
#ifdef CONFIG_VM_EVENT_COUNTERS
diff --git a/mm/vmscan.c b/mm/vmscan.c
index bdcab6b..3c7ba7e 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1286,6 +1286,10 @@ static unsigned long shrink_page_list(struct list_head *page_list,
if (has_nonram_online()) {
list_add(&page->lru, &demote_pages);
+ if (PageTransHuge(page))
+ stat->nr_demoted += HPAGE_PMD_NR;
+ else
+ stat->nr_demoted++;
unlock_page(page);
continue;
}
@@ -1523,7 +1527,17 @@ static unsigned long shrink_page_list(struct list_head *page_list,
putback_movable_pages(&demote_pages);
list_splice(&ret_pages, &demote_pages);
+
+ if (err > 0)
+ stat->nr_demoted -= err;
+ else
+ stat->nr_demoted = 0;
}
+
+ if (current_is_kswapd())
+ __count_vm_events(PGDEMOTE_KSWAPD, stat->nr_demoted);
+ else
+ __count_vm_events(PGDEMOTE_DIRECT, stat->nr_demoted);
}
mem_cgroup_uncharge_list(&free_pages);
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 36b56f8..0e863e7 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1192,6 +1192,8 @@ int fragmentation_index(struct zone *zone, unsigned int order)
"pgrefill",
"pgsteal_kswapd",
"pgsteal_direct",
+ "pgdemote_kswapd",
+ "pgdemote_direct",
"pgscan_kswapd",
"pgscan_direct",
"pgscan_direct_throttle",
--
1.8.3.1
next prev parent reply other threads:[~2019-03-23 4:46 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-23 4:44 [RFC PATCH 0/10] Another Approach to Use PMEM as NUMA Node Yang Shi
2019-03-23 4:44 ` [PATCH 01/10] mm: control memory placement by nodemask for two tier main memory Yang Shi
2019-03-23 17:21 ` Dan Williams
2019-03-25 19:28 ` Yang Shi
2019-03-25 23:18 ` Dan Williams
2019-03-25 23:36 ` Yang Shi
2019-03-25 23:42 ` Dan Williams
2019-03-23 4:44 ` [PATCH 02/10] mm: mempolicy: introduce MPOL_HYBRID policy Yang Shi
2019-03-23 4:44 ` [PATCH 03/10] mm: mempolicy: promote page to DRAM for MPOL_HYBRID Yang Shi
2019-03-23 4:44 ` [PATCH 04/10] mm: numa: promote pages to DRAM when it is accessed twice Yang Shi
2019-03-29 0:31 ` kbuild test robot
2019-03-23 4:44 ` [PATCH 05/10] mm: page_alloc: make find_next_best_node could skip DRAM node Yang Shi
2019-03-23 4:44 ` [PATCH 06/10] mm: vmscan: demote anon DRAM pages to PMEM node Yang Shi
2019-03-23 6:03 ` Zi Yan
2019-03-25 21:49 ` Yang Shi
2019-03-24 22:20 ` Keith Busch
2019-03-25 19:49 ` Yang Shi
2019-03-27 0:35 ` Keith Busch
2019-03-27 3:41 ` Yang Shi
2019-03-27 13:08 ` Keith Busch
2019-03-27 17:00 ` Zi Yan
2019-03-27 17:05 ` Dave Hansen
2019-03-27 17:48 ` Zi Yan
2019-03-27 18:00 ` Dave Hansen
2019-03-27 20:37 ` Zi Yan
2019-03-27 20:42 ` Dave Hansen
2019-03-28 21:59 ` Yang Shi
2019-03-28 22:45 ` Keith Busch
2019-03-23 4:44 ` Yang Shi [this message]
2019-03-23 4:44 ` [PATCH 08/10] mm: numa: add page promotion counter Yang Shi
2019-03-23 4:44 ` [PATCH 09/10] doc: add description for MPOL_HYBRID mode Yang Shi
2019-03-23 4:44 ` [PATCH 10/10] doc: elaborate the PMEM allocation rule Yang Shi
2019-03-25 16:15 ` [RFC PATCH 0/10] Another Approach to Use PMEM as NUMA Node Brice Goglin
2019-03-25 16:56 ` Dan Williams
2019-03-25 17:45 ` Brice Goglin
2019-03-25 19:29 ` Dan Williams
2019-03-25 23:09 ` Brice Goglin
2019-03-25 23:37 ` Dan Williams
2019-03-26 12:19 ` Jonathan Cameron
2019-03-25 20:04 ` Yang Shi
2019-03-26 13:58 ` Michal Hocko
2019-03-26 18:33 ` Yang Shi
2019-03-26 18:37 ` Michal Hocko
2019-03-27 2:58 ` Yang Shi
2019-03-27 9:01 ` Michal Hocko
2019-03-27 17:34 ` Dan Williams
2019-03-27 18:59 ` Yang Shi
2019-03-27 20:09 ` Michal Hocko
2019-03-28 2:09 ` Yang Shi
2019-03-28 6:58 ` Michal Hocko
2019-03-28 18:58 ` Yang Shi
2019-03-28 19:12 ` Michal Hocko
2019-03-28 19:40 ` Yang Shi
2019-03-28 20:40 ` Michal Hocko
2019-03-28 8:21 ` Dan Williams
2019-03-27 20:14 ` Dave Hansen
2019-03-27 20:35 ` Matthew Wilcox
2019-03-27 20:40 ` Dave Hansen
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=1553316275-21985-8-git-send-email-yang.shi@linux.alibaba.com \
--to=yang.shi@linux.alibaba.com \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@intel.com \
--cc=fan.du@intel.com \
--cc=fengguang.wu@intel.com \
--cc=hannes@cmpxchg.org \
--cc=keith.busch@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@techsingularity.net \
--cc=mhocko@suse.com \
--cc=riel@surriel.com \
--cc=ying.huang@intel.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).