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 7D943C4742C for ; Sat, 31 Oct 2020 09:08:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1749220756 for ; Sat, 31 Oct 2020 09:08:52 +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="aHmhXJQy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1749220756 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6B27C6B0036; Sat, 31 Oct 2020 05:08:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 661916B005C; Sat, 31 Oct 2020 05:08:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 52A186B005D; Sat, 31 Oct 2020 05:08:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0055.hostedemail.com [216.40.44.55]) by kanga.kvack.org (Postfix) with ESMTP id 26E556B0036 for ; Sat, 31 Oct 2020 05:08:52 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id BA585824999B for ; Sat, 31 Oct 2020 09:08:51 +0000 (UTC) X-FDA: 77431645662.16.shame79_420c2382729d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id 9F3E2100E690B for ; Sat, 31 Oct 2020 09:08:51 +0000 (UTC) X-HE-Tag: shame79_420c2382729d X-Filterd-Recvd-Size: 3849 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Sat, 31 Oct 2020 09:08:51 +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=UxcF/Ax2nIsVuoOm9+YumDdpvKlA4H0xkbAmouFAhOA=; b=aHmhXJQyVf83IvaSThL0uw53Xa UmNpYdK6al5Ok6nYbchIvi6srQB0Z+FrFJcPIOQcP/CnIaoZQkUnMe9p2+iKY8w35hngJVxxp0vxu 7riidozLH7iTOKdPbsdO2AecTS3dITLRPBXXh53R84ejFPEeyyk/4/dsFEfQtrZpyp49bOliRN/Bl 0pk5FOCFlp+gBb1stKHECalKwzfZHr9AQlMizKl1S9YW/BUJnf29vPyuafFEQN3z3WGWcSU7Hs0SQ CogmEjYvCe/Qd/TsBFrBrSl+0ZjwUWm8d4yREDfWzAwf+E547rd+XjAp0rL6Ur6NkYue4QS44pxCw xXm4HvMw==; Received: from 089144193201.atnat0002.highway.a1.net ([89.144.193.201] helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYmsR-0007Lg-O6; Sat, 31 Oct 2020 09:08:48 +0000 From: Christoph Hellwig To: Andrew Morton Cc: Kent Overstreet , Matthew Wilcox , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 03/13] mm: lift the nowait checks into generic_file_buffered_read_pagenotuptodate Date: Sat, 31 Oct 2020 09:59:54 +0100 Message-Id: <20201031090004.452516-4-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201031090004.452516-1-hch@lst.de> References: <20201031090004.452516-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html 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: Move the checks for IOCB_NOWAIT and IOCB_WAITQ from the only caller into generic_file_buffered_read_pagenotuptodate, which simplifies the error unwinding. Signed-off-by: Christoph Hellwig --- mm/filemap.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index c717cfe35cc72a..bae5b905aa7bdc 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2219,19 +2219,22 @@ static int filemap_readpage(struct kiocb *iocb, s= truct page *page) =20 static int generic_file_buffered_read_pagenotuptodate(struct kiocb *iocb= , struct iov_iter *iter, struct page *page, loff_t pos, - loff_t count) + loff_t count, bool first) { struct address_space *mapping =3D iocb->ki_filp->f_mapping; - int error; + int error =3D -EAGAIN; + + if (iocb->ki_flags & IOCB_NOWAIT) + goto put_page; =20 /* - * See comment in do_read_cache_page on why - * wait_on_page_locked is used to avoid unnecessarily - * serialisations and why it's safe. + * See comment in do_read_cache_page on why wait_on_page_locked is used + * to avoid unnecessarily serialisations and why it's safe. */ if (iocb->ki_flags & IOCB_WAITQ) { - error =3D wait_on_page_locked_async(page, - iocb->ki_waitq); + if (!first) + goto put_page; + error =3D wait_on_page_locked_async(page, iocb->ki_waitq); } else { error =3D wait_on_page_locked_killable(page); } @@ -2376,17 +2379,8 @@ static int generic_file_buffered_read_get_pages(st= ruct kiocb *iocb, } =20 if (!PageUptodate(page)) { - if ((iocb->ki_flags & IOCB_NOWAIT) || - ((iocb->ki_flags & IOCB_WAITQ) && i)) { - for (j =3D i; j < nr_got; j++) - put_page(pages[j]); - nr_got =3D i; - err =3D -EAGAIN; - break; - } - err =3D generic_file_buffered_read_pagenotuptodate(iocb, - iter, page, pg_pos, pg_count); + iter, page, pg_pos, pg_count, i =3D=3D 0); if (err) { if (err =3D=3D AOP_TRUNCATED_PAGE) err =3D 0; --=20 2.28.0