linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dave Hansen <dave.hansen@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: 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 09/12] mm/vmscan: add page demotion counter
Date: Tue, 06 Oct 2020 13:51:21 -0700	[thread overview]
Message-ID: <20201006205121.9669FAED@viggo.jf.intel.com> (raw)
In-Reply-To: <20201006205103.268F74A9@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/vmscan.c                   |    6 ++++++
 b/mm/vmstat.c                   |    2 ++
 3 files changed, 10 insertions(+)

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-10-06 13:39:30.204818419 -0700
+++ b/include/linux/vm_event_item.h	2020-10-06 13:39:30.212818419 -0700
@@ -33,6 +33,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PS
 		PGREUSE,
 		PGSTEAL_KSWAPD,
 		PGSTEAL_DIRECT,
+		PGDEMOTE_KSWAPD,
+		PGDEMOTE_DIRECT,
 		PGSCAN_KSWAPD,
 		PGSCAN_DIRECT,
 		PGSCAN_DIRECT_THROTTLE,
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-10-06 13:39:30.206818419 -0700
+++ b/mm/vmscan.c	2020-10-06 13:39:30.213818419 -0700
@@ -147,6 +147,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 */
@@ -1134,6 +1135,11 @@ static unsigned int demote_page_list(str
 			    target_nid, MIGRATE_ASYNC, MR_DEMOTION,
 			    &nr_succeeded);
 
+	if (current_is_kswapd())
+		__count_vm_events(PGDEMOTE_KSWAPD, nr_succeeded);
+	else
+		__count_vm_events(PGDEMOTE_DIRECT, nr_succeeded);
+
 	return nr_succeeded;
 }
 
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-10-06 13:39:30.208818419 -0700
+++ b/mm/vmstat.c	2020-10-06 13:39:30.214818419 -0700
@@ -1244,6 +1244,8 @@ const char * const vmstat_text[] = {
 	"pgreuse",
 	"pgsteal_kswapd",
 	"pgsteal_direct",
+	"pgdemote_kswapd",
+	"pgdemote_direct",
 	"pgscan_kswapd",
 	"pgscan_direct",
 	"pgscan_direct_throttle",
_

  parent reply	other threads:[~2020-10-06 20:51 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-06 20:51 [RFC][PATCH 00/12] mm: tweak page cache migration Dave Hansen
2020-10-06 20:51 ` [RFC][PATCH 01/12] mm/vmscan: restore zone_reclaim_mode ABI Dave Hansen
2020-10-07  8:45   ` Christopher Lameter
2020-10-06 20:51 ` [RFC][PATCH 02/12] mm/vmscan: move RECLAIM* bits to uapi header Dave Hansen
2020-10-07  8:45   ` Christopher Lameter
2020-10-06 20:51 ` [RFC][PATCH 03/12] mm/vmscan: replace implicit RECLAIM_ZONE checks with explicit checks Dave Hansen
2020-10-07  8:47   ` Christopher Lameter
2020-10-06 20:51 ` [RFC][PATCH 04/12] mm/numa: node demotion data structure and lookup Dave Hansen
2020-10-06 20:51 ` [RFC][PATCH 05/12] mm/numa: automatically generate node migration order Dave Hansen
2020-10-06 20:51 ` [RFC][PATCH 06/12] mm/migrate: update migration order during on hotplug events Dave Hansen
2020-10-06 20:51 ` [RFC][PATCH 07/12] mm/migrate: make migrate_pages() return nr_succeeded Dave Hansen
2020-10-06 20:51 ` [RFC][PATCH 08/12] mm/migrate: demote pages during reclaim Dave Hansen
2020-10-06 20:51 ` Dave Hansen [this message]
2020-10-06 20:51 ` [RFC][PATCH 10/12] mm/vmscan: Consider anonymous pages without swap Dave Hansen
2020-10-06 20:51 ` [RFC][PATCH 11/12] mm/vmscan: never demote for memcg reclaim Dave Hansen
2020-10-06 20:51 ` [RFC][PATCH 12/12] mm/migrate: new zone_reclaim_mode to enable reclaim migration Dave Hansen
2020-10-06 20:53 ` [RFC][PATCH 00/12] mm: tweak page cache migration Dave Hansen
2020-10-07  9:52 ` Michal Hocko
2020-10-07  9:55   ` David Hildenbrand
2020-10-07 15:52     ` Yang Shi
2020-10-07 15:58       ` 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=20201006205121.9669FAED@viggo.jf.intel.com \
    --to=dave.hansen@linux.intel.com \
    --cc=dan.j.williams@intel.com \
    --cc=linux-kernel@vger.kernel.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: 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).