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=-8.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 E8341C54E8D for ; Tue, 12 May 2020 15:27:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6BE1A206CC for ; Tue, 12 May 2020 15:27:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="qid5Qezi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6BE1A206CC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B1CFB9000C7; Tue, 12 May 2020 11:27:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ACF03900036; Tue, 12 May 2020 11:27:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9E2DB9000C7; Tue, 12 May 2020 11:27:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0027.hostedemail.com [216.40.44.27]) by kanga.kvack.org (Postfix) with ESMTP id 84859900036 for ; Tue, 12 May 2020 11:27:42 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 4446D33CD for ; Tue, 12 May 2020 15:27:42 +0000 (UTC) X-FDA: 76808446764.22.vein34_261feccb27329 X-HE-Tag: vein34_261feccb27329 X-Filterd-Recvd-Size: 6195 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Tue, 12 May 2020 15:27:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description; bh=0o6dVNg9znzcukghDI8w+W/ZJ8g4B3rZRt84WXfDJ6c=; b=qid5QeziBRaVfqMBDyUCBGgDpI /gF4sMtm3dRw8LjoA63J+wVFfLD3dsqePrw16fUSSYGDnVoBhu5KrEpY1j0bhTFF30jtZmGTLE9bM p2w7JB6I9TvRiWBLg9FoZyzGvoseM/YkgM4KU+kxIGAVTvI4YLqHT+LcVxKMpWnBStdRVSqEukak7 mdJMblA9cqMezoVZqxuCN+PCIk2PhL3ZQQGztYGOCy9UeAjdbBic7tsoEKQqavyS7NszdHbK2FJIM Uj+Y6CY+lZiFt01TbKVo9phwsXK4dseELaXRyYvpoNPZbiuVbV5BcoEz0W0pA3J8muluAtiYobjFe 39FlXhgw==; Received: from [2601:1c0:6280:3f0:897c:6038:c71d:ecac] by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jYWob-0000js-Ob; Tue, 12 May 2020 15:27:34 +0000 Subject: Re: mmotm 2020-05-11-15-43 uploaded (mm/memcontrol.c, huge pages) To: Johannes Weiner Cc: Andrew Morton , broonie@kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-next@vger.kernel.org, mhocko@suse.cz, mm-commits@vger.kernel.org, sfr@canb.auug.org.au References: <20200511224430.HDJjRC68z%akpm@linux-foundation.org> <3b612c3e-ce52-ba92-eb02-0fa7fd38819f@infradead.org> <20200512121750.GA397968@cmpxchg.org> From: Randy Dunlap Message-ID: Date: Tue, 12 May 2020 08:27:29 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200512121750.GA397968@cmpxchg.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US 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: On 5/12/20 5:17 AM, Johannes Weiner wrote: >=20 > --- >=20 > Randy reports: >=20 >> on x86_64: >> >> In file included from ../arch/x86/include/asm/atomic.h:5:0, >> from ../include/linux/atomic.h:7, >> from ../include/linux/page_counter.h:5, >> from ../mm/memcontrol.c:25: >> ../mm/memcontrol.c: In function =E2=80=98memcg_stat_show=E2=80=99: >> ../include/linux/compiler.h:394:38: error: call to =E2=80=98__compilet= ime_assert_383=E2=80=99 declared with attribute error: BUILD_BUG failed >> _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER= __) >> ^ >> ../include/linux/compiler.h:375:4: note: in definition of macro =E2=80= =98__compiletime_assert=E2=80=99 >> prefix ## suffix(); \ >> ^~~~~~ >> ../include/linux/compiler.h:394:2: note: in expansion of macro =E2=80=98= _compiletime_assert=E2=80=99 >> _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER= __) >> ^~~~~~~~~~~~~~~~~~~ >> ../include/linux/build_bug.h:39:37: note: in expansion of macro =E2=80= =98compiletime_assert=E2=80=99 >> #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) >> ^~~~~~~~~~~~~~~~~~ >> ../include/linux/build_bug.h:59:21: note: in expansion of macro =E2=80= =98BUILD_BUG_ON_MSG=E2=80=99 >> #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed") >> ^~~~~~~~~~~~~~~~ >> ../include/linux/huge_mm.h:319:28: note: in expansion of macro =E2=80=98= BUILD_BUG=E2=80=99 >> #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; }) >=20 > The THP page size macros are CONFIG_TRANSPARENT_HUGEPAGE only. >=20 > We already ifdef most THP-related code in memcg, but not these > particular stats. Memcg used to track the pages as they came in, and > PageTransHuge() + hpage_nr_pages() work when THP is not compiled in. >=20 > Switching to native vmstat counters, memcg doesn't see the pages, it > only gets a count of THPs. To translate that to bytes, it has to know > how big the THPs are - and that's only available for CONFIG_THP. >=20 > Add the necessary ifdefs. /proc/meminfo, smaps etc. also don't show > the THP counters when the feature is compiled out. The event counts > (THP_FAULT_ALLOC, THP_COLLAPSE_ALLOC) were already conditional also. >=20 > Style touchup: HPAGE_PMD_NR * PAGE_SIZE is silly. Use HPAGE_PMD_SIZE. >=20 > Reported-by: Randy Dunlap > Signed-off-by: Johannes Weiner Acked-by: Randy Dunlap # build-tested Thanks. > --- >=20 > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 738d071ba1ef..47c685088a2c 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1401,9 +1401,11 @@ static char *memory_stat_format(struct mem_cgrou= p *memcg) > (u64)memcg_page_state(memcg, NR_WRITEBACK) * > PAGE_SIZE); > =20 > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > seq_buf_printf(&s, "anon_thp %llu\n", > (u64)memcg_page_state(memcg, NR_ANON_THPS) * > - HPAGE_PMD_NR * PAGE_SIZE); > + HPAGE_PMD_SIZE); > +#endif > =20 > for (i =3D 0; i < NR_LRU_LISTS; i++) > seq_buf_printf(&s, "%s %llu\n", lru_list_name(i), > @@ -3752,7 +3754,9 @@ static int memcg_numa_stat_show(struct seq_file *= m, void *v) > static const unsigned int memcg1_stats[] =3D { > NR_FILE_PAGES, > NR_ANON_MAPPED, > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > NR_ANON_THPS, > +#endif > NR_SHMEM, > NR_FILE_MAPPED, > NR_FILE_DIRTY, > @@ -3763,7 +3767,9 @@ static const unsigned int memcg1_stats[] =3D { > static const char *const memcg1_stat_names[] =3D { > "cache", > "rss", > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > "rss_huge", > +#endif > "shmem", > "mapped_file", > "dirty", > @@ -3794,8 +3800,10 @@ static int memcg_stat_show(struct seq_file *m, v= oid *v) > if (memcg1_stats[i] =3D=3D MEMCG_SWAP && !do_memsw_account()) > continue; > nr =3D memcg_page_state_local(memcg, memcg1_stats[i]); > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > if (memcg1_stats[i] =3D=3D NR_ANON_THPS) > nr *=3D HPAGE_PMD_NR; > +#endif > seq_printf(m, "%s %lu\n", memcg1_stat_names[i], nr * PAGE_SIZE); > } > =20 >=20 --=20 ~Randy