From: Dave Hansen <dave.hansen@linux.intel.com> To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Dave Hansen <dave.hansen@linux.intel.com>, yang.shi@linux.alibaba.com, rientjes@google.com, ying.huang@intel.com, dan.j.williams@intel.com Subject: [RFC][PATCH 4/8] mm/vmscan: add page demotion counter Date: Mon, 29 Jun 2020 16:45:10 -0700 [thread overview] Message-ID: <20200629234510.1BF23254@viggo.jf.intel.com> (raw) In-Reply-To: <20200629234503.749E5340@viggo.jf.intel.com> From: Yang Shi <yang.shi@linux.alibaba.com> Account the number of demoted pages into reclaim_state->nr_demoted. Add pgdemote_kswapd and pgdemote_direct VM counters showed in /proc/vmstat. [ daveh: - __count_vm_events() a bit, and made them look at the THP size directly rather than getting data from migrate_pages() ] Signed-off-by: Yang Shi <yang.shi@linux.alibaba.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Cc: David Rientjes <rientjes@google.com> Cc: Huang Ying <ying.huang@intel.com> Cc: Dan Williams <dan.j.williams@intel.com> --- b/include/linux/vm_event_item.h | 2 ++ b/mm/migrate.c | 13 ++++++++++++- b/mm/vmscan.c | 1 + b/mm/vmstat.c | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff -puN include/linux/vm_event_item.h~mm-vmscan-add-page-demotion-counter include/linux/vm_event_item.h --- a/include/linux/vm_event_item.h~mm-vmscan-add-page-demotion-counter 2020-06-29 16:34:40.332312601 -0700 +++ b/include/linux/vm_event_item.h 2020-06-29 16:34:40.342312601 -0700 @@ -32,6 +32,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PS PGREFILL, PGSTEAL_KSWAPD, PGSTEAL_DIRECT, + PGDEMOTE_KSWAPD, + PGDEMOTE_DIRECT, PGSCAN_KSWAPD, PGSCAN_DIRECT, PGSCAN_DIRECT_THROTTLE, diff -puN mm/migrate.c~mm-vmscan-add-page-demotion-counter mm/migrate.c --- a/mm/migrate.c~mm-vmscan-add-page-demotion-counter 2020-06-29 16:34:40.334312601 -0700 +++ b/mm/migrate.c 2020-06-29 16:34:40.343312601 -0700 @@ -1187,6 +1187,7 @@ static struct page *alloc_demote_node_pa int migrate_demote_mapping(struct page *page) { int next_nid = next_demotion_node(page_to_nid(page)); + int ret; VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(PageHuge(page), page); @@ -1198,8 +1199,18 @@ int migrate_demote_mapping(struct page * return -ENOMEM; /* MIGRATE_ASYNC is the most light weight and never blocks.*/ - return __unmap_and_move(alloc_demote_node_page, NULL, next_nid, + ret = __unmap_and_move(alloc_demote_node_page, NULL, next_nid, page, MIGRATE_ASYNC, MR_DEMOTION); + + if (ret == MIGRATEPAGE_SUCCESS) { + int nr_demoted = hpage_nr_pages(page); + if (current_is_kswapd()) + __count_vm_events(PGDEMOTE_KSWAPD, nr_demoted); + else + __count_vm_events(PGDEMOTE_DIRECT, nr_demoted); + } + + return ret; } diff -puN mm/vmscan.c~mm-vmscan-add-page-demotion-counter mm/vmscan.c --- a/mm/vmscan.c~mm-vmscan-add-page-demotion-counter 2020-06-29 16:34:40.336312601 -0700 +++ b/mm/vmscan.c 2020-06-29 16:34:40.344312601 -0700 @@ -140,6 +140,7 @@ struct scan_control { unsigned int immediate; unsigned int file_taken; unsigned int taken; + unsigned int demoted; } nr; /* for recording the reclaimed slab by now */ diff -puN mm/vmstat.c~mm-vmscan-add-page-demotion-counter mm/vmstat.c --- a/mm/vmstat.c~mm-vmscan-add-page-demotion-counter 2020-06-29 16:34:40.339312601 -0700 +++ b/mm/vmstat.c 2020-06-29 16:34:40.345312601 -0700 @@ -1198,6 +1198,8 @@ const char * const vmstat_text[] = { "pgrefill", "pgsteal_kswapd", "pgsteal_direct", + "pgdemote_kswapd", + "pgdemote_direct", "pgscan_kswapd", "pgscan_direct", "pgscan_direct_throttle", _
WARNING: multiple messages have this Message-ID (diff)
From: Dave Hansen <dave.hansen@linux.intel.com> To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org,Dave Hansen <dave.hansen@linux.intel.com>,yang.shi@linux.alibaba.com,rientjes@google.com,ying.huang@intel.com,dan.j.williams@intel.com Subject: [RFC][PATCH 4/8] mm/vmscan: add page demotion counter Date: Mon, 29 Jun 2020 16:45:10 -0700 [thread overview] Message-ID: <20200629234510.1BF23254@viggo.jf.intel.com> (raw) In-Reply-To: <20200629234503.749E5340@viggo.jf.intel.com> From: Yang Shi <yang.shi@linux.alibaba.com> Account the number of demoted pages into reclaim_state->nr_demoted. Add pgdemote_kswapd and pgdemote_direct VM counters showed in /proc/vmstat. [ daveh: - __count_vm_events() a bit, and made them look at the THP size directly rather than getting data from migrate_pages() ] Signed-off-by: Yang Shi <yang.shi@linux.alibaba.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Cc: David Rientjes <rientjes@google.com> Cc: Huang Ying <ying.huang@intel.com> Cc: Dan Williams <dan.j.williams@intel.com> --- b/include/linux/vm_event_item.h | 2 ++ b/mm/migrate.c | 13 ++++++++++++- b/mm/vmscan.c | 1 + b/mm/vmstat.c | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff -puN include/linux/vm_event_item.h~mm-vmscan-add-page-demotion-counter include/linux/vm_event_item.h --- a/include/linux/vm_event_item.h~mm-vmscan-add-page-demotion-counter 2020-06-29 16:34:40.332312601 -0700 +++ b/include/linux/vm_event_item.h 2020-06-29 16:34:40.342312601 -0700 @@ -32,6 +32,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PS PGREFILL, PGSTEAL_KSWAPD, PGSTEAL_DIRECT, + PGDEMOTE_KSWAPD, + PGDEMOTE_DIRECT, PGSCAN_KSWAPD, PGSCAN_DIRECT, PGSCAN_DIRECT_THROTTLE, diff -puN mm/migrate.c~mm-vmscan-add-page-demotion-counter mm/migrate.c --- a/mm/migrate.c~mm-vmscan-add-page-demotion-counter 2020-06-29 16:34:40.334312601 -0700 +++ b/mm/migrate.c 2020-06-29 16:34:40.343312601 -0700 @@ -1187,6 +1187,7 @@ static struct page *alloc_demote_node_pa int migrate_demote_mapping(struct page *page) { int next_nid = next_demotion_node(page_to_nid(page)); + int ret; VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(PageHuge(page), page); @@ -1198,8 +1199,18 @@ int migrate_demote_mapping(struct page * return -ENOMEM; /* MIGRATE_ASYNC is the most light weight and never blocks.*/ - return __unmap_and_move(alloc_demote_node_page, NULL, next_nid, + ret = __unmap_and_move(alloc_demote_node_page, NULL, next_nid, page, MIGRATE_ASYNC, MR_DEMOTION); + + if (ret == MIGRATEPAGE_SUCCESS) { + int nr_demoted = hpage_nr_pages(page); + if (current_is_kswapd()) + __count_vm_events(PGDEMOTE_KSWAPD, nr_demoted); + else + __count_vm_events(PGDEMOTE_DIRECT, nr_demoted); + } + + return ret; } diff -puN mm/vmscan.c~mm-vmscan-add-page-demotion-counter mm/vmscan.c --- a/mm/vmscan.c~mm-vmscan-add-page-demotion-counter 2020-06-29 16:34:40.336312601 -0700 +++ b/mm/vmscan.c 2020-06-29 16:34:40.344312601 -0700 @@ -140,6 +140,7 @@ struct scan_control { unsigned int immediate; unsigned int file_taken; unsigned int taken; + unsigned int demoted; } nr; /* for recording the reclaimed slab by now */ diff -puN mm/vmstat.c~mm-vmscan-add-page-demotion-counter mm/vmstat.c --- a/mm/vmstat.c~mm-vmscan-add-page-demotion-counter 2020-06-29 16:34:40.339312601 -0700 +++ b/mm/vmstat.c 2020-06-29 16:34:40.345312601 -0700 @@ -1198,6 +1198,8 @@ const char * const vmstat_text[] = { "pgrefill", "pgsteal_kswapd", "pgsteal_direct", + "pgdemote_kswapd", + "pgdemote_direct", "pgscan_kswapd", "pgscan_direct", "pgscan_direct_throttle", _
next prev parent reply other threads:[~2020-06-29 23:48 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-29 23:45 [RFC][PATCH 0/8] Migrate Pages in lieu of discard Dave Hansen 2020-06-29 23:45 ` Dave Hansen 2020-06-29 23:45 ` [RFC][PATCH 1/8] mm/numa: node demotion data structure and lookup Dave Hansen 2020-06-29 23:45 ` Dave Hansen 2020-06-29 23:45 ` [RFC][PATCH 2/8] mm/migrate: Defer allocating new page until needed Dave Hansen 2020-06-29 23:45 ` Dave Hansen 2020-07-01 8:47 ` Greg Thelen 2020-07-01 8:47 ` Greg Thelen 2020-07-01 14:46 ` Dave Hansen 2020-07-01 18:32 ` Yang Shi 2020-06-29 23:45 ` [RFC][PATCH 3/8] mm/vmscan: Attempt to migrate page in lieu of discard Dave Hansen 2020-06-29 23:45 ` Dave Hansen 2020-07-01 0:47 ` David Rientjes 2020-07-01 0:47 ` David Rientjes 2020-07-01 1:29 ` Yang Shi 2020-07-01 5:41 ` David Rientjes 2020-07-01 5:41 ` David Rientjes 2020-07-01 8:54 ` Huang, Ying 2020-07-01 8:54 ` Huang, Ying 2020-07-01 18:20 ` Dave Hansen 2020-07-01 19:50 ` David Rientjes 2020-07-01 19:50 ` David Rientjes 2020-07-02 1:50 ` Huang, Ying 2020-07-02 1:50 ` Huang, Ying 2020-07-01 15:15 ` Dave Hansen 2020-07-01 17:21 ` Yang Shi 2020-07-01 19:45 ` David Rientjes 2020-07-01 19:45 ` David Rientjes 2020-07-02 10:02 ` Jonathan Cameron 2020-07-01 1:40 ` Huang, Ying 2020-07-01 1:40 ` Huang, Ying 2020-07-01 16:48 ` Dave Hansen 2020-07-01 19:25 ` David Rientjes 2020-07-01 19:25 ` David Rientjes 2020-07-02 5:02 ` Huang, Ying 2020-07-02 5:02 ` Huang, Ying 2020-06-29 23:45 ` Dave Hansen [this message] 2020-06-29 23:45 ` [RFC][PATCH 4/8] mm/vmscan: add page demotion counter Dave Hansen 2020-06-29 23:45 ` [RFC][PATCH 5/8] mm/numa: automatically generate node migration order Dave Hansen 2020-06-29 23:45 ` Dave Hansen 2020-06-30 8:22 ` Huang, Ying 2020-06-30 8:22 ` Huang, Ying 2020-07-01 18:23 ` Dave Hansen 2020-07-02 1:20 ` Huang, Ying 2020-07-02 1:20 ` Huang, Ying 2020-06-29 23:45 ` [RFC][PATCH 6/8] mm/vmscan: Consider anonymous pages without swap Dave Hansen 2020-06-29 23:45 ` Dave Hansen 2020-06-29 23:45 ` [RFC][PATCH 7/8] mm/vmscan: never demote for memcg reclaim Dave Hansen 2020-06-29 23:45 ` Dave Hansen 2020-06-29 23:45 ` [RFC][PATCH 8/8] mm/numa: new reclaim mode to enable reclaim-based migration Dave Hansen 2020-06-29 23:45 ` Dave Hansen 2020-06-30 7:23 ` Huang, Ying 2020-06-30 7:23 ` Huang, Ying 2020-06-30 17:50 ` Yang Shi 2020-07-01 0:48 ` Huang, Ying 2020-07-01 0:48 ` Huang, Ying 2020-07-01 1:12 ` Yang Shi 2020-07-01 1:28 ` Huang, Ying 2020-07-01 1:28 ` Huang, Ying 2020-07-01 16:02 ` Dave Hansen 2020-07-03 9:30 ` Huang, Ying 2020-07-03 9:30 ` Huang, Ying 2020-06-30 18:36 ` [RFC][PATCH 0/8] Migrate Pages in lieu of discard Shakeel Butt 2020-06-30 18:36 ` Shakeel Butt 2020-06-30 18:51 ` Dave Hansen 2020-06-30 19:25 ` Shakeel Butt 2020-06-30 19:25 ` Shakeel Butt 2020-06-30 19:31 ` Dave Hansen 2020-07-01 14:24 ` [RFC] [PATCH " Zi Yan 2020-07-01 14:32 ` 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=20200629234510.1BF23254@viggo.jf.intel.com \ --to=dave.hansen@linux.intel.com \ --cc=dan.j.williams@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=rientjes@google.com \ --cc=yang.shi@linux.alibaba.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: 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.