Commit fad02c2d authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds

mm: memcg: group swapped-out statistics counter logically

The counter of currently swapped out pages in a memcg (hierarchy) is
sitting amidst ever-increasing event counters.  Move this item to the
other counters that reflect current state rather than history.

This technically breaks the kernel ABI, but hopefully nobody relies on the
order of items in memory.stat.
Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Ying Han <yinghan@google.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 13114716
...@@ -4043,9 +4043,9 @@ enum { ...@@ -4043,9 +4043,9 @@ enum {
MCS_CACHE, MCS_CACHE,
MCS_RSS, MCS_RSS,
MCS_FILE_MAPPED, MCS_FILE_MAPPED,
MCS_SWAP,
MCS_PGPGIN, MCS_PGPGIN,
MCS_PGPGOUT, MCS_PGPGOUT,
MCS_SWAP,
MCS_PGFAULT, MCS_PGFAULT,
MCS_PGMAJFAULT, MCS_PGMAJFAULT,
MCS_INACTIVE_ANON, MCS_INACTIVE_ANON,
...@@ -4064,9 +4064,9 @@ static const char *memcg_stat_strings[NR_MCS_STAT] = { ...@@ -4064,9 +4064,9 @@ static const char *memcg_stat_strings[NR_MCS_STAT] = {
"cache", "cache",
"rss", "rss",
"mapped_file", "mapped_file",
"swap",
"pgpgin", "pgpgin",
"pgpgout", "pgpgout",
"swap",
"pgfault", "pgfault",
"pgmajfault", "pgmajfault",
"inactive_anon", "inactive_anon",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment