From patchwork Mon Oct 26 14:26:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhong jiang X-Patchwork-Id: 11857373 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69D01921 for ; Mon, 26 Oct 2020 14:26:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 37F5D24640 for ; Mon, 26 Oct 2020 14:26:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37F5D24640 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 62C0F6B006C; Mon, 26 Oct 2020 10:26:46 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 58C946B006E; Mon, 26 Oct 2020 10:26:46 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4078E6B0070; Mon, 26 Oct 2020 10:26:46 -0400 (EDT) X-Original-To: linux-mm@kvack.org 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 129046B006C for ; Mon, 26 Oct 2020 10:26:46 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 977A4181AC9CB for ; Mon, 26 Oct 2020 14:26:45 +0000 (UTC) X-FDA: 77414302770.28.stone00_4109f6a27274 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id 72E136D62 for ; Mon, 26 Oct 2020 14:26:45 +0000 (UTC) X-Spam-Summary: 1,0,0,3a2369a3d2090b6a,d41d8cd98f00b204,zhongjiang-ali@linux.alibaba.com,,RULES_HIT:41:355:379:541:960:973:988:989:1260:1261:1345:1437:1534:1541:1711:1730:1747:1777:1792:2393:2559:2562:2693:2898:3138:3139:3140:3141:3142:3352:3865:3867:3870:3871:3872:5007:6261:7903:10004:11026:11473:11658:11914:12043:12048:12296:12297:12438:12555:12679:12895:13069:13311:13357:14181:14384:14394:14721:21080:21450:21451:21554:21627:30034:30054:30070,0,RBL:115.124.30.57:@linux.alibaba.com:.lbl8.mailshell.net-64.201.201.201 62.20.2.100;04yre4nm9r7tp7szt9ee678ohdx5kypyqnr6m5h6sgabxgu5tfx6jk9zji4inc5.n9jbc3o7dsicuhxpeua3g8q8cmbgsjta5nodae8ugrheacpe3dfujxod697ekh1.s-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: stone00_4109f6a27274 X-Filterd-Recvd-Size: 2255 Received: from out30-57.freemail.mail.aliyun.com (out30-57.freemail.mail.aliyun.com [115.124.30.57]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Mon, 26 Oct 2020 14:26:43 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R751e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=alimailimapcm10staff010182156082;MF=zhongjiang-ali@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0UDHBpNa_1603722395; Received: from localhost(mailfrom:zhongjiang-ali@linux.alibaba.com fp:SMTPD_---0UDHBpNa_1603722395) by smtp.aliyun-inc.com(127.0.0.1); Mon, 26 Oct 2020 22:26:38 +0800 From: zhongjiang-ali To: hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org Subject: [PATCH] mm: memcontrol: correct the NR_ANON_THPS counter of hierarchical memcg Date: Mon, 26 Oct 2020 22:26:35 +0800 Message-Id: <1603722395-72443-1-git-send-email-zhongjiang-ali@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 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: memcg_page_state will get the specified number in hierarchical memcg, It should multiply by HPAGE_PMD_NR rather than an page if the item is NR_ANON_THPS. Fixes: 468c398233da ("mm: memcontrol: switch to native NR_ANON_THPS counter") Signed-off-by: zhongjiang-ali Acked-by: Johannes Weiner Acked-by: Michal Hocko --- mm/memcontrol.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 3a24e3b..c27898e 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4110,11 +4110,17 @@ static int memcg_stat_show(struct seq_file *m, void *v) (u64)memsw * PAGE_SIZE); for (i = 0; i < ARRAY_SIZE(memcg1_stats); i++) { + unsigned long nr; + 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)memcg_page_state(memcg, memcg1_stats[i]) * - PAGE_SIZE); + nr * PAGE_SIZE); } for (i = 0; i < ARRAY_SIZE(memcg1_events); i++)