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 71D13C433EF for ; Mon, 14 Feb 2022 20:21:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F05406B0071; Mon, 14 Feb 2022 15:21:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EB3FC6B007B; Mon, 14 Feb 2022 15:21:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7B5C6B007D; Mon, 14 Feb 2022 15:21:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0019.hostedemail.com [216.40.44.19]) by kanga.kvack.org (Postfix) with ESMTP id C4F526B0071 for ; Mon, 14 Feb 2022 15:21:31 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 7ED36181AF5F4 for ; Mon, 14 Feb 2022 20:21:31 +0000 (UTC) X-FDA: 79142505582.29.877E986 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf20.hostedemail.com (Postfix) with ESMTP id 974E21C0002 for ; Mon, 14 Feb 2022 20:21:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=QxI49WGD1+5k03XumgfmIKcqu/YQWF1M/vQu+J0txbo=; b=iFGJlTqoYDXrAZaaYvhFab44GL PdinQ7AkX2Av9gtg38hUu7uXx80IfhQp+nZFA9ku6MPqcUpzRWxszQ3CmZZ/1Cs0Zm3t6tPD6gqbh BI7lZdOGAS/83/NZKWK2MUe2tRMTN0OPfQo2mOof8z5kzacsxOdHXZKtGyBtpv+zxvH63SS3lRSmp admHojuRvTfCUw7yNs6bc941TYWTB1s4KAC5FjKWjiR29+teWYRCej0+knR3f0QjYfofpQHSIotg5 WcRomrn9ojlN7sLuuKPgWAKPgBKDDBrgg+kbFQNO6Sm/eQEGp/6p8/+DW08bknw903FAzvpWHUDcb +hOlGfYA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJhWG-00DDe4-Ra; Mon, 14 Feb 2022 20:00:20 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 08/10] mm: Turn deactivate_file_page() into deactivate_file_folio() Date: Mon, 14 Feb 2022 20:00:15 +0000 Message-Id: <20220214200017.3150590-9-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220214200017.3150590-1-willy@infradead.org> References: <20220214200017.3150590-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 974E21C0002 X-Rspam-User: Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=iFGJlTqo; spf=none (imf20.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Stat-Signature: wxm5hox1u83srccbw1doxopdibciznyq X-Rspamd-Server: rspam11 X-HE-Tag: 1644870090-563274 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: This function has one caller which already has a reference to the page, so we don't need to use get_page_unless_zero(). Also move the prototype to mm/internal.h. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/swap.h | 1 - mm/internal.h | 1 + mm/swap.c | 33 ++++++++++++++++----------------- mm/truncate.c | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 304f174b4d31..064e60e9f63f 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -372,7 +372,6 @@ extern void lru_add_drain(void); extern void lru_add_drain_cpu(int cpu); extern void lru_add_drain_cpu_zone(struct zone *zone); extern void lru_add_drain_all(void); -extern void deactivate_file_page(struct page *page); extern void deactivate_page(struct page *page); extern void mark_page_lazyfree(struct page *page); extern void swap_setup(void); diff --git a/mm/internal.h b/mm/internal.h index 927a17d58b85..d886b87b1294 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -66,6 +66,7 @@ static inline void wake_throttle_isolated(pg_data_t *pg= dat) vm_fault_t do_swap_page(struct vm_fault *vmf); void folio_rotate_reclaimable(struct folio *folio); bool __folio_end_writeback(struct folio *folio); +void deactivate_file_folio(struct folio *folio); =20 void free_pgtables(struct mmu_gather *tlb, struct vm_area_struct *start_= vma, unsigned long floor, unsigned long ceiling); diff --git a/mm/swap.c b/mm/swap.c index bcf3ac288b56..745915127b1f 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -639,32 +639,31 @@ void lru_add_drain_cpu(int cpu) } =20 /** - * deactivate_file_page - forcefully deactivate a file page - * @page: page to deactivate + * deactivate_file_folio() - Forcefully deactivate a file folio. + * @folio: Folio to deactivate. * - * This function hints the VM that @page is a good reclaim candidate, - * for example if its invalidation fails due to the page being dirty + * This function hints to the VM that @folio is a good reclaim candidate= , + * for example if its invalidation fails due to the folio being dirty * or under writeback. */ -void deactivate_file_page(struct page *page) +void deactivate_file_folio(struct folio *folio) { + struct pagevec *pvec; + /* - * In a workload with many unevictable page such as mprotect, - * unevictable page deactivation for accelerating reclaim is pointless. + * In a workload with many unevictable pages such as mprotect, + * unevictable folio deactivation for accelerating reclaim is pointless= . */ - if (PageUnevictable(page)) + if (folio_test_unevictable(folio)) return; =20 - if (likely(get_page_unless_zero(page))) { - struct pagevec *pvec; - - local_lock(&lru_pvecs.lock); - pvec =3D this_cpu_ptr(&lru_pvecs.lru_deactivate_file); + folio_get(folio); + local_lock(&lru_pvecs.lock); + pvec =3D this_cpu_ptr(&lru_pvecs.lru_deactivate_file); =20 - if (pagevec_add_and_need_flush(pvec, page)) - pagevec_lru_move_fn(pvec, lru_deactivate_file_fn); - local_unlock(&lru_pvecs.lock); - } + if (pagevec_add_and_need_flush(pvec, &folio->page)) + pagevec_lru_move_fn(pvec, lru_deactivate_file_fn); + local_unlock(&lru_pvecs.lock); } =20 /* diff --git a/mm/truncate.c b/mm/truncate.c index 567557c36d45..14486e75ec28 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -525,7 +525,7 @@ static unsigned long __invalidate_mapping_pages(struc= t address_space *mapping, * of interest and try to speed up its reclaim. */ if (!ret) { - deactivate_file_page(&folio->page); + deactivate_file_folio(folio); /* It is likely on the pagevec of a remote CPU */ if (nr_pagevec) (*nr_pagevec)++; --=20 2.34.1