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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 80E04C5517A for ; Tue, 10 Nov 2020 03:37:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0098C206E3 for ; Tue, 10 Nov 2020 03:37:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="Rog97bTF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0098C206E3 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 74B106B0071; Mon, 9 Nov 2020 22:37:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D35F6B0072; Mon, 9 Nov 2020 22:37:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 59C546B0074; Mon, 9 Nov 2020 22:37:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0130.hostedemail.com [216.40.44.130]) by kanga.kvack.org (Postfix) with ESMTP id 285216B0072 for ; Mon, 9 Nov 2020 22:37:14 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id C26461EE6 for ; Tue, 10 Nov 2020 03:37:13 +0000 (UTC) X-FDA: 77467097946.11.stick88_110c592272f1 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id A5154180F8B80 for ; Tue, 10 Nov 2020 03:37:13 +0000 (UTC) X-HE-Tag: stick88_110c592272f1 X-Filterd-Recvd-Size: 3328 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Tue, 10 Nov 2020 03:37:13 +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=zLlWyCMf31hyFifs0hzr1y9FHea3KxcZRxU6ykAetmA=; b=Rog97bTF/Qc3jcj36Q4fpocJHb LkVRzaE5JlmDBt8zoWpQfJ367lAGIXsOFDR1ygaWS3bmr2PttrkJpFLnVjf31SIaHrG2Wt8fUQpdC d1LHT/DnhMs3ogo2VxFxU2epe17U7DrdNTe47IiykSi0TvNgIWhoTCcRC+RqyEJQEps/U3XPHwkzB Kbmb6fkASTL9qBnR9KWZSWSdaJxlX4dBuvsQsvdT8ySneRAjhUPAsYshArkaUfV5Ygk3hNJkwL0vf b/YgLQbDKNL7yUdYUAzB1xqKzh3QUMn8OhiMTIL7l0rax/QYtnf0rDKAbnq06F6k4xUGDnKz30oDt SjQHSNUA==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcKSz-00065K-Fu; Tue, 10 Nov 2020 03:37:09 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hch@lst.de, kent.overstreet@gmail.com Subject: [PATCH v3 08/18] mm/filemap: Don't call ->readpage if IOCB_WAITQ is set Date: Tue, 10 Nov 2020 03:36:53 +0000 Message-Id: <20201110033703.23261-9-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201110033703.23261-1-willy@infradead.org> References: <20201110033703.23261-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: The readpage operation can block in many (most?) filesystems, so we should punt to a work queue instead of calling it. This was the last caller of lock_page_for_iocb(), so remove it. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Kent Overstreet Reviewed-by: Christoph Hellwig --- mm/filemap.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 2d8b31a31a7b..3e2994a84a81 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2152,16 +2152,6 @@ static void shrink_readahead_size_eio(struct file_= ra_state *ra) ra->ra_pages /=3D 4; } =20 -static int lock_page_for_iocb(struct kiocb *iocb, struct page *page) -{ - if (iocb->ki_flags & IOCB_WAITQ) - return lock_page_async(page, iocb->ki_waitq); - else if (iocb->ki_flags & IOCB_NOWAIT) - return trylock_page(page) ? 0 : -EAGAIN; - else - return lock_page_killable(page); -} - /* * filemap_get_read_batch - Get a batch of pages for read * @@ -2213,7 +2203,7 @@ static struct page *filemap_read_page(struct kiocb = *iocb, struct file *filp, struct file_ra_state *ra =3D &filp->f_ra; int error; =20 - if (iocb->ki_flags & (IOCB_NOIO | IOCB_NOWAIT)) { + if (iocb->ki_flags & (IOCB_NOIO | IOCB_NOWAIT | IOCB_WAITQ)) { unlock_page(page); put_page(page); return ERR_PTR(-EAGAIN); @@ -2234,7 +2224,7 @@ static struct page *filemap_read_page(struct kiocb = *iocb, struct file *filp, } =20 if (!PageUptodate(page)) { - error =3D lock_page_for_iocb(iocb, page); + error =3D lock_page_killable(page); if (unlikely(error)) { put_page(page); return ERR_PTR(error); --=20 2.28.0