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 4E36AC4361B for ; Tue, 15 Dec 2020 13:38:10 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9930E224B8 for ; Tue, 15 Dec 2020 13:38:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9930E224B8 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 BD30E6B0036; Tue, 15 Dec 2020 08:38:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BA8946B005D; Tue, 15 Dec 2020 08:38:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ABEB16B006C; Tue, 15 Dec 2020 08:38:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0061.hostedemail.com [216.40.44.61]) by kanga.kvack.org (Postfix) with ESMTP id 974856B0036 for ; Tue, 15 Dec 2020 08:38:07 -0500 (EST) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 537C48249980 for ; Tue, 15 Dec 2020 13:38:07 +0000 (UTC) X-FDA: 77595620214.12.goose85_5201dd827423 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id 2EBC81800DCA3 for ; Tue, 15 Dec 2020 13:38:07 +0000 (UTC) X-HE-Tag: goose85_5201dd827423 X-Filterd-Recvd-Size: 11931 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Dec 2020 13:38:06 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id e2so3885460plt.12 for ; Tue, 15 Dec 2020 05:38:05 -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=rqQtUUF8v33Jmoi4KsNYNxm+V8KvPZvIUDhNuJPsSpk=; b=crmpJe2KDqllH6uD1Kf3tFpZBzvrdCqywLDVfk6jq1MIyUxTgBToe8PSKD/zUM8Yxo 2JqYZNUD+jLPbE4ao4VrJz4y/ArbTu392ix5ZnlIAe79vAQQi44gQ7jcRUDpcgmQq9kP TJjRgVcCNYTR1vOT/+yNzTKT3GhfqgvVvOpqkJEEv5zsPSvYIj9C8z+gaMjF3oA5I731 /0kT/AfluTp1BcpFzLnqXBFB7o/gugtmC5Sm45E5s3lh6aR4SdjNC9gjb14Vg6npumlX o9dfKccg5LVbKoCakLRm3pYENc/7Z4spBCYUCP2gnLIWrxhZZcU2/gdC/cr2NjnCoi3z URTA== 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=rqQtUUF8v33Jmoi4KsNYNxm+V8KvPZvIUDhNuJPsSpk=; b=sGAoAPcl58uJ8HvSDqsDJMAZ7nqSGjr41hN8VqpXXWijAsLSuC9P9WfVnmFM+i4hWm 8HCpqa315K5UotoAPg47w57j+24QqOuJy/M+ah7m4NHy1/xWAo9ygY1Qb52D282L9smY egREwLsOFVBnRSOWOQixRz+K+3I8/uWsIasfrd0y6dIDatdQiBHtbh4h+q5dBjM5NblB TvtV1UX0rJprcABj5NxebxK2AvIM+QznICg5T6jsBAyCr9J90A9PXvrlBTo8bh9OLDPt 4t1uhCOYh+CazLibsJQLEVCFXuq5QWJ0eTTcyUa1h0LuCsgTr2ZH24x/tA+uBdEswrbx T+yQ== X-Gm-Message-State: AOAM530kInzXvKalTTH4S1pkDrJ+NTeKYd0t11xfkqg/3yRvcJ9C7dNm aqFfMr8MMJj/xdnLg9lk23mNwcstXXt33npBvxCJcQ== X-Google-Smtp-Source: ABdhPJwGufK6wRVZz2t/Y5+TwVRmoNZ2XG3IEg5U0NDltpU68/Msw+lp7VJjfFCucHPVxZA9yJQjEQls+4uwTSmqXig= X-Received: by 2002:a17:902:ed0d:b029:da:c83b:5f40 with SMTP id b13-20020a170902ed0db02900dac83b5f40mr1162761pld.20.1608039484985; Tue, 15 Dec 2020 05:38:04 -0800 (PST) MIME-Version: 1.0 References: <20201208041847.72122-1-songmuchun@bytedance.com> <20201208041847.72122-3-songmuchun@bytedance.com> <20201215133038.GO32193@dhcp22.suse.cz> In-Reply-To: <20201215133038.GO32193@dhcp22.suse.cz> From: Muchun Song Date: Tue, 15 Dec 2020 21:37:28 +0800 Message-ID: Subject: Re: [External] Re: [PATCH v3 2/7] mm: memcontrol: convert NR_ANON_THPS account to pages 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:30 PM Michal Hocko wrote: > > On Tue 08-12-20 12:18:42, Muchun Song wrote: > > The unit of NR_ANON_THPS is HPAGE_PMD_NR. Convert the NR_ANON_THPS > > account to pages. > > This changelog could benefit from some improvements. First of all you > should be clear about the motivation. I believe the previous feedback > was also to explicitly mention what effect this has on the pcp > accounting flushing. Thank you. Will update. > > > Signed-off-by: Muchun Song > > --- > > drivers/base/node.c | 3 +-- > > fs/proc/meminfo.c | 2 +- > > mm/huge_memory.c | 3 ++- > > mm/memcontrol.c | 20 ++++++-------------- > > mm/page_alloc.c | 2 +- > > mm/rmap.c | 7 ++++--- > > 6 files changed, 15 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/base/node.c b/drivers/base/node.c > > index 04f71c7bc3f8..ec35cb567940 100644 > > --- a/drivers/base/node.c > > +++ b/drivers/base/node.c > > @@ -461,8 +461,7 @@ static ssize_t node_read_meminfo(struct device *dev, > > nid, K(sunreclaimable) > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > > , > > - nid, K(node_page_state(pgdat, NR_ANON_THPS) * > > - HPAGE_PMD_NR), > > + nid, K(node_page_state(pgdat, NR_ANON_THPS)), > > nid, K(node_page_state(pgdat, NR_SHMEM_THPS) * > > HPAGE_PMD_NR), > > nid, K(node_page_state(pgdat, NR_SHMEM_PMDMAPPED) * > > diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c > > index d6fc74619625..a635c8a84ddf 100644 > > --- a/fs/proc/meminfo.c > > +++ b/fs/proc/meminfo.c > > @@ -129,7 +129,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) > > > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > > show_val_kb(m, "AnonHugePages: ", > > - global_node_page_state(NR_ANON_THPS) * HPAGE_PMD_NR); > > + global_node_page_state(NR_ANON_THPS)); > > show_val_kb(m, "ShmemHugePages: ", > > global_node_page_state(NR_SHMEM_THPS) * HPAGE_PMD_NR); > > show_val_kb(m, "ShmemPmdMapped: ", > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > > index 10dd3cae5f53..66ec454120de 100644 > > --- a/mm/huge_memory.c > > +++ b/mm/huge_memory.c > > @@ -2178,7 +2178,8 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, > > lock_page_memcg(page); > > if (atomic_add_negative(-1, compound_mapcount_ptr(page))) { > > /* Last compound_mapcount is gone. */ > > - __dec_lruvec_page_state(page, NR_ANON_THPS); > > + __mod_lruvec_page_state(page, NR_ANON_THPS, > > + -HPAGE_PMD_NR); > > if (TestClearPageDoubleMap(page)) { > > /* No need in mapcount reference anymore */ > > for (i = 0; i < HPAGE_PMD_NR; i++) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > index 8818bf64d6fe..b18e25a5cdf3 100644 > > --- a/mm/memcontrol.c > > +++ b/mm/memcontrol.c > > @@ -1532,7 +1532,7 @@ static struct memory_stat memory_stats[] = { > > * on some architectures, the macro of HPAGE_PMD_SIZE is not > > * constant(e.g. powerpc). > > */ > > - { "anon_thp", 0, NR_ANON_THPS }, > > + { "anon_thp", PAGE_SIZE, NR_ANON_THPS }, > > { "file_thp", 0, NR_FILE_THPS }, > > { "shmem_thp", 0, NR_SHMEM_THPS }, > > #endif > > @@ -1565,8 +1565,7 @@ static int __init memory_stats_init(void) > > > > for (i = 0; i < ARRAY_SIZE(memory_stats); i++) { > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > > - if (memory_stats[i].idx == NR_ANON_THPS || > > - memory_stats[i].idx == NR_FILE_THPS || > > + if (memory_stats[i].idx == NR_FILE_THPS || > > memory_stats[i].idx == NR_SHMEM_THPS) > > memory_stats[i].ratio = HPAGE_PMD_SIZE; > > #endif > > @@ -4088,10 +4087,6 @@ static int memcg_stat_show(struct seq_file *m, void *v) > > if (memcg1_stats[i] == MEMCG_SWAP && !do_memsw_account()) > > continue; > > nr = memcg_page_state_local(memcg, memcg1_stats[i]); > > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > > - if (memcg1_stats[i] == NR_ANON_THPS) > > - nr *= HPAGE_PMD_NR; > > -#endif > > seq_printf(m, "%s %lu\n", memcg1_stat_names[i], nr * PAGE_SIZE); > > } > > > > @@ -4122,10 +4117,6 @@ static int memcg_stat_show(struct seq_file *m, void *v) > > if (memcg1_stats[i] == MEMCG_SWAP && !do_memsw_account()) > > continue; > > nr = memcg_page_state(memcg, memcg1_stats[i]); > > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > > - if (memcg1_stats[i] == NR_ANON_THPS) > > - nr *= HPAGE_PMD_NR; > > -#endif > > seq_printf(m, "total_%s %llu\n", memcg1_stat_names[i], > > (u64)nr * PAGE_SIZE); > > } > > @@ -5653,10 +5644,11 @@ static int mem_cgroup_move_account(struct page *page, > > __mod_lruvec_state(from_vec, NR_ANON_MAPPED, -nr_pages); > > __mod_lruvec_state(to_vec, NR_ANON_MAPPED, nr_pages); > > if (PageTransHuge(page)) { > > - __dec_lruvec_state(from_vec, NR_ANON_THPS); > > - __inc_lruvec_state(to_vec, NR_ANON_THPS); > > + __mod_lruvec_state(from_vec, NR_ANON_THPS, > > + -nr_pages); > > + __mod_lruvec_state(to_vec, NR_ANON_THPS, > > + nr_pages); > > } > > - > > } > > } else { > > __mod_lruvec_state(from_vec, NR_FILE_PAGES, -nr_pages); > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > > index 469e28f95ce7..1700f52b7869 100644 > > --- a/mm/page_alloc.c > > +++ b/mm/page_alloc.c > > @@ -5580,7 +5580,7 @@ void show_free_areas(unsigned int filter, nodemask_t *nodemask) > > K(node_page_state(pgdat, NR_SHMEM_THPS) * HPAGE_PMD_NR), > > K(node_page_state(pgdat, NR_SHMEM_PMDMAPPED) > > * HPAGE_PMD_NR), > > - K(node_page_state(pgdat, NR_ANON_THPS) * HPAGE_PMD_NR), > > + K(node_page_state(pgdat, NR_ANON_THPS)), > > #endif > > K(node_page_state(pgdat, NR_WRITEBACK_TEMP)), > > node_page_state(pgdat, NR_KERNEL_STACK_KB), > > diff --git a/mm/rmap.c b/mm/rmap.c > > index 08c56aaf72eb..f59e92e26b61 100644 > > --- a/mm/rmap.c > > +++ b/mm/rmap.c > > @@ -1144,7 +1144,8 @@ void do_page_add_anon_rmap(struct page *page, > > * disabled. > > */ > > if (compound) > > - __inc_lruvec_page_state(page, NR_ANON_THPS); > > + __mod_lruvec_page_state(page, NR_ANON_THPS, > > + HPAGE_PMD_NR); > > __mod_lruvec_page_state(page, NR_ANON_MAPPED, nr); > > } > > > > @@ -1186,7 +1187,7 @@ void page_add_new_anon_rmap(struct page *page, > > if (hpage_pincount_available(page)) > > atomic_set(compound_pincount_ptr(page), 0); > > > > - __inc_lruvec_page_state(page, NR_ANON_THPS); > > + __mod_lruvec_page_state(page, NR_ANON_THPS, HPAGE_PMD_NR); > > } else { > > /* Anon THP always mapped first with PMD */ > > VM_BUG_ON_PAGE(PageTransCompound(page), page); > > @@ -1292,7 +1293,7 @@ static void page_remove_anon_compound_rmap(struct page *page) > > if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) > > return; > > > > - __dec_lruvec_page_state(page, NR_ANON_THPS); > > + __mod_lruvec_page_state(page, NR_ANON_THPS, -HPAGE_PMD_NR); > > > > if (TestClearPageDoubleMap(page)) { > > /* > > -- > > 2.11.0 > > -- > Michal Hocko > SUSE Labs -- Yours, Muchun