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.5 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 E5899C4742C for ; Mon, 2 Nov 2020 18:43:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 65C9E2225E for ; Mon, 2 Nov 2020 18:43:39 +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="fVkezwnW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65C9E2225E 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 0E90A6B007E; Mon, 2 Nov 2020 13:43:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 09B016B007D; Mon, 2 Nov 2020 13:43:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D1BE66B0081; Mon, 2 Nov 2020 13:43:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0199.hostedemail.com [216.40.44.199]) by kanga.kvack.org (Postfix) with ESMTP id 98EC36B007D for ; Mon, 2 Nov 2020 13:43:30 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 457751EF1 for ; Mon, 2 Nov 2020 18:43:30 +0000 (UTC) X-FDA: 77440351380.21.screw64_120b8ce272b2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 285AA180442C2 for ; Mon, 2 Nov 2020 18:43:30 +0000 (UTC) X-HE-Tag: screw64_120b8ce272b2 X-Filterd-Recvd-Size: 3468 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Mon, 2 Nov 2020 18:43:29 +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=C03/K9nEYgbV/HZHtBn1uLOW4rAEhplcjX1jRdnEKuo=; b=fVkezwnWaBuKXNmMRZUtxfEoWl +WfNm+ZKGxwivLIvpQWZqUqnSZb6avA0hoXOXnr5z2pMgjIQc/GBedx7PCh0UsE1OdA562v7iIfEs KmcLfDniuSqLqOKBH+xd1OZtCQdAGNq+GYQtSVQR9V0UCViL+lfRkglaFlhrTdBmykHkZDFgrBcFQ F0n5UTwsgzkpC9Wk7LGaR4VxjYyQTi0oRUevScTO5vP9eJVZ0L6Snk0Tp9C/FNrFXT4KO+o03Orkg Gb+sCY4N9xDs5ruJ05pgozFhtTQ2yXLXiy60R59hZGnLGhm2cRZllw/fVFq53EfIDJE0WJ+D3/tyt YohTeBhQ==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZenb-0006nZ-2W; Mon, 02 Nov 2020 18:43:23 +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 10/17] mm/filemap: Move the iocb checks into filemap_update_page Date: Mon, 2 Nov 2020 18:43:05 +0000 Message-Id: <20201102184312.25926-11-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201102184312.25926-1-willy@infradead.org> References: <20201102184312.25926-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: We don't need to give up when a special request sees a !Uptodate page. We may be able to satisfy the read from a partially-uptodate page. Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index ebb14fdec0cc..41b90243f4ee 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2230,17 +2230,21 @@ static int filemap_read_page(struct file *file, s= truct address_space *mapping, =20 static int filemap_update_page(struct kiocb *iocb, struct address_space *mapping, struct iov_iter *iter, - struct page *page, loff_t pos, loff_t count) + struct page *page, loff_t pos, loff_t count, bool first) { struct inode *inode =3D mapping->host; - int error; + int error =3D -EAGAIN; =20 - if (iocb->ki_flags & IOCB_WAITQ) { - error =3D lock_page_async(page, iocb->ki_waitq); - if (error) + if (!trylock_page(page)) { + if (iocb->ki_flags & (IOCB_NOWAIT | IOCB_NOIO)) goto error; - } else { - if (!trylock_page(page)) { + if (iocb->ki_flags & IOCB_WAITQ) { + if (!first) + goto error; + error =3D __lock_page_async(page, iocb->ki_waitq); + if (error) + goto error; + } else { put_and_wait_on_page_locked(page, TASK_KILLABLE); return AOP_TRUNCATED_PAGE; } @@ -2359,16 +2363,8 @@ static int filemap_get_pages(struct kiocb *iocb, s= truct iov_iter *iter, } =20 if (!PageUptodate(page)) { - if ((iocb->ki_flags & IOCB_NOWAIT) || - ((iocb->ki_flags & IOCB_WAITQ) && nr_got > 1)) { - put_page(page); - nr_got--; - err =3D -EAGAIN; - goto err; - } - err =3D filemap_update_page(iocb, mapping, iter, page, - pg_pos, pg_count); + pg_pos, pg_count, nr_got =3D=3D 1); if (err) nr_got--; } --=20 2.28.0