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=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 E9718C4361B for ; Tue, 15 Dec 2020 16:22:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 07B83224F4 for ; Tue, 15 Dec 2020 16:22:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 07B83224F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1D9376B006E; Tue, 15 Dec 2020 11:22:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 187E36B0070; Tue, 15 Dec 2020 11:22:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 09E896B0071; Tue, 15 Dec 2020 11:22:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0102.hostedemail.com [216.40.44.102]) by kanga.kvack.org (Postfix) with ESMTP id E8C256B006E for ; Tue, 15 Dec 2020 11:22:33 -0500 (EST) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A78DC3621 for ; Tue, 15 Dec 2020 16:22:33 +0000 (UTC) X-FDA: 77596034586.18.brake40_311258c27424 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 6C041100EDBF1 for ; Tue, 15 Dec 2020 16:22:33 +0000 (UTC) X-HE-Tag: brake40_311258c27424 X-Filterd-Recvd-Size: 12166 Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Dec 2020 16:22:32 +0000 (UTC) Received: by mail-pj1-f68.google.com with SMTP id z12so1500200pjn.1 for ; Tue, 15 Dec 2020 08:22:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=f5QvG4OOL0cJhtayslfEReuxe1hABNcPROjOSRNmBuI=; b=nloh81hpbnZSVba1fttlkxzdrO6cQlBsaPfDAI0HHxU/CR1wmmhNamX8K4HPxB+vmj rwXBB8FwGX7Tbr4lXc8Kl8sN5FuqQr0HRsN4jQMTwuf1kJaSvqec+JJiuX9MydVxFm+H UC+k63BAGiCvRWYn0+H1XLnPB6jC0hgGUsKeOYqXYGj29kKdtuLVakEFSDYb9L9kqoQF PvtQL7gO6ZMJfWNhOlPbiVbSQTPQgXR5pe1mvYRNKvVZZweRQ5s1vLxkD8bFwjtGOxqf B+PlpQPyhVrRKNB9zsfVPa+0BQMc6lqtfRnr+vWiHSJPOhN4T1qI7sCV/gBPm9Fm6SdF /acg== 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=f5QvG4OOL0cJhtayslfEReuxe1hABNcPROjOSRNmBuI=; b=t/UVbKQrfTT/cQTzYUiRW+Ov70VrpxNRhVyCvsnMmJvGUkSIbZLjyghxjY20wAmSnL GoOGbEFLGhQutplKMQ14XK4IgQppn9USQf5oMgTOQxxMxmGJmIc7WzmB54muNSSJUtSA hLqHtNBrrRH1GpZanVl2IezHHPEKs+kzA5/FfzEyBIdInEBUJJLTcYnKDUEbiqxZPNVq /KRiRwZWVNeHYXFPtBQ7kYSHpLidMy8haG4AY3uhcdyr4rAzLBPPNHR6FntqEiiKmUxI KePhXPcI7F4+7fzpLHUJifV/O50daHBii5ywvYptMaYaecJncBjYNTWVS5PGt8vPPI9t 19Xg== X-Gm-Message-State: AOAM530Dnd206NmMyPhH2fL3ZVprDbSk5SJXpfHl6RSfvdv8nd+u36Jn FUahwEBLRGNxWDebA/3BWbMYaJZEfLlwwfvVfnW8RQ== X-Google-Smtp-Source: ABdhPJyIrx/IE5RWR7SkCD54ofonJkbSvYJd95V7JIgSwo8MKHtQFLVJ93vts2lMRQ581lzolmCtiisNKVeRZffaeGw= X-Received: by 2002:a17:902:ed0d:b029:da:c83b:5f40 with SMTP id b13-20020a170902ed0db02900dac83b5f40mr1801861pld.20.1608049351326; Tue, 15 Dec 2020 08:22:31 -0800 (PST) MIME-Version: 1.0 References: <20201208041847.72122-1-songmuchun@bytedance.com> <20201208041847.72122-8-songmuchun@bytedance.com> <20201215133514.GP32193@dhcp22.suse.cz> In-Reply-To: <20201215133514.GP32193@dhcp22.suse.cz> From: Muchun Song Date: Wed, 16 Dec 2020 00:21:55 +0800 Message-ID: Subject: Re: [External] Re: [PATCH v3 7/7] mm: memcontrol: make the slab calculation consistent To: Michal Hocko Cc: Greg KH , "Rafael J. Wysocki" , Alexey Dobriyan , Andrew Morton , Johannes Weiner , Vladimir Davydov , Hugh Dickins , Shakeel Butt , Roman Gushchin , Sami Tolvanen , Feng Tang , Neil Brown , Joonsoo Kim , Randy Dunlap , LKML , linux-fsdevel , Linux Memory Management List , Cgroups 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: On Tue, Dec 15, 2020 at 9:35 PM Michal Hocko wrote: > > On Tue 08-12-20 12:18:47, Muchun Song wrote: > > 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. > > This changelog doesn't explain, what is the problem, why do we care and > why the additional code is worthwile. Thank you. Will update the commit log for more clear. > > > 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; > > + } > > + > > + 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_page_state_output(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 > > -- > Michal Hocko > SUSE Labs -- Yours, Muchun