Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 170b04b7ae49 ("mm/workingset: prepare the workingset detection infrastructure for anon LRU")
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Shakeel 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: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Muchun Song and committed by
Linus Torvalds
8d3fe09d 41663430

+20 -9
+18 -7
Documentation/admin-guide/cgroup-v2.rst
··· 1324 1324 pgmajfault 1325 1325 Number of major page faults incurred 1326 1326 1327 - workingset_refault 1328 - Number of refaults of previously evicted pages 1327 + workingset_refault_anon 1328 + Number of refaults of previously evicted anonymous pages. 1329 1329 1330 - workingset_activate 1331 - Number of refaulted pages that were immediately activated 1330 + workingset_refault_file 1331 + Number of refaults of previously evicted file pages. 1332 1332 1333 - workingset_restore 1334 - Number of restored pages which have been detected as an active 1335 - workingset before they got reclaimed. 1333 + workingset_activate_anon 1334 + Number of refaulted anonymous pages that were immediately 1335 + activated. 1336 + 1337 + workingset_activate_file 1338 + Number of refaulted file pages that were immediately activated. 1339 + 1340 + workingset_restore_anon 1341 + Number of restored anonymous pages which have been detected as 1342 + an active workingset before they got reclaimed. 1343 + 1344 + workingset_restore_file 1345 + Number of restored file pages which have been detected as an 1346 + active workingset before they got reclaimed. 1336 1347 1337 1348 workingset_nodereclaim 1338 1349 Number of times a shadow node has been reclaimed
+2 -2
mm/memcontrol.c
··· 1538 1538 memcg_page_state(memcg, WORKINGSET_ACTIVATE_ANON)); 1539 1539 seq_buf_printf(&s, "workingset_activate_file %lu\n", 1540 1540 memcg_page_state(memcg, WORKINGSET_ACTIVATE_FILE)); 1541 - seq_buf_printf(&s, "workingset_restore %lu\n", 1541 + seq_buf_printf(&s, "workingset_restore_anon %lu\n", 1542 1542 memcg_page_state(memcg, WORKINGSET_RESTORE_ANON)); 1543 - seq_buf_printf(&s, "workingset_restore %lu\n", 1543 + seq_buf_printf(&s, "workingset_restore_file %lu\n", 1544 1544 memcg_page_state(memcg, WORKINGSET_RESTORE_FILE)); 1545 1545 seq_buf_printf(&s, "workingset_nodereclaim %lu\n", 1546 1546 memcg_page_state(memcg, WORKINGSET_NODERECLAIM));