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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,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 B3204C433FE for ; Fri, 11 Dec 2020 13:58:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2B1D323ECD for ; Fri, 11 Dec 2020 13:58:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B1D323ECD 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 96FC36B005D; Fri, 11 Dec 2020 08:58:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9201E6B0068; Fri, 11 Dec 2020 08:58:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 836036B006C; Fri, 11 Dec 2020 08:58:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0217.hostedemail.com [216.40.44.217]) by kanga.kvack.org (Postfix) with ESMTP id 6A0096B005D for ; Fri, 11 Dec 2020 08:58:04 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 20906362B for ; Fri, 11 Dec 2020 13:58:04 +0000 (UTC) X-FDA: 77581155288.08.smile10_1a0af0c27401 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 05D801819E76F for ; Fri, 11 Dec 2020 13:58:03 +0000 (UTC) X-HE-Tag: smile10_1a0af0c27401 X-Filterd-Recvd-Size: 2993 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP for ; Fri, 11 Dec 2020 13:58:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=ZihKsA22Et28L+VhHdtqUTD2BoH0RLZyZlt+xMMF8Ow=; b=IyKYrwls3wfp56Z7qFPwr0ue7Z Yprw6UCRdnGLdbOf1Sn2AaFRFwqr2StRLqZvlkEvVobIqWznxgPXiEHRDI3mGGeTILifiKRRq1MN6 3PSkhZ8HzT9DmE5G6vbGrDHNEYKFYSHkD3szMs/kc0gBWk+BSWcJ14PJgSMisrDtxJ4kUR0GKCMJM M7qus/u6xx6J2pqCeasF54kAGlcrhWrYvQiUpoG7e5ZDP1Br6TDVaY9+Gpr8hO/A1VWTpVjPAx3pg pT/kxGOx4WV03ILPeHx+lt9XtjjII1g2ZKRTWebPTNtmlM0Jfj2fT85MbiH7YPAblbb7Nrd6bBFyn oRjQO0sQ==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1knivS-0003uy-0i; Fri, 11 Dec 2020 13:57:38 +0000 Date: Fri, 11 Dec 2020 13:57:37 +0000 From: Matthew Wilcox To: Muchun Song Cc: gregkh@linuxfoundation.org, rafael@kernel.org, adobriyan@gmail.com, akpm@linux-foundation.org, hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, hughd@google.com, shakeelb@google.com, guro@fb.com, samitolvanen@google.com, feng.tang@intel.com, neilb@suse.de, iamjoonsoo.kim@lge.com, rdunlap@infradead.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org Subject: Re: [PATCH v4 3/7] mm: memcontrol: convert NR_FILE_THPS account to pages Message-ID: <20201211135737.GA2443@casper.infradead.org> References: <20201211041954.79543-1-songmuchun@bytedance.com> <20201211041954.79543-4-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201211041954.79543-4-songmuchun@bytedance.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 Fri, Dec 11, 2020 at 12:19:50PM +0800, Muchun Song wrote: > +++ b/mm/filemap.c > @@ -207,7 +207,7 @@ static void unaccount_page_cache_page(struct address_space *mapping, > if (PageTransHuge(page)) > __dec_lruvec_page_state(page, NR_SHMEM_THPS); > } else if (PageTransHuge(page)) { > - __dec_lruvec_page_state(page, NR_FILE_THPS); > + __mod_lruvec_page_state(page, NR_FILE_THPS, -HPAGE_PMD_NR); + __mod_lruvec_page_state(page, NR_FILE_THPS, -nr); > +++ b/mm/huge_memory.c > @@ -2748,7 +2748,8 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) > if (PageSwapBacked(head)) > __dec_lruvec_page_state(head, NR_SHMEM_THPS); > else > - __dec_lruvec_page_state(head, NR_FILE_THPS); > + __mod_lruvec_page_state(head, NR_FILE_THPS, > + -HPAGE_PMD_NR); + __mod_lruvec_page_state(head, NR_FILE_THPS, + -thp_nr_pages(head));