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.5 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 69670C433DB for ; Thu, 28 Jan 2021 07:04:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 000C464DCE for ; Thu, 28 Jan 2021 07:04:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 000C464DCE 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 7D1B96B0083; Thu, 28 Jan 2021 02:04:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 75EB36B0085; Thu, 28 Jan 2021 02:04:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 622F46B0087; Thu, 28 Jan 2021 02:04:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0090.hostedemail.com [216.40.44.90]) by kanga.kvack.org (Postfix) with ESMTP id 394FC6B0083 for ; Thu, 28 Jan 2021 02:04:45 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 0AC59180AD822 for ; Thu, 28 Jan 2021 07:04:45 +0000 (UTC) X-FDA: 77754296130.22.fowl12_38059df2759d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id DEDD418038E84 for ; Thu, 28 Jan 2021 07:04:44 +0000 (UTC) X-HE-Tag: fowl12_38059df2759d X-Filterd-Recvd-Size: 5560 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Thu, 28 Jan 2021 07:04:44 +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=oJK470q31PboFWBgTKWnce8VgiqHWIx7f5w+vailm0M=; b=O73MLdxTU1rbyUAViLl/rVGY/d wWX1I9J5qoQgcHr9zZ0ItNd/6tqre2gFc3mpoVquLPZ+ONqWCVxF4K72SzGZGo3hvuvqoltM8C/xj iZfNNTiYa6d77s4IdbTAFGvzXpBacpH2fbKbhLloEn7lBo9yTS6KPYD82QRrPfgBtbx0Uw/GdeK+4 eHYEZwDFJGTBpAX9z1+AWfLpXQXyXa9KHsrYi5eF5/O4djjU0qGrkZYYkXLE2RzLbyOXsZ95QAWZp b5XVZeasnRGmI6jT3tmh5WZWQhmP6Jan6WSvaCCpAN6EfOI/LsC9IuDGPqhvCken67hRcM9lv4fSI AEAewdVg==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l51M8-00848C-EN; Thu, 28 Jan 2021 07:04:41 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH v3 16/25] mm: Convert lock_page_async to lock_folio_async Date: Thu, 28 Jan 2021 07:03:55 +0000 Message-Id: <20210128070404.1922318-17-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128070404.1922318-1-willy@infradead.org> References: <20210128070404.1922318-1-willy@infradead.org> MIME-Version: 1.0 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: When the caller already has a folio, this saves a call to compound_head()= . If not, the call to compound_head() is merely moved. Signed-off-by: Matthew Wilcox (Oracle) --- fs/io_uring.c | 2 +- include/linux/pagemap.h | 14 +++++++------- mm/filemap.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 03748faa5295..2627160ffd4c 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3398,7 +3398,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 93a4ab9feaa8..131d1aa2af61 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -620,7 +620,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_folio(struct folio *folio); @@ -687,18 +687,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 c378b28c2bdc..a54eb4641385 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1524,18 +1524,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 @@ -2293,7 +2293,7 @@ static int filemap_update_page(struct kiocb *iocb, put_and_wait_on_page_locked(page, TASK_KILLABLE); return AOP_TRUNCATED_PAGE; } - error =3D __lock_page_async(page, iocb->ki_waitq); + error =3D __lock_folio_async(page_folio(page), iocb->ki_waitq); if (error) return error; } --=20 2.29.2