From 92cd0e289a6b92c6f39d498c8e97449440e24ea3 Mon Sep 17 00:00:00 2001 From: Muchun Song Date: Fri, 25 Sep 2020 21:19:05 -0700 Subject: [PATCH 2386/2944] mm: memcontrol: fix missing suffix of workingset_restore task #30476868 commit 8d3fe09d8d6645dcbbe2413cde58f51ceb6545a6 upstream We forget to add the suffix to the workingset_restore string, so fix it. And also update the documentation of cgroup-v2.rst. Fixes: 170b04b7ae49 ("mm/workingset: prepare the workingset detection infrastructure for anon LRU") Signed-off-by: Muchun Song Signed-off-by: Andrew Morton Reviewed-by: Shakeel Butt Cc: Joonsoo Kim Cc: Johannes Weiner Cc: Vlastimil Babka Cc: Tejun Heo Cc: Zefan Li Cc: Jonathan Corbet Cc: Michal Hocko Cc: Vladimir Davydov Cc: Roman Gushchin Cc: Randy Dunlap Link: https://lkml.kernel.org/r/20200916100030.71698-1-songmuchun@bytedance.com Signed-off-by: Linus Torvalds Signed-off-by: zhongjiang-ali Reviewed-by: Xunlei Pang --- Documentation/admin-guide/cgroup-v2.rst | 23 ++++++++++++++++------- mm/memcontrol.c | 4 ++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index 57bb84e..a72ac12 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -1263,17 +1263,26 @@ PAGE_SIZE multiple when read back. pgmajfault Number of major page faults incurred - workingset_refault + workingset_refault_anon + Number of refaults of previously evicted anonymous pages. - Number of refaults of previously evicted pages + workingset_refault_file + Number of refaults of previously evicted file pages. - workingset_activate + workingset_activate_anon + Number of refaulted anonymous pages that were immediately + activated. - Number of refaulted pages that were immediately activated + workingset_activate_file + Number of refaulted file pages that were immediately activated. - workingset_restore - Number of restored pages which have been detected as an active - workingset before they got reclaimed. + workingset_restore_anon + Number of restored anonymous pages which have been detected as + an active workingset before they got reclaimed. + + workingset_restore_file + Number of restored file pages which have been detected as an + active workingset before they got reclaimed. workingset_nodereclaim diff --git a/mm/memcontrol.c b/mm/memcontrol.c index f4cd64e..f9e28c2 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7316,9 +7316,9 @@ static int memory_stat_show(struct seq_file *m, void *v) memcg_page_state(memcg, WORKINGSET_ACTIVATE_ANON)); seq_printf(m, "workingset_activate_file %lu\n", memcg_page_state(memcg, WORKINGSET_ACTIVATE_FILE)); - seq_printf(m, "workingset_restore %lu\n", + seq_printf(m, "workingset_restore_anon %lu\n", memcg_page_state(memcg, WORKINGSET_RESTORE_ANON)); - seq_printf(m, "workingset_restore %lu\n", + seq_printf(m, "workingset_restore_file %lu\n", memcg_page_state(memcg, WORKINGSET_RESTORE_FILE)); seq_printf(m, "workingset_nodereclaim %lu\n", memcg_page_state(memcg, WORKINGSET_NODERECLAIM)); -- 1.8.3.1