mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-14 15:54:15 +08:00
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: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.cz> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Ying Han <yinghan@google.com> Cc: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
13114716c7
commit
fad02c2de0
@ -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] = {
|
|||||||
"cache",
|
"cache",
|
||||||
"rss",
|
"rss",
|
||||||
"mapped_file",
|
"mapped_file",
|
||||||
|
"swap",
|
||||||
"pgpgin",
|
"pgpgin",
|
||||||
"pgpgout",
|
"pgpgout",
|
||||||
"swap",
|
|
||||||
"pgfault",
|
"pgfault",
|
||||||
"pgmajfault",
|
"pgmajfault",
|
||||||
"inactive_anon",
|
"inactive_anon",
|
||||||
|
Loading…
Reference in New Issue
Block a user