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=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 E4419C00A89 for ; Mon, 2 Nov 2020 18:44:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3DEA32231B for ; Mon, 2 Nov 2020 18:43:41 +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="hmQCHLP7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3DEA32231B 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 39A1D6B007D; Mon, 2 Nov 2020 13:43:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2721D6B0081; Mon, 2 Nov 2020 13:43:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9DFA6B0082; Mon, 2 Nov 2020 13:43:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0188.hostedemail.com [216.40.44.188]) by kanga.kvack.org (Postfix) with ESMTP id BC6C56B007E for ; Mon, 2 Nov 2020 13:43:30 -0500 (EST) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 64162180AD811 for ; Mon, 2 Nov 2020 18:43:30 +0000 (UTC) X-FDA: 77440351380.03.birth60_0a0dba0272b2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin03.hostedemail.com (Postfix) with ESMTP id 4002328A4EA for ; Mon, 2 Nov 2020 18:43:30 +0000 (UTC) X-HE-Tag: birth60_0a0dba0272b2 X-Filterd-Recvd-Size: 3910 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf37.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=QtHfrKT5xabd5uqtY4b+yuJs0ExznL5pKGwHYW5XBsc=; b=hmQCHLP7INmBJOug4JStsn+6kQ qxiTWM4ps8wndza/iHprPu2ivWO6Ls5OPS5QECPXXC47rAuETRmAD+B2pK+L/jBy9BI6q6g08yEMY nestnIFVn3wQ++JSHDD+Ur5/Plqdp9s92ekaXawKR1HaRkdPwnOlFTySrHxdckqq51jlhTmoCgJKj bKJscoW4lwPWfg8wIcNVWD6mjQYEl0wj9z/mRv0RR6bDrTNOBqUvjAUHGyHzy+WYFKOy2W5gFISpD tt96oWq6uUZ8VSDw0m/taZah8hm9IePKQWhq6IwvbPuxn8o48K3qCHzXM1IUvtTJU+tRS0KDnTWgf K07Agg8Q==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZenc-0006o3-5L; Mon, 02 Nov 2020 18:43:24 +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 11/17] mm/filemap: Add filemap_range_uptodate Date: Mon, 2 Nov 2020 18:43:06 +0000 Message-Id: <20201102184312.25926-12-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: Move the complicated condition and the calculations out of filemap_update_page() into its own function. --- mm/filemap.c | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 41b90243f4ee..81b569d818a3 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2228,11 +2228,39 @@ static int filemap_read_page(struct file *file, s= truct address_space *mapping, return error; } =20 +static bool filemap_range_uptodate(struct kiocb *iocb, + struct address_space *mapping, struct iov_iter *iter, + struct page *page) +{ + loff_t pos; + int count; + + if (PageUptodate(page)) + return true; + /* pipes can't handle partially uptodate pages */ + if (iov_iter_is_pipe(iter)) + return false; + if (!mapping->a_ops->is_partially_uptodate) + return false; + if (mapping->host->i_blkbits >=3D (PAGE_SHIFT + thp_order(page))) + return false; + + pos =3D (loff_t) page->index << PAGE_SHIFT; + if (pos > iocb->ki_pos) { + count =3D iocb->ki_pos + iter->count - pos; + pos =3D 0; + } else { + count =3D iter->count; + pos =3D iocb->ki_pos & (thp_size(page) - 1); + } + + return mapping->a_ops->is_partially_uptodate(page, pos, count); +} + 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, bool first) { - struct inode *inode =3D mapping->host; int error =3D -EAGAIN; =20 if (!trylock_page(page)) { @@ -2252,22 +2280,11 @@ static int filemap_update_page(struct kiocb *iocb= , =20 if (!page->mapping) goto truncated; - if (PageUptodate(page)) - goto uptodate; - if (inode->i_blkbits =3D=3D PAGE_SHIFT || - !mapping->a_ops->is_partially_uptodate) - goto readpage; - /* pipes can't handle partially uptodate pages */ - if (unlikely(iov_iter_is_pipe(iter))) - goto readpage; - if (!mapping->a_ops->is_partially_uptodate(page, - pos & (thp_size(page) - 1), count)) - goto readpage; -uptodate: - unlock_page(page); - return 0; + if (filemap_range_uptodate(iocb, mapping, iter, page)) { + unlock_page(page); + return 0; + } =20 -readpage: if (iocb->ki_flags & (IOCB_NOIO | IOCB_NOWAIT | IOCB_WAITQ)) { unlock_page(page); error =3D -EAGAIN; --=20 2.28.0