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 5270DC433E0 for ; Fri, 22 Jan 2021 16:11:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EABDD206F6 for ; Fri, 22 Jan 2021 16:11:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EABDD206F6 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 8C38C6B0022; Fri, 22 Jan 2021 11:11:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 872F56B0023; Fri, 22 Jan 2021 11:11:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7AF356B0024; Fri, 22 Jan 2021 11:11:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0032.hostedemail.com [216.40.44.32]) by kanga.kvack.org (Postfix) with ESMTP id 6546D6B0022 for ; Fri, 22 Jan 2021 11:11:38 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 29FC0181AF5C4 for ; Fri, 22 Jan 2021 16:11:38 +0000 (UTC) X-FDA: 77733901476.21.pipe80_540580a2756d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 8A939180220C9 for ; Fri, 22 Jan 2021 16:11:37 +0000 (UTC) X-HE-Tag: pipe80_540580a2756d X-Filterd-Recvd-Size: 3479 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Fri, 22 Jan 2021 16:11:36 +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=e1dqgx7QZzF3L8VaYSOlRMVWVBZcwhnmiE8oxge+DEQ=; b=t5K7WMmRr+FAuouatu6/DI/DdL iOgTBwpbWzuKJYr5nYFcCK0orqCF84qm96OLA2hhXMbJj2nAdWP1fkxIsKEWC6psFhcU8Pnqb+ihA HYWH8j9vaGAnuhMrGM6+YGtfs4ntdsemtIy5fiH1tjoXEuWYnFLFqoPhwA6s2UdV0s0cZYI/3TDQF Ut73yAgcU57TYv2tg67aS1ASBCmUlXXMOdYZ5v+gpCO42OCk7xEWrkbwuglriuBY2Atq/AiZcs86Q lYQhNbywBzeLvQvTjBqMMRjkyvN+16EsDBrHT6i+tszyv8SWiRyrDwqXzp2vEY4mpUM/KbD4UTAx4 pemeKiPQ==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l2z0m-000waS-3W; Fri, 22 Jan 2021 16:10:22 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Kent Overstreet , Christoph Hellwig Subject: [PATCH v5 12/18] mm/filemap: Move the iocb checks into filemap_update_page Date: Fri, 22 Jan 2021 16:01:34 +0000 Message-Id: <20210122160140.223228-13-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122160140.223228-1-willy@infradead.org> References: <20210122160140.223228-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 non-blocking request sees a !Uptodate pag= e. We may be able to satisfy the read from a partially-uptodate page. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Kent Overstreet Reviewed-by: Christoph Hellwig --- mm/filemap.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 469fc97659cb5..9fbfb27483147 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2253,15 +2253,16 @@ static int filemap_update_page(struct kiocb *iocb= , struct inode *inode =3D mapping->host; int error; =20 - if (iocb->ki_flags & IOCB_WAITQ) { - error =3D lock_page_async(page, iocb->ki_waitq); - if (error) - return error; - } else { - if (!trylock_page(page)) { + if (!trylock_page(page)) { + 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); return AOP_TRUNCATED_PAGE; } + error =3D __lock_page_async(page, iocb->ki_waitq); + if (error) + return error; } =20 if (!page->mapping) @@ -2379,14 +2380,9 @@ 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) && pvec->nr > 1)) { - put_page(page); - pvec->nr--; - err =3D -EAGAIN; - goto err; - } - + if ((iocb->ki_flags & IOCB_WAITQ) && + pagevec_count(pvec) > 1) + iocb->ki_flags |=3D IOCB_NOWAIT; err =3D filemap_update_page(iocb, mapping, iter, page, pg_pos, pg_count); if (err) { --=20 2.29.2