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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 2604AC4361B for ; Sun, 6 Dec 2020 10:18:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B85D422D2C for ; Sun, 6 Dec 2020 10:18:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B85D422D2C 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 60E038D0005; Sun, 6 Dec 2020 05:18:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5BD126B0074; Sun, 6 Dec 2020 05:18:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D32E8D0005; Sun, 6 Dec 2020 05:18:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0059.hostedemail.com [216.40.44.59]) by kanga.kvack.org (Postfix) with ESMTP id 373536B0073 for ; Sun, 6 Dec 2020 05:18:33 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id ED196362D for ; Sun, 6 Dec 2020 10:18:32 +0000 (UTC) X-FDA: 77562458064.29.rat31_560f7cf273d4 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id CD74F180868E2 for ; Sun, 6 Dec 2020 10:18:32 +0000 (UTC) X-HE-Tag: rat31_560f7cf273d4 X-Filterd-Recvd-Size: 9659 Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by imf47.hostedemail.com (Postfix) with ESMTP for ; Sun, 6 Dec 2020 10:18:32 +0000 (UTC) Received: by mail-pj1-f68.google.com with SMTP id iq13so5664183pjb.3 for ; Sun, 06 Dec 2020 02:18:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KwRaMRI+Sr6xQo3P1J4+HoZOIYaqIcm7QaRM3zeaHfM=; b=f/VNxHgtOj2/ijqqrMgBgEUMKgTq1TDJOBO6yN20rM9HpH8TxNGjJYzwKTkp3RG5sD USGASwcjMY+URzaWD2oF4Pv1KZGFh4zftUJ6WMVXbHKNpARcJxdsDopTTjMW+4Bx1CMk f2c5UACjKkSxlREuzyENkckmbtZVOQTFTlnlEPmMSdM0RyQlwfpdOGuZmJ9MMihGnp35 vxeZEdaUuGsIF96EnguTyhCMMADUD3KzIYz3IyE0jVXLFmkeoxxKPbhM1wOXunzhe9Jw 9p3eJ/ZZXPy00wlkw4joCyNiL5Fs2TV2Gpkjx954WMxsVeup4myYhUKVdDRCrwp027Q2 Ndsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KwRaMRI+Sr6xQo3P1J4+HoZOIYaqIcm7QaRM3zeaHfM=; b=IUkfOA9kH0qSrLttbkD4yN7N97Gg7QvpznDvRTvDVt9tmEwsQvKYzbD4RdWbka2BXR AT9V68eONPVZMt3p0zgZFubhJ/JDxDWhUSNvcVP5o+CUx8KWF5UBWR/wmG9VZSuyIYBP 6TvUXdsXRLDetYqBaZZsdrGOh5zyuwnJeZn9MPw1WPgHFE0V10IOip9CVWxspIO10whA jEcV37zTmlQA2ljirGFb2hM1JhxSUMSVcGqz0MV5/qSbJrHcLCMVVV7w4T1Vpa4Wgo9S GbG3HtWHp8vGFgFqvO6qDl2ZL8Hha6sT7KgUAEUTPTb5aZXwLbKExEITlCloBxR0lih6 QbrA== X-Gm-Message-State: AOAM533+EdcOpadsl6u6sFAcHh0yl1iXrU6VeqD5TnvW+gASD/+Fz65v gxWCSWFOAzbq5p+V6fT1B0Wumg== X-Google-Smtp-Source: ABdhPJxLE9y1Wu89jVTjYxdBJC2dpD5Vw0WGeqkY8mH2oUPiW1ZCgwzB4TvQGoJ/pALX8b1qIIx9ng== X-Received: by 2002:a17:90a:bf88:: with SMTP id d8mr12070599pjs.102.1607249911546; Sun, 06 Dec 2020 02:18:31 -0800 (PST) Received: from localhost.localdomain ([103.136.221.70]) by smtp.gmail.com with ESMTPSA id g16sm10337657pfb.201.2020.12.06.02.18.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Dec 2020 02:18:30 -0800 (PST) From: Muchun Song To: gregkh@linuxfoundation.org, rafael@kernel.org, adobriyan@gmail.com, akpm@linux-foundation.org, hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, hughd@google.com, will@kernel.org, guro@fb.com, rppt@kernel.org, tglx@linutronix.de, esyr@redhat.com, peterx@redhat.com, krisman@collabora.com, surenb@google.com, avagin@openvz.org, elver@google.com, rdunlap@infradead.org, iamjoonsoo.kim@lge.com Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, Muchun Song Subject: [RESEND PATCH v2 11/12] mm: memcontrol: make the slab calculation consistent Date: Sun, 6 Dec 2020 18:14:50 +0800 Message-Id: <20201206101451.14706-12-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20201206101451.14706-1-songmuchun@bytedance.com> References: <20201206101451.14706-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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. The unit of the vmstat counters are either pages or bytes now. So 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 | 108 ++++++++++++++++++++++++++++++++++++--------------= ------ 1 file changed, 70 insertions(+), 38 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 48d70c1ad301..49fbcf003bf5 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1493,48 +1493,71 @@ static bool mem_cgroup_wait_acct_move(struct mem_= cgroup *memcg) =20 struct memory_stat { const char *name; - unsigned int ratio; unsigned int idx; }; =20 static const struct memory_stat memory_stats[] =3D { - { "anon", PAGE_SIZE, NR_ANON_MAPPED }, - { "file", PAGE_SIZE, NR_FILE_PAGES }, - { "kernel_stack", 1, NR_KERNEL_STACK_B }, - { "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_B }, + { "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 }, =20 /* 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 }, }; =20 +/* Translate stat items to the correct unit for memory.stat output */ +static int memcg_page_state_unit(int item) +{ + int unit; + + switch (item) { + 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 =3D 1; + break; + default: + unit =3D memcg_stat_item_in_bytes(item) ? 1 : PAGE_SIZE; + break; + } + + return unit; +} + +static inline unsigned long memcg_page_state_output(struct mem_cgroup *m= emcg, + 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; @@ -1558,13 +1581,16 @@ static char *memory_stat_format(struct mem_cgroup= *memcg) for (i =3D 0; i < ARRAY_SIZE(memory_stats); i++) { u64 size; =20 - size =3D memcg_page_state(memcg, memory_stats[i].idx); - size *=3D memory_stats[i].ratio; + size =3D memcg_page_state_output(memcg, memory_stats[i].idx); seq_buf_printf(&s, "%s %llu\n", memory_stats[i].name, size); =20 + /* + * We are printing reclaimable, unreclaimable of the slab + * and the sum of both. + */ if (unlikely(memory_stats[i].idx =3D=3D NR_SLAB_UNRECLAIMABLE_B)) { - size =3D memcg_page_state(memcg, NR_SLAB_RECLAIMABLE_B) + - memcg_page_state(memcg, NR_SLAB_UNRECLAIMABLE_B); + size +=3D memcg_page_state_output(memcg, + NR_SLAB_RECLAIMABLE_B); seq_buf_printf(&s, "slab %llu\n", size); } } @@ -6358,6 +6384,12 @@ static int memory_stat_show(struct seq_file *m, vo= id *v) } =20 #ifdef CONFIG_NUMA +static inline unsigned long lruvec_page_state_output(struct lruvec *lruv= ec, + 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; @@ -6375,8 +6407,8 @@ static int memory_numa_stat_show(struct seq_file *m= , void *v) struct lruvec *lruvec; =20 lruvec =3D mem_cgroup_lruvec(memcg, NODE_DATA(nid)); - size =3D lruvec_page_state(lruvec, memory_stats[i].idx); - size *=3D memory_stats[i].ratio; + size =3D lruvec_page_state_output(lruvec, + memory_stats[i].idx); seq_printf(m, " N%d=3D%llu", nid, size); } seq_putc(m, '\n'); --=20 2.11.0