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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, 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 E1A4EC433FE for ; Tue, 8 Dec 2020 08:24:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 553A223A5B for ; Tue, 8 Dec 2020 08:24:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 553A223A5B 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 9D48C6B005C; Tue, 8 Dec 2020 03:24:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 985356B005D; Tue, 8 Dec 2020 03:24:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C2956B0068; Tue, 8 Dec 2020 03:24:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0082.hostedemail.com [216.40.44.82]) by kanga.kvack.org (Postfix) with ESMTP id 7689B6B005C for ; Tue, 8 Dec 2020 03:24:15 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 3D9FB1EE6 for ; Tue, 8 Dec 2020 08:24:15 +0000 (UTC) X-FDA: 77569427670.17.bone71_0302154273e5 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 24E77180D0180 for ; Tue, 8 Dec 2020 08:24:15 +0000 (UTC) X-HE-Tag: bone71_0302154273e5 X-Filterd-Recvd-Size: 7156 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Tue, 8 Dec 2020 08:24:10 +0000 (UTC) X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R201e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04407;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0UHyFYxY_1607415844; Received: from IT-FVFX43SYHV2H.local(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0UHyFYxY_1607415844) by smtp.aliyun-inc.com(127.0.0.1); Tue, 08 Dec 2020 16:24:04 +0800 Subject: Re: [PATCH 03/11] mm: don't pass "enum lru_list" to lru list addition functions To: Yu Zhao , Andrew Morton , Hugh Dickins Cc: Michal Hocko , Johannes Weiner , Vladimir Davydov , Roman Gushchin , Vlastimil Babka , Matthew Wilcox , linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20201207220949.830352-1-yuzhao@google.com> <20201207220949.830352-4-yuzhao@google.com> From: Alex Shi Message-ID: <0035a169-8c9c-85dd-7823-7d7d6e33ae81@linux.alibaba.com> Date: Tue, 8 Dec 2020 16:24:04 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20201207220949.830352-4-yuzhao@google.com> Content-Type: text/plain; charset=utf-8 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: =E5=9C=A8 2020/12/8 =E4=B8=8A=E5=8D=886:09, Yu Zhao =E5=86=99=E9=81=93: > The "enum lru_list" parameter to add_page_to_lru_list() and > add_page_to_lru_list_tail() is redundant in the sense that it can > be extracted from the "struct page" parameter by page_lru(). >=20 > A caveat is that we need to make sure PageActive() or > PageUnevictable() is correctly set or cleared before calling > these two functions. And they are indeed. >=20 > Signed-off-by: Yu Zhao > --- > include/linux/mm_inline.h | 8 ++++++-- > mm/swap.c | 15 +++++++-------- > mm/vmscan.c | 6 ++---- > 3 files changed, 15 insertions(+), 14 deletions(-) >=20 > diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h > index 2889741f450a..130ba3201d3f 100644 > --- a/include/linux/mm_inline.h > +++ b/include/linux/mm_inline.h > @@ -106,15 +106,19 @@ static __always_inline enum lru_list page_lru(str= uct page *page) > } > =20 > static __always_inline void add_page_to_lru_list(struct page *page, > - struct lruvec *lruvec, enum lru_list lru) > + struct lruvec *lruvec) > { > + enum lru_list lru =3D page_lru(page); > + > update_lru_size(lruvec, lru, page_zonenum(page), thp_nr_pages(page)); > list_add(&page->lru, &lruvec->lists[lru]); > } > =20 > static __always_inline void add_page_to_lru_list_tail(struct page *pag= e, > - struct lruvec *lruvec, enum lru_list lru) > + struct lruvec *lruvec) > { > + enum lru_list lru =3D page_lru(page); > + > update_lru_size(lruvec, lru, page_zonenum(page), thp_nr_pages(page)); > list_add_tail(&page->lru, &lruvec->lists[lru]); > } > diff --git a/mm/swap.c b/mm/swap.c > index 5022dfe388ad..136acabbfab5 100644 > --- a/mm/swap.c > +++ b/mm/swap.c > @@ -231,7 +231,7 @@ static void pagevec_move_tail_fn(struct page *page,= struct lruvec *lruvec) > if (!PageUnevictable(page)) { > del_page_from_lru_list(page, lruvec, page_lru(page)); > ClearPageActive(page); > - add_page_to_lru_list_tail(page, lruvec, page_lru(page)); > + add_page_to_lru_list_tail(page, lruvec); > __count_vm_events(PGROTATED, thp_nr_pages(page)); > } > } > @@ -313,8 +313,7 @@ static void __activate_page(struct page *page, stru= ct lruvec *lruvec) > =20 > del_page_from_lru_list(page, lruvec, lru); > SetPageActive(page); > - lru +=3D LRU_ACTIVE; Uh, actully, page to lru functions like, page_lru(page), always inline, s= o generally, no instruction increasing, except few place like here. =20 > - add_page_to_lru_list(page, lruvec, lru); > + add_page_to_lru_list(page, lruvec); > trace_mm_lru_activate(page); > =20 > __count_vm_events(PGACTIVATE, nr_pages); > @@ -543,14 +542,14 @@ static void lru_deactivate_file_fn(struct page *p= age, struct lruvec *lruvec) > * It can make readahead confusing. But race window > * is _really_ small and it's non-critical problem. > */ > - add_page_to_lru_list(page, lruvec, lru); > + add_page_to_lru_list(page, lruvec); > SetPageReclaim(page); > } else { > /* > * The page's writeback ends up during pagevec > * We moves tha page into tail of inactive. > */ > - add_page_to_lru_list_tail(page, lruvec, lru); > + add_page_to_lru_list_tail(page, lruvec); > __count_vm_events(PGROTATED, nr_pages); > } > =20 > @@ -570,7 +569,7 @@ static void lru_deactivate_fn(struct page *page, st= ruct lruvec *lruvec) > del_page_from_lru_list(page, lruvec, lru + LRU_ACTIVE); > ClearPageActive(page); > ClearPageReferenced(page); > - add_page_to_lru_list(page, lruvec, lru); > + add_page_to_lru_list(page, lruvec); > =20 > __count_vm_events(PGDEACTIVATE, nr_pages); > __count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, > @@ -595,7 +594,7 @@ static void lru_lazyfree_fn(struct page *page, stru= ct lruvec *lruvec) > * anonymous pages > */ > ClearPageSwapBacked(page); > - add_page_to_lru_list(page, lruvec, LRU_INACTIVE_FILE); > + add_page_to_lru_list(page, lruvec); > =20 > __count_vm_events(PGLAZYFREE, nr_pages); > __count_memcg_events(lruvec_memcg(lruvec), PGLAZYFREE, > @@ -1005,7 +1004,7 @@ static void __pagevec_lru_add_fn(struct page *pag= e, struct lruvec *lruvec) > __count_vm_events(UNEVICTABLE_PGCULLED, nr_pages); > } > =20 > - add_page_to_lru_list(page, lruvec, lru); > + add_page_to_lru_list(page, lruvec); > trace_mm_lru_insertion(page, lru); > } > =20 > diff --git a/mm/vmscan.c b/mm/vmscan.c > index a174594e40f8..8fc8f2c9d7ec 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -1865,7 +1865,7 @@ static unsigned noinline_for_stack move_pages_to_= lru(struct lruvec *lruvec, > * inhibits memcg migration). > */ > VM_BUG_ON_PAGE(!lruvec_holds_page_lru_lock(page, lruvec), page); > - add_page_to_lru_list(page, lruvec, page_lru(page)); > + add_page_to_lru_list(page, lruvec); > nr_pages =3D thp_nr_pages(page); > nr_moved +=3D nr_pages; > if (PageActive(page)) > @@ -4280,12 +4280,10 @@ void check_move_unevictable_pages(struct pageve= c *pvec) > =20 > lruvec =3D relock_page_lruvec_irq(page, lruvec); > if (page_evictable(page) && PageUnevictable(page)) { > - enum lru_list lru =3D page_lru_base_type(page); > - > VM_BUG_ON_PAGE(PageActive(page), page); > ClearPageUnevictable(page); > del_page_from_lru_list(page, lruvec, LRU_UNEVICTABLE); > - add_page_to_lru_list(page, lruvec, lru); And here. > + add_page_to_lru_list(page, lruvec); > pgrescued +=3D nr_pages; > } > SetPageLRU(page); >=20