Commit 8d3fe09d authored by Muchun Song's avatar Muchun Song Committed by Linus Torvalds
Browse files

mm: memcontrol: fix missing suffix of workingset_restore 



We forget to add the suffix to the workingset_restore string, so fix it.

And also update the documentation of cgroup-v2.rst.

Fixes: 170b04b7 ("mm/workingset: prepare the workingset detection infrastructure for anon LRU")
Signed-off-by: default avatarMuchun Song <songmuchun@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarShakeel Butt <shakeelb@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Tejun Heo <tj@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Roman Gushchin <guro@fb.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Link: https://lkml.kernel.org/r/20200916100030.71698-1-songmuchun@bytedance.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 41663430

Documentation/admin-guide/cgroup-v2.rst

+18 −7
Original line number Diff line number Diff line
@@ -1324,15 +1324,26 @@ PAGE_SIZE multiple when read back. 
	  pgmajfault

		Number of major page faults incurred



	  workingset_refault

		Number of refaults of previously evicted pages

	  workingset_refault_anon

		Number of refaults of previously evicted anonymous pages.



	  workingset_activate

		Number of refaulted pages that were immediately activated

	  workingset_refault_file

		Number of refaults of previously evicted file pages.



	  workingset_restore

		Number of restored pages which have been detected as an active

		workingset before they got reclaimed.

	  workingset_activate_anon

		Number of refaulted anonymous pages that were immediately

		activated.



	  workingset_activate_file

		Number of refaulted file pages that were immediately activated.



	  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

		Number of times a shadow node has been reclaimed

mm/memcontrol.c

+2 −2
Original line number Diff line number Diff line
@@ -1538,9 +1538,9 @@ static char *memory_stat_format(struct mem_cgroup *memcg) 
		       memcg_page_state(memcg, WORKINGSET_ACTIVATE_ANON));

	seq_buf_printf(&s, "workingset_activate_file %lu\n",

		       memcg_page_state(memcg, WORKINGSET_ACTIVATE_FILE));

	seq_buf_printf(&s, "workingset_restore %lu\n",

	seq_buf_printf(&s, "workingset_restore_anon %lu\n",

		       memcg_page_state(memcg, WORKINGSET_RESTORE_ANON));

	seq_buf_printf(&s, "workingset_restore %lu\n",

	seq_buf_printf(&s, "workingset_restore_file %lu\n",

		       memcg_page_state(memcg, WORKINGSET_RESTORE_FILE));

	seq_buf_printf(&s, "workingset_nodereclaim %lu\n",

		       memcg_page_state(memcg, WORKINGSET_NODERECLAIM));