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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 DC277C433DB for ; Fri, 5 Mar 2021 04:24:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7161764FE4 for ; Fri, 5 Mar 2021 04:24:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7161764FE4 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 08E596B0008; Thu, 4 Mar 2021 23:24:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 03C6C6B000A; Thu, 4 Mar 2021 23:24:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1EF96B000E; Thu, 4 Mar 2021 23:24:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0157.hostedemail.com [216.40.44.157]) by kanga.kvack.org (Postfix) with ESMTP id C46676B0008 for ; Thu, 4 Mar 2021 23:24:38 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 869D2180ACC44 for ; Fri, 5 Mar 2021 04:24:38 +0000 (UTC) X-FDA: 77884529436.05.C68A00F Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id DBA98A0000FA for ; Fri, 5 Mar 2021 04:24:37 +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=9d+mCHMlGcGG93YO8zcxGxoaCO1Ob3kebJ3Y/BX0vCc=; b=IIGNZaLDlocbNOcWiZR2oI2902 +OZ55+HOrai+yAVmwk2XoY0yL7yta2iyZ+Ght67SpbXgE0OOlM3MG4a8hKR44x7Aj97+TbU6WHlmv /RS66N1HAb7AeRvuNdDeE51EoM5X5wT9+FVl5dR503b5bZGc+r4a/qFKy9zranoD/wQckeVdiy72x aE4+2X/hyFqfyLcraQVDNYhP0Y/3btPMiP95E5/GDNnmWMjAvkCfrIT1eEXIPdk4LM9cReJ2PYedB Fh7ramj855Ib1FaLyAuLzqXJpvsBRoFHwXVfS7bVKMgNNk267WoOqfs311kLb+Q5o0hq5FCvNXFh0 CktHqZ/g==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1lI204-00A3oB-Sv; Fri, 05 Mar 2021 04:23:45 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v4 15/25] mm/filemap: Convert lock_page_async to lock_folio_async Date: Fri, 5 Mar 2021 04:18:51 +0000 Message-Id: <20210305041901.2396498-16-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210305041901.2396498-1-willy@infradead.org> References: <20210305041901.2396498-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: DBA98A0000FA X-Stat-Signature: 4gfw68o4znqrsn5f7j3qjn9pp8r1m3qj Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf07; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614918277-314130 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: There aren't any actual callers of lock_page_async(), but convert filemap_update_page() to call __lock_folio_async(). __lock_folio_async() is 21 bytes smaller than __lock_page_async(), but the real savings come from using a folio in filemap_update_page(), shrinking it from 514 bytes to 403 bytes, saving 111 bytes. The text shrinks by 132 bytes in total. Signed-off-by: Matthew Wilcox (Oracle) --- fs/io_uring.c | 2 +- include/linux/pagemap.h | 14 +++++++------- mm/filemap.c | 31 ++++++++++++++++--------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 4a088581b0f2..55687707b5fb 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3155,7 +3155,7 @@ static int io_read_prep(struct io_kiocb *req, const= struct io_uring_sqe *sqe) } =20 /* - * This is our waitqueue callback handler, registered through lock_page_= async() + * This is our waitqueue callback handler, registered through lock_folio= _async() * when we initially tried to do the IO with the iocb armed our waitqueu= e. * This gets called when the page is unlocked, and we generally expect t= hat to * happen when the page IO is completed and the page is now uptodate. Th= is will diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 0fa1a0338e54..9dbd9cf7d541 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -637,7 +637,7 @@ static inline bool wake_page_match(struct wait_page_q= ueue *wait_page, =20 void __lock_folio(struct folio *folio); int __lock_folio_killable(struct folio *folio); -extern int __lock_page_async(struct page *page, struct wait_page_queue *= wait); +int __lock_folio_async(struct folio *folio, struct wait_page_queue *wait= ); extern int __lock_page_or_retry(struct page *page, struct mm_struct *mm, unsigned int flags); void unlock_page(struct page *page); @@ -695,18 +695,18 @@ static inline int lock_page_killable(struct page *p= age) } =20 /* - * lock_page_async - Lock the page, unless this would block. If the page - * is already locked, then queue a callback when the page becomes unlock= ed. + * lock_folio_async - Lock the folio, unless this would block. If the fo= lio + * is already locked, then queue a callback when the folio becomes unloc= ked. * This callback can then retry the operation. * - * Returns 0 if the page is locked successfully, or -EIOCBQUEUED if the = page + * Returns 0 if the folio is locked successfully, or -EIOCBQUEUED if the= folio * was already locked and the callback defined in 'wait' was queued. */ -static inline int lock_page_async(struct page *page, +static inline int lock_folio_async(struct folio *folio, struct wait_page_queue *wait) { - if (!trylock_page(page)) - return __lock_page_async(page, wait); + if (!trylock_folio(folio)) + return __lock_folio_async(folio, wait); return 0; } =20 diff --git a/mm/filemap.c b/mm/filemap.c index 5acadffed25d..b99b068bc058 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1507,18 +1507,18 @@ int __lock_folio_killable(struct folio *folio) } EXPORT_SYMBOL_GPL(__lock_folio_killable); =20 -int __lock_page_async(struct page *page, struct wait_page_queue *wait) +int __lock_folio_async(struct folio *folio, struct wait_page_queue *wait= ) { - struct wait_queue_head *q =3D page_waitqueue(page); + struct wait_queue_head *q =3D page_waitqueue(&folio->page); int ret =3D 0; =20 - wait->page =3D page; + wait->page =3D &folio->page; wait->bit_nr =3D PG_locked; =20 spin_lock_irq(&q->lock); __add_wait_queue_entry_tail(q, &wait->wait); - SetPageWaiters(page); - ret =3D !trylock_page(page); + SetFolioWaiters(folio); + ret =3D !trylock_folio(folio); /* * If we were successful now, we know we're still on the * waitqueue as we're still under the lock. This means it's @@ -2265,41 +2265,42 @@ static int filemap_update_page(struct kiocb *iocb= , struct address_space *mapping, struct iov_iter *iter, struct page *page) { + struct folio *folio =3D page_folio(page); int error; =20 - if (!trylock_page(page)) { + if (!trylock_folio(folio)) { if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_NOIO)) return -EAGAIN; if (!(iocb->ki_flags & IOCB_WAITQ)) { - put_and_wait_on_page_locked(page, TASK_KILLABLE); + put_and_wait_on_page_locked(&folio->page, TASK_KILLABLE); return AOP_TRUNCATED_PAGE; } - error =3D __lock_page_async(page, iocb->ki_waitq); + error =3D __lock_folio_async(folio, iocb->ki_waitq); if (error) return error; } =20 - if (!page->mapping) + if (!folio->page.mapping) goto truncated; =20 error =3D 0; - if (filemap_range_uptodate(mapping, iocb->ki_pos, iter, page)) + if (filemap_range_uptodate(mapping, iocb->ki_pos, iter, &folio->page)) goto unlock; =20 error =3D -EAGAIN; if (iocb->ki_flags & (IOCB_NOIO | IOCB_NOWAIT | IOCB_WAITQ)) goto unlock; =20 - error =3D filemap_read_page(iocb->ki_filp, mapping, page); + error =3D filemap_read_page(iocb->ki_filp, mapping, &folio->page); if (error =3D=3D AOP_TRUNCATED_PAGE) - put_page(page); + put_folio(folio); return error; truncated: - unlock_page(page); - put_page(page); + unlock_folio(folio); + put_folio(folio); return AOP_TRUNCATED_PAGE; unlock: - unlock_page(page); + unlock_folio(folio); return error; } =20 --=20 2.30.0