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=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 8DC8DC3B188 for ; Tue, 11 Feb 2020 01:04:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 33BBA20838 for ; Tue, 11 Feb 2020 01:04:12 +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="hZxZ5ibZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33BBA20838 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 131146B0209; Mon, 10 Feb 2020 20:03:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C475C6B020E; Mon, 10 Feb 2020 20:03:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9FEDA6B020F; Mon, 10 Feb 2020 20:03:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0141.hostedemail.com [216.40.44.141]) by kanga.kvack.org (Postfix) with ESMTP id 702EF6B020C for ; Mon, 10 Feb 2020 20:03:58 -0500 (EST) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 166CB441C for ; Tue, 11 Feb 2020 01:03:58 +0000 (UTC) X-FDA: 76476049356.15.cord74_57968b37e506 X-HE-Tag: cord74_57968b37e506 X-Filterd-Recvd-Size: 10232 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Tue, 11 Feb 2020 01:03:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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=1dXuDju5JRWmjlcVoAkP1ul1VTvdi0JVblEml7uSJoM=; b=hZxZ5ibZOjv0I1qiI+AVi2nTKK hpGcGwwYmWFWh3IFV0C+o6xy6XYDCbDiKdICPAUFsACd8DLFim6u+4PKkb1AeC/UFnJodx7iYBYNY MElmAvv8GXfKX8r5Q0oMHLTug2GeIbECLtIhOmQRNn/I5TScAukruDEAkaF63lFqv8wen/8i1+DzO qBOBRbB9k49a/i8nUdpTX0AJsQ83C/6mXxGYVrHx19o/glQZ65+r8/HSelaCzn5KU5XwED/RdFLZZ 3wHeWBmq4ICEEZ+jlotpOi7t90K4Fl+rI13KnEOCivMxLwdMFWWetARJP2YV83XNXfRIP4sUNL/Vu 5idhh80w==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j1Jxu-0001oT-Nw; Tue, 11 Feb 2020 01:03:50 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, ocfs2-devel@oss.oracle.com, linux-xfs@vger.kernel.org Subject: [PATCH v5 13/13] iomap: Convert from readpages to readahead Date: Mon, 10 Feb 2020 17:03:48 -0800 Message-Id: <20200211010348.6872-14-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200211010348.6872-1-willy@infradead.org> References: <20200211010348.6872-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: From: "Matthew Wilcox (Oracle)" Use the new readahead operation in iomap. Convert XFS and ZoneFS to use it. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 101 ++++++++++++----------------------------- fs/iomap/trace.h | 2 +- fs/xfs/xfs_aops.c | 13 ++---- fs/zonefs/super.c | 7 ++- include/linux/iomap.h | 3 +- 5 files changed, 39 insertions(+), 87 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index cb3511eb152a..e40eb45230fa 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -214,9 +214,8 @@ iomap_read_end_io(struct bio *bio) struct iomap_readpage_ctx { struct page *cur_page; bool cur_page_in_bio; - bool is_readahead; struct bio *bio; - struct list_head *pages; + struct readahead_control *rac; }; =20 static void @@ -307,11 +306,11 @@ iomap_readpage_actor(struct inode *inode, loff_t po= s, loff_t length, void *data, if (ctx->bio) submit_bio(ctx->bio); =20 - if (ctx->is_readahead) /* same as readahead_gfp_mask */ + if (ctx->rac) /* same as readahead_gfp_mask */ gfp |=3D __GFP_NORETRY | __GFP_NOWARN; ctx->bio =3D bio_alloc(gfp, min(BIO_MAX_PAGES, nr_vecs)); ctx->bio->bi_opf =3D REQ_OP_READ; - if (ctx->is_readahead) + if (ctx->rac) ctx->bio->bi_opf |=3D REQ_RAHEAD; ctx->bio->bi_iter.bi_sector =3D sector; bio_set_dev(ctx->bio, iomap->bdev); @@ -367,104 +366,62 @@ iomap_readpage(struct page *page, const struct iom= ap_ops *ops) } EXPORT_SYMBOL_GPL(iomap_readpage); =20 -static struct page * -iomap_next_page(struct inode *inode, struct list_head *pages, loff_t pos= , - loff_t length, loff_t *done) -{ - while (!list_empty(pages)) { - struct page *page =3D lru_to_page(pages); - - if (page_offset(page) >=3D (u64)pos + length) - break; - - list_del(&page->lru); - if (!add_to_page_cache_lru(page, inode->i_mapping, page->index, - GFP_NOFS)) - return page; - - /* - * If we already have a page in the page cache at index we are - * done. Upper layers don't care if it is uptodate after the - * readpages call itself as every page gets checked again once - * actually needed. - */ - *done +=3D PAGE_SIZE; - put_page(page); - } - - return NULL; -} - static loff_t -iomap_readpages_actor(struct inode *inode, loff_t pos, loff_t length, +iomap_readahead_actor(struct inode *inode, loff_t pos, loff_t length, void *data, struct iomap *iomap, struct iomap *srcmap) { struct iomap_readpage_ctx *ctx =3D data; - loff_t done, ret; + loff_t ret, done =3D 0; =20 - for (done =3D 0; done < length; done +=3D ret) { - if (ctx->cur_page && offset_in_page(pos + done) =3D=3D 0) { - if (!ctx->cur_page_in_bio) - unlock_page(ctx->cur_page); - put_page(ctx->cur_page); - ctx->cur_page =3D NULL; - } + while (done < length) { if (!ctx->cur_page) { - ctx->cur_page =3D iomap_next_page(inode, ctx->pages, - pos, length, &done); - if (!ctx->cur_page) - break; + ctx->cur_page =3D readahead_page(ctx->rac); ctx->cur_page_in_bio =3D false; } ret =3D iomap_readpage_actor(inode, pos + done, length - done, ctx, iomap, srcmap); + if (WARN_ON(ret =3D=3D 0)) + break; + done +=3D ret; + if (offset_in_page(pos + done) =3D=3D 0) { + ctx->rac->nr_pages -=3D ctx->rac->batch_count; + if (!ctx->cur_page_in_bio) + unlock_page(ctx->cur_page); + put_page(ctx->cur_page); + ctx->cur_page =3D NULL; + } } =20 return done; } =20 -int -iomap_readpages(struct address_space *mapping, struct list_head *pages, - unsigned nr_pages, const struct iomap_ops *ops) +void iomap_readahead(struct readahead_control *rac, const struct iomap_o= ps *ops) { + struct inode *inode =3D rac->mapping->host; struct iomap_readpage_ctx ctx =3D { - .pages =3D pages, - .is_readahead =3D true, + .rac =3D rac, }; - loff_t pos =3D page_offset(list_entry(pages->prev, struct page, lru)); - loff_t last =3D page_offset(list_entry(pages->next, struct page, lru)); - loff_t length =3D last - pos + PAGE_SIZE, ret =3D 0; + loff_t pos =3D readahead_offset(rac); + loff_t length =3D readahead_length(rac); =20 - trace_iomap_readpages(mapping->host, nr_pages); + trace_iomap_readahead(inode, readahead_count(rac)); =20 while (length > 0) { - ret =3D iomap_apply(mapping->host, pos, length, 0, ops, - &ctx, iomap_readpages_actor); + loff_t ret =3D iomap_apply(inode, pos, length, 0, ops, + &ctx, iomap_readahead_actor); if (ret <=3D 0) { WARN_ON_ONCE(ret =3D=3D 0); - goto done; + break; } pos +=3D ret; length -=3D ret; } - ret =3D 0; -done: + if (ctx.bio) submit_bio(ctx.bio); - if (ctx.cur_page) { - if (!ctx.cur_page_in_bio) - unlock_page(ctx.cur_page); - put_page(ctx.cur_page); - } - - /* - * Check that we didn't lose a page due to the arcance calling - * conventions.. - */ - WARN_ON_ONCE(!ret && !list_empty(ctx.pages)); - return ret; + BUG_ON(ctx.cur_page); } -EXPORT_SYMBOL_GPL(iomap_readpages); +EXPORT_SYMBOL_GPL(iomap_readahead); =20 /* * iomap_is_partially_uptodate checks whether blocks within a page are diff --git a/fs/iomap/trace.h b/fs/iomap/trace.h index 6dc227b8c47e..d6ba705f938a 100644 --- a/fs/iomap/trace.h +++ b/fs/iomap/trace.h @@ -39,7 +39,7 @@ DEFINE_EVENT(iomap_readpage_class, name, \ TP_PROTO(struct inode *inode, int nr_pages), \ TP_ARGS(inode, nr_pages)) DEFINE_READPAGE_EVENT(iomap_readpage); -DEFINE_READPAGE_EVENT(iomap_readpages); +DEFINE_READPAGE_EVENT(iomap_readahead); =20 DECLARE_EVENT_CLASS(iomap_page_class, TP_PROTO(struct inode *inode, struct page *page, unsigned long off, diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 3a688eb5c5ae..0897dd71c622 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -621,14 +621,11 @@ xfs_vm_readpage( return iomap_readpage(page, &xfs_read_iomap_ops); } =20 -STATIC int -xfs_vm_readpages( - struct file *unused, - struct address_space *mapping, - struct list_head *pages, - unsigned nr_pages) +STATIC void +xfs_vm_readahead( + struct readahead_control *rac) { - return iomap_readpages(mapping, pages, nr_pages, &xfs_read_iomap_ops); + iomap_readahead(rac, &xfs_read_iomap_ops); } =20 static int @@ -644,7 +641,7 @@ xfs_iomap_swapfile_activate( =20 const struct address_space_operations xfs_address_space_operations =3D { .readpage =3D xfs_vm_readpage, - .readpages =3D xfs_vm_readpages, + .readahead =3D xfs_vm_readahead, .writepage =3D xfs_vm_writepage, .writepages =3D xfs_vm_writepages, .set_page_dirty =3D iomap_set_page_dirty, diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c index 8bc6ef82d693..8327a01d3bac 100644 --- a/fs/zonefs/super.c +++ b/fs/zonefs/super.c @@ -78,10 +78,9 @@ static int zonefs_readpage(struct file *unused, struct= page *page) return iomap_readpage(page, &zonefs_iomap_ops); } =20 -static int zonefs_readpages(struct file *unused, struct address_space *m= apping, - struct list_head *pages, unsigned int nr_pages) +static void zonefs_readahead(struct readahead_control *rac) { - return iomap_readpages(mapping, pages, nr_pages, &zonefs_iomap_ops); + iomap_readahead(rac, &zonefs_iomap_ops); } =20 /* @@ -128,7 +127,7 @@ static int zonefs_writepages(struct address_space *ma= pping, =20 static const struct address_space_operations zonefs_file_aops =3D { .readpage =3D zonefs_readpage, - .readpages =3D zonefs_readpages, + .readahead =3D zonefs_readahead, .writepage =3D zonefs_writepage, .writepages =3D zonefs_writepages, .set_page_dirty =3D iomap_set_page_dirty, diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 8b09463dae0d..bc20bd04c2a2 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -155,8 +155,7 @@ loff_t iomap_apply(struct inode *inode, loff_t pos, l= off_t length, ssize_t iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *f= rom, const struct iomap_ops *ops); int iomap_readpage(struct page *page, const struct iomap_ops *ops); -int iomap_readpages(struct address_space *mapping, struct list_head *pag= es, - unsigned nr_pages, const struct iomap_ops *ops); +void iomap_readahead(struct readahead_control *, const struct iomap_ops = *ops); int iomap_set_page_dirty(struct page *page); int iomap_is_partially_uptodate(struct page *page, unsigned long from, unsigned long count); --=20 2.25.0