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=-9.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 8E40BC56201 for ; Mon, 26 Oct 2020 14:48:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0754222265 for ; Mon, 26 Oct 2020 14:48:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="d6D4VMou" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0754222265 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 46B616B0062; Mon, 26 Oct 2020 10:48:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 41E436B006C; Mon, 26 Oct 2020 10:48:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 331AF6B006E; Mon, 26 Oct 2020 10:48:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0045.hostedemail.com [216.40.44.45]) by kanga.kvack.org (Postfix) with ESMTP id F03366B0062 for ; Mon, 26 Oct 2020 10:48:00 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 77308181AC9CB for ; Mon, 26 Oct 2020 14:48:00 +0000 (UTC) X-FDA: 77414356320.23.pain59_010e1b727274 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 595E437604 for ; Mon, 26 Oct 2020 14:48:00 +0000 (UTC) X-HE-Tag: pain59_010e1b727274 X-Filterd-Recvd-Size: 2971 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Mon, 26 Oct 2020 14:47:59 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1603723678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=FTtfuVA/ubv9e7YYekhqUclLY9WH5GzOOfKJbSAolQY=; b=d6D4VMouBjAa6RO5sa3xmMIH3wWG+Q2s21n7W8tg1eiLOyxf0qZ/Z4OKLntDvvUhv8fbCs 8UZ27n0PUWYx3mk4HkUEn28+IS8QXqC2BczTPL0kiR5A/M8UGOY/z4mRsvlFJkR4yVBTfi jsHcv5kQ/MeAwOCV5UIasx6MJW7oVm0= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id AF669ABB2; Mon, 26 Oct 2020 14:47:58 +0000 (UTC) Date: Mon, 26 Oct 2020 15:47:57 +0100 From: Michal Hocko To: zhongjiang-ali Cc: hannes@cmpxchg.org, vdavydov.dev@gmail.com, akpm@linux-foundation.org, linux-mm@kvack.org Subject: Re: [PATCH] mm: memcontrol: correct the NR_ANON_THPS counter of hierarchical memcg Message-ID: <20201026144757.GJ20500@dhcp22.suse.cz> References: <1603722395-72443-1-git-send-email-zhongjiang-ali@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1603722395-72443-1-git-send-email-zhongjiang-ali@linux.alibaba.com> 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 Mon 26-10-20 22:26:35, zhongjiang-ali wrote: > 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. I am not sure which tree are you looking at but the current Linus tree already does have this hunk. > Fixes: 468c398233da ("mm: memcontrol: switch to native NR_ANON_THPS counter") > Signed-off-by: zhongjiang-ali > --- > 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++) > -- > 1.8.3.1 -- Michal Hocko SUSE Labs