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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 991EAC2BB40 for ; Tue, 8 Dec 2020 07:21:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7AAE423A7B for ; Tue, 8 Dec 2020 07:21:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726890AbgLHHVm (ORCPT ); Tue, 8 Dec 2020 02:21:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726734AbgLHHVl (ORCPT ); Tue, 8 Dec 2020 02:21:41 -0500 Received: from mail-il1-x143.google.com (mail-il1-x143.google.com [IPv6:2607:f8b0:4864:20::143]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE24EC0613D6; Mon, 7 Dec 2020 23:21:00 -0800 (PST) Received: by mail-il1-x143.google.com with SMTP id q1so14673839ilt.6; Mon, 07 Dec 2020 23:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=CEynT5dpSXW+WFAGgwzXAAa4Ed/5m+41lEEZZSPwK4c=; b=HnebRFXeVFtvbqpPwaXJMGQcaTR9t2QL1GKCBmv46xaED552sAZUqFw0lalCkqNT0x uuDmDnia24FJpuFScSUESEuEBB7JbxDSny3kjyfllrO21GqB59gRwsXly6ZKk+0Q3Qcc QNNawcYv7ZiJJNPt3OIo3JAQoXvAVL/i15MAR2PXkHcrwtIyvAQAXIx9UrjIMxfbAYix RjU0+K+gO8MSX18Wee1vhh3Z3I3923LscJTNV9NLOXypocFMxk4LHTPl2Rdu+z41dst7 RzS0QoO23nhUTVPUlwmVxe8dJG84Yvcgq+p10k5gHDqs439HQkzXdnO2QIzkCgAyDfLI pnew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=CEynT5dpSXW+WFAGgwzXAAa4Ed/5m+41lEEZZSPwK4c=; b=nbpk/MrBvFhQnz4JhUPl7YY3vbcfTr4Yxv6cURoxhmChHeugyLK7YVLIvMiWH6olI0 APedx0rwbNRkRvGyEV0rUP5vvvuG5jX80fDvqdMjcnrKcc9hMzM/xcCSRivvAPb7DNMf +zhYmHmsdY/CqZpNt395KFlmsONAFnwlN0eucBO3Lnif149EQQJrwlzi+9EEUAtB7DWw +1OqSct9Hmd0nvNt53SmyrBTh1Tn8szGqdjHC1Kv5FQirHKYZEsWKjTYvgt69D9ykSDU +J+/RtwnftXrq/IP4LZOkLFHGCr+Jc+ATTWe8dfHk9vIfu+qNXeywOs2uAtm2qaGRWno HbuA== X-Gm-Message-State: AOAM533Zrnc1qL3DVRXJpfo0yvvM2Djn7S+FGIhluWng169Ghhxp9D10 Mb/sD3DtGR70ykM+tRoy6pNfbrHhqXDOjMiN1q4= X-Google-Smtp-Source: ABdhPJzRSK5wYtQzeksIhxQ+zO2r/uYBYNVZSoioPawq7N4IxFHABxMsiY86F3rKVt1Qygv9xwgIv7bOeXyhaPiH9FU= X-Received: by 2002:a92:a154:: with SMTP id v81mr25905298ili.85.1607412060284; Mon, 07 Dec 2020 23:21:00 -0800 (PST) MIME-Version: 1.0 References: <20201208041847.72122-1-songmuchun@bytedance.com> <20201208041847.72122-8-songmuchun@bytedance.com> In-Reply-To: <20201208041847.72122-8-songmuchun@bytedance.com> From: Pankaj Gupta Date: Tue, 8 Dec 2020 08:20:49 +0100 Message-ID: Subject: Re: [PATCH v3 7/7] mm: memcontrol: make the slab calculation consistent To: Muchun Song Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , adobriyan@gmail.com, Andrew Morton , Johannes Weiner , Michal Hocko , vdavydov.dev@gmail.com, Hugh Dickins , shakeelb@google.com, guro@fb.com, samitolvanen@google.com, feng.tang@intel.com, neilb@suse.de, Joonsoo Kim , Randy Dunlap , LKML , linux-fsdevel@vger.kernel.org, Linux MM , cgroups@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > Although the ratio of the slab is one, we also should read the ratio > from the related memory_stats instead of hard-coding. And the local > variable of size is already the value of slab_unreclaimable. So we > do not need to read again. > > We can drop the ratio in struct memory_stat. This can make the code > clean and simple. And get rid of the awkward mix of static and runtime > initialization of the memory_stats table. > > Signed-off-by: Muchun Song > --- > mm/memcontrol.c | 112 ++++++++++++++++++++++++++++++++++++-------------------- > 1 file changed, 73 insertions(+), 39 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index a40797a27f87..841ea37cc123 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1511,49 +1511,78 @@ static bool mem_cgroup_wait_acct_move(struct mem_cgroup *memcg) > > struct memory_stat { > const char *name; > - unsigned int ratio; > unsigned int idx; > }; > > static const struct memory_stat memory_stats[] = { > - { "anon", PAGE_SIZE, NR_ANON_MAPPED }, > - { "file", PAGE_SIZE, NR_FILE_PAGES }, > - { "kernel_stack", 1024, NR_KERNEL_STACK_KB }, > - { "pagetables", PAGE_SIZE, NR_PAGETABLE }, > - { "percpu", 1, MEMCG_PERCPU_B }, > - { "sock", PAGE_SIZE, MEMCG_SOCK }, > - { "shmem", PAGE_SIZE, NR_SHMEM }, > - { "file_mapped", PAGE_SIZE, NR_FILE_MAPPED }, > - { "file_dirty", PAGE_SIZE, NR_FILE_DIRTY }, > - { "file_writeback", PAGE_SIZE, NR_WRITEBACK }, > + { "anon", NR_ANON_MAPPED }, > + { "file", NR_FILE_PAGES }, > + { "kernel_stack", NR_KERNEL_STACK_KB }, > + { "pagetables", NR_PAGETABLE }, > + { "percpu", MEMCG_PERCPU_B }, > + { "sock", MEMCG_SOCK }, > + { "shmem", NR_SHMEM }, > + { "file_mapped", NR_FILE_MAPPED }, > + { "file_dirty", NR_FILE_DIRTY }, > + { "file_writeback", NR_WRITEBACK }, > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > - { "anon_thp", PAGE_SIZE, NR_ANON_THPS }, > - { "file_thp", PAGE_SIZE, NR_FILE_THPS }, > - { "shmem_thp", PAGE_SIZE, NR_SHMEM_THPS }, > + { "anon_thp", NR_ANON_THPS }, > + { "file_thp", NR_FILE_THPS }, > + { "shmem_thp", NR_SHMEM_THPS }, > #endif > - { "inactive_anon", PAGE_SIZE, NR_INACTIVE_ANON }, > - { "active_anon", PAGE_SIZE, NR_ACTIVE_ANON }, > - { "inactive_file", PAGE_SIZE, NR_INACTIVE_FILE }, > - { "active_file", PAGE_SIZE, NR_ACTIVE_FILE }, > - { "unevictable", PAGE_SIZE, NR_UNEVICTABLE }, > - > - /* > - * Note: The slab_reclaimable and slab_unreclaimable must be > - * together and slab_reclaimable must be in front. > - */ > - { "slab_reclaimable", 1, NR_SLAB_RECLAIMABLE_B }, > - { "slab_unreclaimable", 1, NR_SLAB_UNRECLAIMABLE_B }, > + { "inactive_anon", NR_INACTIVE_ANON }, > + { "active_anon", NR_ACTIVE_ANON }, > + { "inactive_file", NR_INACTIVE_FILE }, > + { "active_file", NR_ACTIVE_FILE }, > + { "unevictable", NR_UNEVICTABLE }, > + { "slab_reclaimable", NR_SLAB_RECLAIMABLE_B }, > + { "slab_unreclaimable", NR_SLAB_UNRECLAIMABLE_B }, > > /* The memory events */ > - { "workingset_refault_anon", 1, WORKINGSET_REFAULT_ANON }, > - { "workingset_refault_file", 1, WORKINGSET_REFAULT_FILE }, > - { "workingset_activate_anon", 1, WORKINGSET_ACTIVATE_ANON }, > - { "workingset_activate_file", 1, WORKINGSET_ACTIVATE_FILE }, > - { "workingset_restore_anon", 1, WORKINGSET_RESTORE_ANON }, > - { "workingset_restore_file", 1, WORKINGSET_RESTORE_FILE }, > - { "workingset_nodereclaim", 1, WORKINGSET_NODERECLAIM }, > + { "workingset_refault_anon", WORKINGSET_REFAULT_ANON }, > + { "workingset_refault_file", WORKINGSET_REFAULT_FILE }, > + { "workingset_activate_anon", WORKINGSET_ACTIVATE_ANON }, > + { "workingset_activate_file", WORKINGSET_ACTIVATE_FILE }, > + { "workingset_restore_anon", WORKINGSET_RESTORE_ANON }, > + { "workingset_restore_file", WORKINGSET_RESTORE_FILE }, > + { "workingset_nodereclaim", WORKINGSET_NODERECLAIM }, > }; > > +/* Translate stat items to the correct unit for memory.stat output */ > +static int memcg_page_state_unit(int item) > +{ > + int unit; > + > + switch (item) { > + case MEMCG_PERCPU_B: > + case NR_SLAB_RECLAIMABLE_B: > + case NR_SLAB_UNRECLAIMABLE_B: > + case WORKINGSET_REFAULT_ANON: > + case WORKINGSET_REFAULT_FILE: > + case WORKINGSET_ACTIVATE_ANON: > + case WORKINGSET_ACTIVATE_FILE: > + case WORKINGSET_RESTORE_ANON: > + case WORKINGSET_RESTORE_FILE: > + case WORKINGSET_NODERECLAIM: > + unit = 1; > + break; > + case NR_KERNEL_STACK_KB: > + unit = SZ_1K; > + break; > + default: > + unit = PAGE_SIZE; > + break; break not needed here, or maybe we can return for every case, that will avoid "unit" variable. > + } > + > + return unit; > +} > + > +static inline unsigned long memcg_page_state_output(struct mem_cgroup *memcg, > + int item) > +{ > + return memcg_page_state(memcg, item) * memcg_page_state_unit(item); > +} > + > static char *memory_stat_format(struct mem_cgroup *memcg) > { > struct seq_buf s; > @@ -1577,13 +1606,12 @@ static char *memory_stat_format(struct mem_cgroup *memcg) > for (i = 0; i < ARRAY_SIZE(memory_stats); i++) { > u64 size; > > - size = memcg_page_state(memcg, memory_stats[i].idx); > - size *= memory_stats[i].ratio; > + size = memcg_page_state_output(memcg, memory_stats[i].idx); > seq_buf_printf(&s, "%s %llu\n", memory_stats[i].name, size); > > if (unlikely(memory_stats[i].idx == NR_SLAB_UNRECLAIMABLE_B)) { > - size = memcg_page_state(memcg, NR_SLAB_RECLAIMABLE_B) + > - memcg_page_state(memcg, NR_SLAB_UNRECLAIMABLE_B); > + size += (memcg, > + NR_SLAB_RECLAIMABLE_B); > seq_buf_printf(&s, "slab %llu\n", size); > } > } > @@ -6377,6 +6405,12 @@ static int memory_stat_show(struct seq_file *m, void *v) > } > > #ifdef CONFIG_NUMA > +static inline unsigned long lruvec_page_state_output(struct lruvec *lruvec, > + int item) > +{ > + return lruvec_page_state(lruvec, item) * memcg_page_state_unit(item); > +} > + > static int memory_numa_stat_show(struct seq_file *m, void *v) > { > int i; > @@ -6394,8 +6428,8 @@ static int memory_numa_stat_show(struct seq_file *m, void *v) > struct lruvec *lruvec; > > lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(nid)); > - size = lruvec_page_state(lruvec, memory_stats[i].idx); > - size *= memory_stats[i].ratio; > + size = lruvec_page_state_output(lruvec, > + memory_stats[i].idx); > seq_printf(m, " N%d=%llu", nid, size); > } > seq_putc(m, '\n'); > -- > 2.11.0 > > 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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 A2242C433FE for ; Tue, 8 Dec 2020 07:21:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1757C23A6C for ; Tue, 8 Dec 2020 07:21:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1757C23A6C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 133FD6B005C; Tue, 8 Dec 2020 02:21:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E4416B005D; Tue, 8 Dec 2020 02:21:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9F506B0068; Tue, 8 Dec 2020 02:21:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0194.hostedemail.com [216.40.44.194]) by kanga.kvack.org (Postfix) with ESMTP id D17236B005C for ; Tue, 8 Dec 2020 02:21:01 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 9680C180AD81A for ; Tue, 8 Dec 2020 07:21:01 +0000 (UTC) X-FDA: 77569268322.27.road71_450503c273e5 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id 70C1E3D663 for ; Tue, 8 Dec 2020 07:21:01 +0000 (UTC) X-HE-Tag: road71_450503c273e5 X-Filterd-Recvd-Size: 11532 Received: from mail-il1-f194.google.com (mail-il1-f194.google.com [209.85.166.194]) by imf47.hostedemail.com (Postfix) with ESMTP for ; Tue, 8 Dec 2020 07:21:00 +0000 (UTC) Received: by mail-il1-f194.google.com with SMTP id j12so7512378ilk.3 for ; Mon, 07 Dec 2020 23:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=CEynT5dpSXW+WFAGgwzXAAa4Ed/5m+41lEEZZSPwK4c=; b=HnebRFXeVFtvbqpPwaXJMGQcaTR9t2QL1GKCBmv46xaED552sAZUqFw0lalCkqNT0x uuDmDnia24FJpuFScSUESEuEBB7JbxDSny3kjyfllrO21GqB59gRwsXly6ZKk+0Q3Qcc QNNawcYv7ZiJJNPt3OIo3JAQoXvAVL/i15MAR2PXkHcrwtIyvAQAXIx9UrjIMxfbAYix RjU0+K+gO8MSX18Wee1vhh3Z3I3923LscJTNV9NLOXypocFMxk4LHTPl2Rdu+z41dst7 RzS0QoO23nhUTVPUlwmVxe8dJG84Yvcgq+p10k5gHDqs439HQkzXdnO2QIzkCgAyDfLI pnew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=CEynT5dpSXW+WFAGgwzXAAa4Ed/5m+41lEEZZSPwK4c=; b=ni5/hoooOhO8uhFMKEWbhsX7WOauKgV6wxHP6ZZDxzss2MQAMebMHxByUEfjd4z4xw lOwWCJ32caMc6sJN78Xe8zW5AOQ4iF22AhFT9cCCGuy3LB5HkI83N/vtK3fC9CbtUWPh dzvfzeu/vnFNfKPEw30ah1ffJ1WjMslRI4XaSi/BlKBKEvt5cDIylgeM8T3bJ+MkFrYk ynGYSsKEa2ZJANSUjurE6mFMeYs+/gLGqkInrjCP2b39IKSkHqL5UKkHJj5UyAkg5kk1 DTabFI37t7tVrzyYXJtWH4nEH8hyUySLPHuzfFoKPxcTwMWF11nizfF7sGWEq6Do2JHm 1QuQ== X-Gm-Message-State: AOAM531B9vOl2NRg5clsKs+N0MmzNX0aeUQTbX/3g/vh1UEGxkKS7hi+ FaIWbt8eAeYVLrazeUcBoOD83yQyYPd3CRriaHw= X-Google-Smtp-Source: ABdhPJzRSK5wYtQzeksIhxQ+zO2r/uYBYNVZSoioPawq7N4IxFHABxMsiY86F3rKVt1Qygv9xwgIv7bOeXyhaPiH9FU= X-Received: by 2002:a92:a154:: with SMTP id v81mr25905298ili.85.1607412060284; Mon, 07 Dec 2020 23:21:00 -0800 (PST) MIME-Version: 1.0 References: <20201208041847.72122-1-songmuchun@bytedance.com> <20201208041847.72122-8-songmuchun@bytedance.com> In-Reply-To: <20201208041847.72122-8-songmuchun@bytedance.com> From: Pankaj Gupta Date: Tue, 8 Dec 2020 08:20:49 +0100 Message-ID: Subject: Re: [PATCH v3 7/7] mm: memcontrol: make the slab calculation consistent To: Muchun Song Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , adobriyan@gmail.com, Andrew Morton , Johannes Weiner , Michal Hocko , vdavydov.dev@gmail.com, Hugh Dickins , shakeelb@google.com, guro@fb.com, samitolvanen@google.com, feng.tang@intel.com, neilb@suse.de, Joonsoo Kim , Randy Dunlap , LKML , linux-fsdevel@vger.kernel.org, Linux MM , cgroups@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: > Although the ratio of the slab is one, we also should read the ratio > from the related memory_stats instead of hard-coding. And the local > variable of size is already the value of slab_unreclaimable. So we > do not need to read again. > > We can drop the ratio in struct memory_stat. This can make the code > clean and simple. And get rid of the awkward mix of static and runtime > initialization of the memory_stats table. > > Signed-off-by: Muchun Song > --- > mm/memcontrol.c | 112 ++++++++++++++++++++++++++++++++++++-------------------- > 1 file changed, 73 insertions(+), 39 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index a40797a27f87..841ea37cc123 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1511,49 +1511,78 @@ static bool mem_cgroup_wait_acct_move(struct mem_cgroup *memcg) > > struct memory_stat { > const char *name; > - unsigned int ratio; > unsigned int idx; > }; > > static const struct memory_stat memory_stats[] = { > - { "anon", PAGE_SIZE, NR_ANON_MAPPED }, > - { "file", PAGE_SIZE, NR_FILE_PAGES }, > - { "kernel_stack", 1024, NR_KERNEL_STACK_KB }, > - { "pagetables", PAGE_SIZE, NR_PAGETABLE }, > - { "percpu", 1, MEMCG_PERCPU_B }, > - { "sock", PAGE_SIZE, MEMCG_SOCK }, > - { "shmem", PAGE_SIZE, NR_SHMEM }, > - { "file_mapped", PAGE_SIZE, NR_FILE_MAPPED }, > - { "file_dirty", PAGE_SIZE, NR_FILE_DIRTY }, > - { "file_writeback", PAGE_SIZE, NR_WRITEBACK }, > + { "anon", NR_ANON_MAPPED }, > + { "file", NR_FILE_PAGES }, > + { "kernel_stack", NR_KERNEL_STACK_KB }, > + { "pagetables", NR_PAGETABLE }, > + { "percpu", MEMCG_PERCPU_B }, > + { "sock", MEMCG_SOCK }, > + { "shmem", NR_SHMEM }, > + { "file_mapped", NR_FILE_MAPPED }, > + { "file_dirty", NR_FILE_DIRTY }, > + { "file_writeback", NR_WRITEBACK }, > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > - { "anon_thp", PAGE_SIZE, NR_ANON_THPS }, > - { "file_thp", PAGE_SIZE, NR_FILE_THPS }, > - { "shmem_thp", PAGE_SIZE, NR_SHMEM_THPS }, > + { "anon_thp", NR_ANON_THPS }, > + { "file_thp", NR_FILE_THPS }, > + { "shmem_thp", NR_SHMEM_THPS }, > #endif > - { "inactive_anon", PAGE_SIZE, NR_INACTIVE_ANON }, > - { "active_anon", PAGE_SIZE, NR_ACTIVE_ANON }, > - { "inactive_file", PAGE_SIZE, NR_INACTIVE_FILE }, > - { "active_file", PAGE_SIZE, NR_ACTIVE_FILE }, > - { "unevictable", PAGE_SIZE, NR_UNEVICTABLE }, > - > - /* > - * Note: The slab_reclaimable and slab_unreclaimable must be > - * together and slab_reclaimable must be in front. > - */ > - { "slab_reclaimable", 1, NR_SLAB_RECLAIMABLE_B }, > - { "slab_unreclaimable", 1, NR_SLAB_UNRECLAIMABLE_B }, > + { "inactive_anon", NR_INACTIVE_ANON }, > + { "active_anon", NR_ACTIVE_ANON }, > + { "inactive_file", NR_INACTIVE_FILE }, > + { "active_file", NR_ACTIVE_FILE }, > + { "unevictable", NR_UNEVICTABLE }, > + { "slab_reclaimable", NR_SLAB_RECLAIMABLE_B }, > + { "slab_unreclaimable", NR_SLAB_UNRECLAIMABLE_B }, > > /* The memory events */ > - { "workingset_refault_anon", 1, WORKINGSET_REFAULT_ANON }, > - { "workingset_refault_file", 1, WORKINGSET_REFAULT_FILE }, > - { "workingset_activate_anon", 1, WORKINGSET_ACTIVATE_ANON }, > - { "workingset_activate_file", 1, WORKINGSET_ACTIVATE_FILE }, > - { "workingset_restore_anon", 1, WORKINGSET_RESTORE_ANON }, > - { "workingset_restore_file", 1, WORKINGSET_RESTORE_FILE }, > - { "workingset_nodereclaim", 1, WORKINGSET_NODERECLAIM }, > + { "workingset_refault_anon", WORKINGSET_REFAULT_ANON }, > + { "workingset_refault_file", WORKINGSET_REFAULT_FILE }, > + { "workingset_activate_anon", WORKINGSET_ACTIVATE_ANON }, > + { "workingset_activate_file", WORKINGSET_ACTIVATE_FILE }, > + { "workingset_restore_anon", WORKINGSET_RESTORE_ANON }, > + { "workingset_restore_file", WORKINGSET_RESTORE_FILE }, > + { "workingset_nodereclaim", WORKINGSET_NODERECLAIM }, > }; > > +/* Translate stat items to the correct unit for memory.stat output */ > +static int memcg_page_state_unit(int item) > +{ > + int unit; > + > + switch (item) { > + case MEMCG_PERCPU_B: > + case NR_SLAB_RECLAIMABLE_B: > + case NR_SLAB_UNRECLAIMABLE_B: > + case WORKINGSET_REFAULT_ANON: > + case WORKINGSET_REFAULT_FILE: > + case WORKINGSET_ACTIVATE_ANON: > + case WORKINGSET_ACTIVATE_FILE: > + case WORKINGSET_RESTORE_ANON: > + case WORKINGSET_RESTORE_FILE: > + case WORKINGSET_NODERECLAIM: > + unit = 1; > + break; > + case NR_KERNEL_STACK_KB: > + unit = SZ_1K; > + break; > + default: > + unit = PAGE_SIZE; > + break; break not needed here, or maybe we can return for every case, that will avoid "unit" variable. > + } > + > + return unit; > +} > + > +static inline unsigned long memcg_page_state_output(struct mem_cgroup *memcg, > + int item) > +{ > + return memcg_page_state(memcg, item) * memcg_page_state_unit(item); > +} > + > static char *memory_stat_format(struct mem_cgroup *memcg) > { > struct seq_buf s; > @@ -1577,13 +1606,12 @@ static char *memory_stat_format(struct mem_cgroup *memcg) > for (i = 0; i < ARRAY_SIZE(memory_stats); i++) { > u64 size; > > - size = memcg_page_state(memcg, memory_stats[i].idx); > - size *= memory_stats[i].ratio; > + size = memcg_page_state_output(memcg, memory_stats[i].idx); > seq_buf_printf(&s, "%s %llu\n", memory_stats[i].name, size); > > if (unlikely(memory_stats[i].idx == NR_SLAB_UNRECLAIMABLE_B)) { > - size = memcg_page_state(memcg, NR_SLAB_RECLAIMABLE_B) + > - memcg_page_state(memcg, NR_SLAB_UNRECLAIMABLE_B); > + size += (memcg, > + NR_SLAB_RECLAIMABLE_B); > seq_buf_printf(&s, "slab %llu\n", size); > } > } > @@ -6377,6 +6405,12 @@ static int memory_stat_show(struct seq_file *m, void *v) > } > > #ifdef CONFIG_NUMA > +static inline unsigned long lruvec_page_state_output(struct lruvec *lruvec, > + int item) > +{ > + return lruvec_page_state(lruvec, item) * memcg_page_state_unit(item); > +} > + > static int memory_numa_stat_show(struct seq_file *m, void *v) > { > int i; > @@ -6394,8 +6428,8 @@ static int memory_numa_stat_show(struct seq_file *m, void *v) > struct lruvec *lruvec; > > lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(nid)); > - size = lruvec_page_state(lruvec, memory_stats[i].idx); > - size *= memory_stats[i].ratio; > + size = lruvec_page_state_output(lruvec, > + memory_stats[i].idx); > seq_printf(m, " N%d=%llu", nid, size); > } > seq_putc(m, '\n'); > -- > 2.11.0 > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pankaj Gupta Subject: Re: [PATCH v3 7/7] mm: memcontrol: make the slab calculation consistent Date: Tue, 8 Dec 2020 08:20:49 +0100 Message-ID: References: <20201208041847.72122-1-songmuchun@bytedance.com> <20201208041847.72122-8-songmuchun@bytedance.com> Mime-Version: 1.0 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=CEynT5dpSXW+WFAGgwzXAAa4Ed/5m+41lEEZZSPwK4c=; b=HnebRFXeVFtvbqpPwaXJMGQcaTR9t2QL1GKCBmv46xaED552sAZUqFw0lalCkqNT0x uuDmDnia24FJpuFScSUESEuEBB7JbxDSny3kjyfllrO21GqB59gRwsXly6ZKk+0Q3Qcc QNNawcYv7ZiJJNPt3OIo3JAQoXvAVL/i15MAR2PXkHcrwtIyvAQAXIx9UrjIMxfbAYix RjU0+K+gO8MSX18Wee1vhh3Z3I3923LscJTNV9NLOXypocFMxk4LHTPl2Rdu+z41dst7 RzS0QoO23nhUTVPUlwmVxe8dJG84Yvcgq+p10k5gHDqs439HQkzXdnO2QIzkCgAyDfLI pnew== In-Reply-To: <20201208041847.72122-8-songmuchun-EC8Uxl6Npydl57MIdRCFDg@public.gmane.org> List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Muchun Song Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Andrew Morton , Johannes Weiner , Michal Hocko , vdavydov.dev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Hugh Dickins , shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, guro-b10kYP2dOMg@public.gmane.org, samitolvanen-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, feng.tang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, neilb-l3A5Bk7waGM@public.gmane.org, Joonsoo Kim , Randy Dunlap , LKML , linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Linux MM , cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Although the ratio of the slab is one, we also should read the ratio > from the related memory_stats instead of hard-coding. And the local > variable of size is already the value of slab_unreclaimable. So we > do not need to read again. > > We can drop the ratio in struct memory_stat. This can make the code > clean and simple. And get rid of the awkward mix of static and runtime > initialization of the memory_stats table. > > Signed-off-by: Muchun Song > --- > mm/memcontrol.c | 112 ++++++++++++++++++++++++++++++++++++-------------------- > 1 file changed, 73 insertions(+), 39 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index a40797a27f87..841ea37cc123 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1511,49 +1511,78 @@ static bool mem_cgroup_wait_acct_move(struct mem_cgroup *memcg) > > struct memory_stat { > const char *name; > - unsigned int ratio; > unsigned int idx; > }; > > static const struct memory_stat memory_stats[] = { > - { "anon", PAGE_SIZE, NR_ANON_MAPPED }, > - { "file", PAGE_SIZE, NR_FILE_PAGES }, > - { "kernel_stack", 1024, NR_KERNEL_STACK_KB }, > - { "pagetables", PAGE_SIZE, NR_PAGETABLE }, > - { "percpu", 1, MEMCG_PERCPU_B }, > - { "sock", PAGE_SIZE, MEMCG_SOCK }, > - { "shmem", PAGE_SIZE, NR_SHMEM }, > - { "file_mapped", PAGE_SIZE, NR_FILE_MAPPED }, > - { "file_dirty", PAGE_SIZE, NR_FILE_DIRTY }, > - { "file_writeback", PAGE_SIZE, NR_WRITEBACK }, > + { "anon", NR_ANON_MAPPED }, > + { "file", NR_FILE_PAGES }, > + { "kernel_stack", NR_KERNEL_STACK_KB }, > + { "pagetables", NR_PAGETABLE }, > + { "percpu", MEMCG_PERCPU_B }, > + { "sock", MEMCG_SOCK }, > + { "shmem", NR_SHMEM }, > + { "file_mapped", NR_FILE_MAPPED }, > + { "file_dirty", NR_FILE_DIRTY }, > + { "file_writeback", NR_WRITEBACK }, > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > - { "anon_thp", PAGE_SIZE, NR_ANON_THPS }, > - { "file_thp", PAGE_SIZE, NR_FILE_THPS }, > - { "shmem_thp", PAGE_SIZE, NR_SHMEM_THPS }, > + { "anon_thp", NR_ANON_THPS }, > + { "file_thp", NR_FILE_THPS }, > + { "shmem_thp", NR_SHMEM_THPS }, > #endif > - { "inactive_anon", PAGE_SIZE, NR_INACTIVE_ANON }, > - { "active_anon", PAGE_SIZE, NR_ACTIVE_ANON }, > - { "inactive_file", PAGE_SIZE, NR_INACTIVE_FILE }, > - { "active_file", PAGE_SIZE, NR_ACTIVE_FILE }, > - { "unevictable", PAGE_SIZE, NR_UNEVICTABLE }, > - > - /* > - * Note: The slab_reclaimable and slab_unreclaimable must be > - * together and slab_reclaimable must be in front. > - */ > - { "slab_reclaimable", 1, NR_SLAB_RECLAIMABLE_B }, > - { "slab_unreclaimable", 1, NR_SLAB_UNRECLAIMABLE_B }, > + { "inactive_anon", NR_INACTIVE_ANON }, > + { "active_anon", NR_ACTIVE_ANON }, > + { "inactive_file", NR_INACTIVE_FILE }, > + { "active_file", NR_ACTIVE_FILE }, > + { "unevictable", NR_UNEVICTABLE }, > + { "slab_reclaimable", NR_SLAB_RECLAIMABLE_B }, > + { "slab_unreclaimable", NR_SLAB_UNRECLAIMABLE_B }, > > /* The memory events */ > - { "workingset_refault_anon", 1, WORKINGSET_REFAULT_ANON }, > - { "workingset_refault_file", 1, WORKINGSET_REFAULT_FILE }, > - { "workingset_activate_anon", 1, WORKINGSET_ACTIVATE_ANON }, > - { "workingset_activate_file", 1, WORKINGSET_ACTIVATE_FILE }, > - { "workingset_restore_anon", 1, WORKINGSET_RESTORE_ANON }, > - { "workingset_restore_file", 1, WORKINGSET_RESTORE_FILE }, > - { "workingset_nodereclaim", 1, WORKINGSET_NODERECLAIM }, > + { "workingset_refault_anon", WORKINGSET_REFAULT_ANON }, > + { "workingset_refault_file", WORKINGSET_REFAULT_FILE }, > + { "workingset_activate_anon", WORKINGSET_ACTIVATE_ANON }, > + { "workingset_activate_file", WORKINGSET_ACTIVATE_FILE }, > + { "workingset_restore_anon", WORKINGSET_RESTORE_ANON }, > + { "workingset_restore_file", WORKINGSET_RESTORE_FILE }, > + { "workingset_nodereclaim", WORKINGSET_NODERECLAIM }, > }; > > +/* Translate stat items to the correct unit for memory.stat output */ > +static int memcg_page_state_unit(int item) > +{ > + int unit; > + > + switch (item) { > + case MEMCG_PERCPU_B: > + case NR_SLAB_RECLAIMABLE_B: > + case NR_SLAB_UNRECLAIMABLE_B: > + case WORKINGSET_REFAULT_ANON: > + case WORKINGSET_REFAULT_FILE: > + case WORKINGSET_ACTIVATE_ANON: > + case WORKINGSET_ACTIVATE_FILE: > + case WORKINGSET_RESTORE_ANON: > + case WORKINGSET_RESTORE_FILE: > + case WORKINGSET_NODERECLAIM: > + unit = 1; > + break; > + case NR_KERNEL_STACK_KB: > + unit = SZ_1K; > + break; > + default: > + unit = PAGE_SIZE; > + break; break not needed here, or maybe we can return for every case, that will avoid "unit" variable. > + } > + > + return unit; > +} > + > +static inline unsigned long memcg_page_state_output(struct mem_cgroup *memcg, > + int item) > +{ > + return memcg_page_state(memcg, item) * memcg_page_state_unit(item); > +} > + > static char *memory_stat_format(struct mem_cgroup *memcg) > { > struct seq_buf s; > @@ -1577,13 +1606,12 @@ static char *memory_stat_format(struct mem_cgroup *memcg) > for (i = 0; i < ARRAY_SIZE(memory_stats); i++) { > u64 size; > > - size = memcg_page_state(memcg, memory_stats[i].idx); > - size *= memory_stats[i].ratio; > + size = memcg_page_state_output(memcg, memory_stats[i].idx); > seq_buf_printf(&s, "%s %llu\n", memory_stats[i].name, size); > > if (unlikely(memory_stats[i].idx == NR_SLAB_UNRECLAIMABLE_B)) { > - size = memcg_page_state(memcg, NR_SLAB_RECLAIMABLE_B) + > - memcg_page_state(memcg, NR_SLAB_UNRECLAIMABLE_B); > + size += (memcg, > + NR_SLAB_RECLAIMABLE_B); > seq_buf_printf(&s, "slab %llu\n", size); > } > } > @@ -6377,6 +6405,12 @@ static int memory_stat_show(struct seq_file *m, void *v) > } > > #ifdef CONFIG_NUMA > +static inline unsigned long lruvec_page_state_output(struct lruvec *lruvec, > + int item) > +{ > + return lruvec_page_state(lruvec, item) * memcg_page_state_unit(item); > +} > + > static int memory_numa_stat_show(struct seq_file *m, void *v) > { > int i; > @@ -6394,8 +6428,8 @@ static int memory_numa_stat_show(struct seq_file *m, void *v) > struct lruvec *lruvec; > > lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(nid)); > - size = lruvec_page_state(lruvec, memory_stats[i].idx); > - size *= memory_stats[i].ratio; > + size = lruvec_page_state_output(lruvec, > + memory_stats[i].idx); > seq_printf(m, " N%d=%llu", nid, size); > } > seq_putc(m, '\n'); > -- > 2.11.0 > >