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.5 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,URIBL_BLOCKED,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 BC862C64E7C for ; Wed, 2 Dec 2020 12:16:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0689622203 for ; Wed, 2 Dec 2020 12:16:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0689622203 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 22CE26B0068; Wed, 2 Dec 2020 07:16:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1DC3B8D0003; Wed, 2 Dec 2020 07:16:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0F3BD8D0002; Wed, 2 Dec 2020 07:16:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0124.hostedemail.com [216.40.44.124]) by kanga.kvack.org (Postfix) with ESMTP id EDDF26B0068 for ; Wed, 2 Dec 2020 07:16:37 -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 B6268180AD811 for ; Wed, 2 Dec 2020 12:16:37 +0000 (UTC) X-FDA: 77548240434.27.vein69_4f00c16273b3 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id 98B363D668 for ; Wed, 2 Dec 2020 12:16:37 +0000 (UTC) X-HE-Tag: vein69_4f00c16273b3 X-Filterd-Recvd-Size: 4775 Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Wed, 2 Dec 2020 12:16:36 +0000 (UTC) Received: by mail-pj1-f67.google.com with SMTP id p21so542896pjv.0 for ; Wed, 02 Dec 2020 04:16:36 -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:mime-version :content-transfer-encoding; bh=0D0YvfFeRVroyy8DOM8jNI9C4k7vyQ+vFDUfvEXQRIw=; b=pZfhUnAfhJIC6/Dv5lxitZ9cKXI7bpi1N7AHDZuXk5iD1odIfF+g8ifMX49reRjF99 yLEwUP6xyJa0nYkrqHO91vMYQ0XAv/FNqFSpBKoRgkUEIaxAezWlS9w7l1dzjubGclHz ThKFQZj7svmOUlI0TdwlQFxJqtLyJL8U5k8/hNqr/2y9OXXb/sFzwZi/Q8k5LSWxGNqG qLYgioFTLRmCw5DxE2volAw4/zrCDm+38iAqBgx7OE56INmP/Ga0CGzxUAxMMxQl5750 sA7qPKmbiVH9tN0Hi/Oa6rm0yp0xRwGe3VrMmaVeLVrF2NOS+g5K8NvQLuwSa7TZc4TS d/uA== 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:mime-version :content-transfer-encoding; bh=0D0YvfFeRVroyy8DOM8jNI9C4k7vyQ+vFDUfvEXQRIw=; b=chcplYGsePRaUZv+oPnP81UemnjMkROjCS7J2ScMLMWxWEHuPyZLtftuyTJsLd3dvP 6N+0Frw3UWeWXbNdNMGA79fQZfCf8xqo1jZHxbUPca0osk1aZ4/nL6s+7v3KvuOnHW1i lJR9MfQmsQTEMGmBNk7Xzkcs2DRhVDvExpqYIF1UQJPj11PXssRYR+Fg6yKUUKDxffNU dSMbYzjoYvNMi3fC3mntdcgXSUu/7/0+xaLX6Jrgv2W5x0crrOtPsi6a/pb+6+VgGNdp QjYv+Won0Z9ruO+ePDhqcKvEdwSXCFTp6yjsHvogrlFR3V6gwiDN4j9VyD92G+g8c0qZ 15og== X-Gm-Message-State: AOAM530liyxsrEGTsyk9tNnfkwoKJiAp+4WjilGTBXPUV6pD3ge5z7mw B/Ixc9hVXbZ0/7Mnqu8175J+1w== X-Google-Smtp-Source: ABdhPJwEcQ4LPF+w2bx+8qB8eyH1ySMsXXOgJG55j8ylaLQmmrGHP7+W2ehYLVoe0ItPybgrsHJf3g== X-Received: by 2002:a17:902:bc81:b029:d8:ef30:b518 with SMTP id bb1-20020a170902bc81b02900d8ef30b518mr2274981plb.81.1606911395581; Wed, 02 Dec 2020 04:16:35 -0800 (PST) Received: from localhost.localdomain ([103.136.221.70]) by smtp.gmail.com with ESMTPSA id 77sm2348479pfv.16.2020.12.02.04.16.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Dec 2020 04:16:35 -0800 (PST) From: Muchun Song To: hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, akpm@linux-foundation.org Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song Subject: [PATCH] mm/memcontrol: make the slab calculation consistent Date: Wed, 2 Dec 2020 20:14:34 +0800 Message-Id: <20201202121434.75099-1-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) 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. Simplify the code here. Signed-off-by: Muchun Song --- mm/memcontrol.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 9922f1510956..03a9c64560f6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1545,12 +1545,22 @@ static int __init memory_stats_init(void) int i; =20 for (i =3D 0; i < ARRAY_SIZE(memory_stats); i++) { + switch (memory_stats[i].idx) { #ifdef CONFIG_TRANSPARENT_HUGEPAGE - if (memory_stats[i].idx =3D=3D NR_ANON_THPS || - memory_stats[i].idx =3D=3D NR_FILE_THPS || - memory_stats[i].idx =3D=3D NR_SHMEM_THPS) + case NR_ANON_THPS: + case NR_FILE_THPS: + case NR_SHMEM_THPS: memory_stats[i].ratio =3D HPAGE_PMD_SIZE; + break; #endif + case NR_SLAB_UNRECLAIMABLE_B: + VM_BUG_ON(i < 1); + VM_BUG_ON(memory_stats[i - 1].idx !=3D NR_SLAB_RECLAIMABLE_B); + break; + default: + break; + } + VM_BUG_ON(!memory_stats[i].ratio); VM_BUG_ON(memory_stats[i].idx >=3D MEMCG_NR_STAT); } @@ -1587,8 +1597,10 @@ static char *memory_stat_format(struct mem_cgroup = *memcg) seq_buf_printf(&s, "%s %llu\n", memory_stats[i].name, size); =20 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); + int idx =3D i - 1; + + size +=3D memcg_page_state(memcg, memory_stats[idx].idx) * + memory_stats[idx].ratio; seq_buf_printf(&s, "slab %llu\n", size); } } --=20 2.11.0