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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 997C5C433EF for ; Sat, 16 Apr 2022 06:50:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F23BB6B0072; Sat, 16 Apr 2022 02:50:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ED22A6B0073; Sat, 16 Apr 2022 02:50:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D9A076B0074; Sat, 16 Apr 2022 02:50:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.25]) by kanga.kvack.org (Postfix) with ESMTP id C8A216B0072 for ; Sat, 16 Apr 2022 02:50:39 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A2D21214AD for ; Sat, 16 Apr 2022 06:50:39 +0000 (UTC) X-FDA: 79361818998.11.275800B Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf14.hostedemail.com (Postfix) with ESMTP id AAEB5100005 for ; Sat, 16 Apr 2022 06:50:38 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4KgP3G1mVZzgYqg; Sat, 16 Apr 2022 14:50:34 +0800 (CST) Received: from [10.174.177.76] (10.174.177.76) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 16 Apr 2022 14:50:34 +0800 Subject: Re: [PATCH v10 04/14] Revert "include/linux/mm_inline.h: fold __update_lru_size() into its sole caller" To: Yu Zhao , Stephen Rothwell , CC: Andi Kleen , Andrew Morton , Aneesh Kumar , Barry Song <21cnbao@gmail.com>, Catalin Marinas , Dave Hansen , Hillf Danton , Jens Axboe , Jesse Barnes , Johannes Weiner , Jonathan Corbet , Linus Torvalds , Matthew Wilcox , Mel Gorman , Michael Larabel , Michal Hocko , Mike Rapoport , Rik van Riel , Vlastimil Babka , Will Deacon , Ying Huang , , , , , , Brian Geffon , Jan Alexander Steffens , Oleksandr Natalenko , Steven Barrett , Suleiman Souhlal , Daniel Byrne , Donald Carr , =?UTF-8?Q?Holger_Hoffst=c3=a4tte?= , Konstantin Kharlamov , Shuang Zhai , Sofia Trinh , Vaibhav Jain References: <20220407031525.2368067-1-yuzhao@google.com> <20220407031525.2368067-5-yuzhao@google.com> From: Miaohe Lin Message-ID: <1be2ba0e-1685-e80e-3617-31d38eea61b3@huawei.com> Date: Sat, 16 Apr 2022 14:50:34 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20220407031525.2368067-5-yuzhao@google.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.177.76] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: AAEB5100005 X-Stat-Signature: mpd51c9pkpqx4hpkea7o1popfmeop16t Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com X-HE-Tag: 1650091838-394118 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 2022/4/7 11:15, Yu Zhao wrote: > This patch undoes the following refactor: > commit 289ccba18af4 ("include/linux/mm_inline.h: fold __update_lru_size() into its sole caller") > > The upcoming changes to include/linux/mm_inline.h will reuse > __update_lru_size(). > > Signed-off-by: Yu Zhao > Acked-by: Brian Geffon > Acked-by: Jan Alexander Steffens (heftig) > Acked-by: Oleksandr Natalenko > Acked-by: Steven Barrett > Acked-by: Suleiman Souhlal > Tested-by: Daniel Byrne > Tested-by: Donald Carr > Tested-by: Holger Hoffstätte > Tested-by: Konstantin Kharlamov > Tested-by: Shuang Zhai > Tested-by: Sofia Trinh > Tested-by: Vaibhav Jain > --- > include/linux/mm_inline.h | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > Looks good to me. Thanks! Reviewed-by: Miaohe Lin > diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h > index ac32125745ab..7c9c2157e9a8 100644 > --- a/include/linux/mm_inline.h > +++ b/include/linux/mm_inline.h > @@ -32,7 +32,7 @@ static inline int page_is_file_lru(struct page *page) > return folio_is_file_lru(page_folio(page)); > } > > -static __always_inline void update_lru_size(struct lruvec *lruvec, > +static __always_inline void __update_lru_size(struct lruvec *lruvec, > enum lru_list lru, enum zone_type zid, > long nr_pages) > { > @@ -41,6 +41,13 @@ static __always_inline void update_lru_size(struct lruvec *lruvec, > __mod_lruvec_state(lruvec, NR_LRU_BASE + lru, nr_pages); > __mod_zone_page_state(&pgdat->node_zones[zid], > NR_ZONE_LRU_BASE + lru, nr_pages); > +} > + > +static __always_inline void update_lru_size(struct lruvec *lruvec, > + enum lru_list lru, enum zone_type zid, > + int nr_pages) > +{ > + __update_lru_size(lruvec, lru, zid, nr_pages); > #ifdef CONFIG_MEMCG > mem_cgroup_update_lru_size(lruvec, lru, zid, nr_pages); > #endif >