From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48C67C2D0A8 for ; Sat, 26 Sep 2020 04:19:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 09E4120882 for ; Sat, 26 Sep 2020 04:19:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601093948; bh=ueHzXzZ8XvTGj1BSpsi5gz3iboaNaBmlhhqS7ErYD0U=; h=Date:From:To:Subject:In-Reply-To:Reply-To:List-ID:From; b=z6mbnJKyYiTnNEqkmry1miqqpMuurkoffzwnTpm9wOoCg+LJr+kd5pZ1+ZvgOWYxS I3qSuC/QNYLlPKvLVJwApV6fu7Fwgqibjegpxu3/HHfLZq7oRLcfuvlY4xlHk/WGLs IB7M/9pSkHmMJbMMOkitKpYAr191pvdD81dxiQnk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730033AbgIZETH (ORCPT ); Sat, 26 Sep 2020 00:19:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:51672 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730013AbgIZETH (ORCPT ); Sat, 26 Sep 2020 00:19:07 -0400 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0C22B2078B; Sat, 26 Sep 2020 04:19:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601093946; bh=ueHzXzZ8XvTGj1BSpsi5gz3iboaNaBmlhhqS7ErYD0U=; h=Date:From:To:Subject:In-Reply-To:From; b=TXOz0L5ihcGhlMQ4wW1+woCbwN4Qjy/Y8r2Hj2nNxTOHhz6uKWC2dj/vm6CJ9G9dw +xxw8U4k54br1MneI6AFgQ6oVP+KKu6pU17IzOavijvoQc4v39/TBYzWjYnNQdNN11 +1vrzHfJNqHpAT+BXQ66Q3QbFDeTDXCkvHASGrvM= Date: Fri, 25 Sep 2020 21:19:05 -0700 From: Andrew Morton To: akpm@linux-foundation.org, corbet@lwn.net, guro@fb.com, hannes@cmpxchg.org, iamjoonsoo.kim@lge.com, linux-mm@kvack.org, lizefan@huawei.com, mhocko@kernel.org, mm-commits@vger.kernel.org, rdunlap@infradead.org, shakeelb@google.com, songmuchun@bytedance.com, tj@kernel.org, torvalds@linux-foundation.org, vbabka@suse.cz, vdavydov.dev@gmail.com Subject: [patch 2/9] mm: memcontrol: fix missing suffix of workingset_restore Message-ID: <20200926041905.JOR3-Yv3y%akpm@linux-foundation.org> In-Reply-To: <20200925211725.0fea54be9e9715486efea21f@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org From: Muchun Song Subject: 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. Link: https://lkml.kernel.org/r/20200916100030.71698-1-songmuchun@bytedance.com Fixes: 170b04b7ae49 ("mm/workingset: prepare the workingset detection infrastructure for anon LRU") Signed-off-by: Muchun Song 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 Signed-off-by: Andrew Morton --- Documentation/admin-guide/cgroup-v2.rst | 25 +++++++++++++++------- mm/memcontrol.c | 4 +-- 2 files changed, 20 insertions(+), 9 deletions(-) --- a/Documentation/admin-guide/cgroup-v2.rst~mm-memcontrol-fix-missing-suffix-of-workingset_restore +++ a/Documentation/admin-guide/cgroup-v2.rst @@ -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 --- a/mm/memcontrol.c~mm-memcontrol-fix-missing-suffix-of-workingset_restore +++ a/mm/memcontrol.c @@ -1538,9 +1538,9 @@ static char *memory_stat_format(struct m 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)); _