From: Christoph Hellwig <hch@lst.de> To: "Darrick J. Wong" <djwong@kernel.org> Cc: Dan Williams <dan.j.williams@intel.com>, Matthew Wilcox <willy@infradead.org>, Andreas Gruenbacher <agruenba@redhat.com>, Shiyang Ruan <ruansy.fnst@fujitsu.com>, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org, nvdimm@lists.linux.dev, cluster-devel@redhat.com Subject: [PATCH 09/27] iomap: switch readahead and readpage to use iomap_iter Date: Mon, 19 Jul 2021 12:35:02 +0200 [thread overview] Message-ID: <20210719103520.495450-10-hch@lst.de> (raw) In-Reply-To: <20210719103520.495450-1-hch@lst.de> Switch the page cache read functions to use iomap_iter instead of iomap_apply. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/iomap/buffered-io.c | 79 +++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 43 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 8c26cf7cbd72b0..3b18cafa72bec6 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -234,11 +234,12 @@ static inline bool iomap_block_needs_zeroing(struct inode *inode, pos >= i_size_read(inode); } -static loff_t -iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, - struct iomap *iomap, struct iomap *srcmap) +static loff_t iomap_readpage_iter(struct iomap_iter *iter, + struct iomap_readpage_ctx *ctx, loff_t offset) { - struct iomap_readpage_ctx *ctx = data; + struct iomap *iomap = &iter->iomap; + loff_t pos = iter->pos + offset; + loff_t length = iomap_length(iter) - offset; struct page *page = ctx->cur_page; struct iomap_page *iop; bool same_page = false, is_contig = false; @@ -248,17 +249,17 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, if (iomap->type == IOMAP_INLINE) { WARN_ON_ONCE(pos); - iomap_read_inline_data(inode, page, iomap); + iomap_read_inline_data(iter->inode, page, iomap); return PAGE_SIZE; } /* zero post-eof blocks as the page may be mapped */ - iop = iomap_page_create(inode, page); - iomap_adjust_read_range(inode, iop, &pos, length, &poff, &plen); + iop = iomap_page_create(iter->inode, page); + iomap_adjust_read_range(iter->inode, iop, &pos, length, &poff, &plen); if (plen == 0) goto done; - if (iomap_block_needs_zeroing(inode, iomap, pos)) { + if (iomap_block_needs_zeroing(iter->inode, iomap, pos)) { zero_user(page, poff, plen); iomap_set_range_uptodate(page, poff, plen); goto done; @@ -317,23 +318,23 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, int iomap_readpage(struct page *page, const struct iomap_ops *ops) { - struct iomap_readpage_ctx ctx = { .cur_page = page }; - struct inode *inode = page->mapping->host; - unsigned poff; - loff_t ret; + struct iomap_iter iter = { + .inode = page->mapping->host, + .pos = page_offset(page), + .len = PAGE_SIZE, + }; + struct iomap_readpage_ctx ctx = { + .cur_page = page, + }; + int ret; trace_iomap_readpage(page->mapping->host, 1); - for (poff = 0; poff < PAGE_SIZE; poff += ret) { - ret = iomap_apply(inode, page_offset(page) + poff, - PAGE_SIZE - poff, 0, ops, &ctx, - iomap_readpage_actor); - if (ret <= 0) { - WARN_ON_ONCE(ret == 0); - SetPageError(page); - break; - } - } + while ((ret = iomap_iter(&iter, ops)) > 0) + iter.processed = iomap_readpage_iter(&iter, &ctx, 0); + + if (ret < 0) + SetPageError(page); if (ctx.bio) { submit_bio(ctx.bio); @@ -352,15 +353,14 @@ iomap_readpage(struct page *page, const struct iomap_ops *ops) } EXPORT_SYMBOL_GPL(iomap_readpage); -static loff_t -iomap_readahead_actor(struct inode *inode, loff_t pos, loff_t length, - void *data, struct iomap *iomap, struct iomap *srcmap) +static loff_t iomap_readahead_iter(struct iomap_iter *iter, + struct iomap_readpage_ctx *ctx) { - struct iomap_readpage_ctx *ctx = data; + loff_t length = iomap_length(iter); loff_t done, ret; for (done = 0; done < length; done += ret) { - if (ctx->cur_page && offset_in_page(pos + done) == 0) { + if (ctx->cur_page && offset_in_page(iter->pos + done) == 0) { if (!ctx->cur_page_in_bio) unlock_page(ctx->cur_page); put_page(ctx->cur_page); @@ -370,8 +370,7 @@ iomap_readahead_actor(struct inode *inode, loff_t pos, loff_t length, ctx->cur_page = readahead_page(ctx->rac); ctx->cur_page_in_bio = false; } - ret = iomap_readpage_actor(inode, pos + done, length - done, - ctx, iomap, srcmap); + ret = iomap_readpage_iter(iter, ctx, done); } return done; @@ -394,25 +393,19 @@ iomap_readahead_actor(struct inode *inode, loff_t pos, loff_t length, */ void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops) { - struct inode *inode = rac->mapping->host; - loff_t pos = readahead_pos(rac); - size_t length = readahead_length(rac); + struct iomap_iter iter = { + .inode = rac->mapping->host, + .pos = readahead_pos(rac), + .len = readahead_length(rac), + }; struct iomap_readpage_ctx ctx = { .rac = rac, }; - trace_iomap_readahead(inode, readahead_count(rac)); + trace_iomap_readahead(rac->mapping->host, readahead_count(rac)); - while (length > 0) { - ssize_t ret = iomap_apply(inode, pos, length, 0, ops, - &ctx, iomap_readahead_actor); - if (ret <= 0) { - WARN_ON_ONCE(ret == 0); - break; - } - pos += ret; - length -= ret; - } + while (iomap_iter(&iter, ops) > 0) + iter.processed = iomap_readahead_iter(&iter, &ctx); if (ctx.bio) submit_bio(ctx.bio); -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: cluster-devel.redhat.com Subject: [Cluster-devel] [PATCH 09/27] iomap: switch readahead and readpage to use iomap_iter Date: Mon, 19 Jul 2021 12:35:02 +0200 [thread overview] Message-ID: <20210719103520.495450-10-hch@lst.de> (raw) In-Reply-To: <20210719103520.495450-1-hch@lst.de> Switch the page cache read functions to use iomap_iter instead of iomap_apply. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/iomap/buffered-io.c | 79 +++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 43 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 8c26cf7cbd72b0..3b18cafa72bec6 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -234,11 +234,12 @@ static inline bool iomap_block_needs_zeroing(struct inode *inode, pos >= i_size_read(inode); } -static loff_t -iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, - struct iomap *iomap, struct iomap *srcmap) +static loff_t iomap_readpage_iter(struct iomap_iter *iter, + struct iomap_readpage_ctx *ctx, loff_t offset) { - struct iomap_readpage_ctx *ctx = data; + struct iomap *iomap = &iter->iomap; + loff_t pos = iter->pos + offset; + loff_t length = iomap_length(iter) - offset; struct page *page = ctx->cur_page; struct iomap_page *iop; bool same_page = false, is_contig = false; @@ -248,17 +249,17 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, if (iomap->type == IOMAP_INLINE) { WARN_ON_ONCE(pos); - iomap_read_inline_data(inode, page, iomap); + iomap_read_inline_data(iter->inode, page, iomap); return PAGE_SIZE; } /* zero post-eof blocks as the page may be mapped */ - iop = iomap_page_create(inode, page); - iomap_adjust_read_range(inode, iop, &pos, length, &poff, &plen); + iop = iomap_page_create(iter->inode, page); + iomap_adjust_read_range(iter->inode, iop, &pos, length, &poff, &plen); if (plen == 0) goto done; - if (iomap_block_needs_zeroing(inode, iomap, pos)) { + if (iomap_block_needs_zeroing(iter->inode, iomap, pos)) { zero_user(page, poff, plen); iomap_set_range_uptodate(page, poff, plen); goto done; @@ -317,23 +318,23 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, int iomap_readpage(struct page *page, const struct iomap_ops *ops) { - struct iomap_readpage_ctx ctx = { .cur_page = page }; - struct inode *inode = page->mapping->host; - unsigned poff; - loff_t ret; + struct iomap_iter iter = { + .inode = page->mapping->host, + .pos = page_offset(page), + .len = PAGE_SIZE, + }; + struct iomap_readpage_ctx ctx = { + .cur_page = page, + }; + int ret; trace_iomap_readpage(page->mapping->host, 1); - for (poff = 0; poff < PAGE_SIZE; poff += ret) { - ret = iomap_apply(inode, page_offset(page) + poff, - PAGE_SIZE - poff, 0, ops, &ctx, - iomap_readpage_actor); - if (ret <= 0) { - WARN_ON_ONCE(ret == 0); - SetPageError(page); - break; - } - } + while ((ret = iomap_iter(&iter, ops)) > 0) + iter.processed = iomap_readpage_iter(&iter, &ctx, 0); + + if (ret < 0) + SetPageError(page); if (ctx.bio) { submit_bio(ctx.bio); @@ -352,15 +353,14 @@ iomap_readpage(struct page *page, const struct iomap_ops *ops) } EXPORT_SYMBOL_GPL(iomap_readpage); -static loff_t -iomap_readahead_actor(struct inode *inode, loff_t pos, loff_t length, - void *data, struct iomap *iomap, struct iomap *srcmap) +static loff_t iomap_readahead_iter(struct iomap_iter *iter, + struct iomap_readpage_ctx *ctx) { - struct iomap_readpage_ctx *ctx = data; + loff_t length = iomap_length(iter); loff_t done, ret; for (done = 0; done < length; done += ret) { - if (ctx->cur_page && offset_in_page(pos + done) == 0) { + if (ctx->cur_page && offset_in_page(iter->pos + done) == 0) { if (!ctx->cur_page_in_bio) unlock_page(ctx->cur_page); put_page(ctx->cur_page); @@ -370,8 +370,7 @@ iomap_readahead_actor(struct inode *inode, loff_t pos, loff_t length, ctx->cur_page = readahead_page(ctx->rac); ctx->cur_page_in_bio = false; } - ret = iomap_readpage_actor(inode, pos + done, length - done, - ctx, iomap, srcmap); + ret = iomap_readpage_iter(iter, ctx, done); } return done; @@ -394,25 +393,19 @@ iomap_readahead_actor(struct inode *inode, loff_t pos, loff_t length, */ void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops) { - struct inode *inode = rac->mapping->host; - loff_t pos = readahead_pos(rac); - size_t length = readahead_length(rac); + struct iomap_iter iter = { + .inode = rac->mapping->host, + .pos = readahead_pos(rac), + .len = readahead_length(rac), + }; struct iomap_readpage_ctx ctx = { .rac = rac, }; - trace_iomap_readahead(inode, readahead_count(rac)); + trace_iomap_readahead(rac->mapping->host, readahead_count(rac)); - while (length > 0) { - ssize_t ret = iomap_apply(inode, pos, length, 0, ops, - &ctx, iomap_readahead_actor); - if (ret <= 0) { - WARN_ON_ONCE(ret == 0); - break; - } - pos += ret; - length -= ret; - } + while (iomap_iter(&iter, ops) > 0) + iter.processed = iomap_readahead_iter(&iter, &ctx); if (ctx.bio) submit_bio(ctx.bio); -- 2.30.2
next prev parent reply other threads:[~2021-07-19 10:47 UTC|newest] Thread overview: 117+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-19 10:34 RFC: switch iomap to an iterator model Christoph Hellwig 2021-07-19 10:34 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:34 ` [PATCH 01/27] iomap: fix a trivial comment typo in trace.h Christoph Hellwig 2021-07-19 10:34 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 16:00 ` Darrick J. Wong 2021-07-19 16:00 ` [Cluster-devel] " Darrick J. Wong 2021-07-19 10:34 ` [PATCH 02/27] iomap: remove the iomap arguments to ->page_{prepare,done} Christoph Hellwig 2021-07-19 10:34 ` [Cluster-devel] [PATCH 02/27] iomap: remove the iomap arguments to ->page_{prepare, done} Christoph Hellwig 2021-07-19 16:04 ` [PATCH 02/27] iomap: remove the iomap arguments to ->page_{prepare,done} Darrick J. Wong 2021-07-19 16:04 ` [Cluster-devel] [PATCH 02/27] iomap: remove the iomap arguments to ->page_{prepare, done} Darrick J. Wong 2021-07-19 10:34 ` [PATCH 03/27] iomap: mark the iomap argument to iomap_sector const Christoph Hellwig 2021-07-19 10:34 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 16:08 ` Darrick J. Wong 2021-07-19 16:08 ` [Cluster-devel] " Darrick J. Wong 2021-07-20 9:52 ` Nikolay Borisov 2021-07-20 9:52 ` [Cluster-devel] " Nikolay Borisov 2021-07-26 8:12 ` Christoph Hellwig 2021-07-26 8:12 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:34 ` [PATCH 04/27] fs: mark the iomap argument to __block_write_begin_int const Christoph Hellwig 2021-07-19 10:34 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 17:35 ` Darrick J. Wong 2021-07-19 17:35 ` [Cluster-devel] " Darrick J. Wong 2021-07-19 10:34 ` [PATCH 05/27] fsdax: mark the iomap argument to dax_iomap_sector as const Christoph Hellwig 2021-07-19 10:34 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 17:35 ` Darrick J. Wong 2021-07-19 17:35 ` [Cluster-devel] " Darrick J. Wong 2021-07-19 10:34 ` [PATCH 06/27] iomap: mark the iomap argument to iomap_read_inline_data const Christoph Hellwig 2021-07-19 10:34 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 17:35 ` Darrick J. Wong 2021-07-19 17:35 ` [Cluster-devel] " Darrick J. Wong 2021-07-19 10:35 ` [PATCH 07/27] iomap: mark the iomap argument to iomap_read_page_sync const Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 17:35 ` Darrick J. Wong 2021-07-19 17:35 ` [Cluster-devel] " Darrick J. Wong 2021-07-19 10:35 ` [PATCH 08/27] iomap: add the new iomap_iter model Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 16:56 ` Darrick J. Wong 2021-07-19 16:56 ` [Cluster-devel] " Darrick J. Wong 2021-07-26 8:15 ` Christoph Hellwig 2021-07-26 8:15 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 21:48 ` Dave Chinner 2021-07-19 21:48 ` [Cluster-devel] " Dave Chinner 2021-07-26 8:17 ` Christoph Hellwig 2021-07-26 8:17 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:35 ` Christoph Hellwig [this message] 2021-07-19 10:35 ` [Cluster-devel] [PATCH 09/27] iomap: switch readahead and readpage to use iomap_iter Christoph Hellwig 2021-07-19 10:35 ` [PATCH 10/27] iomap: switch iomap_file_buffered_write " Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:35 ` [PATCH 11/27] iomap: switch iomap_file_unshare " Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:35 ` [PATCH 12/27] iomap: switch iomap_zero_range " Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:35 ` [PATCH 13/27] iomap: switch iomap_page_mkwrite " Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:35 ` [PATCH 14/27] iomap: switch __iomap_dio_rw " Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:35 ` [PATCH 15/27] iomap: switch iomap_fiemap " Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:35 ` [PATCH 16/27] iomap: switch iomap_bmap " Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 17:05 ` Darrick J. Wong 2021-07-19 17:05 ` [Cluster-devel] " Darrick J. Wong 2021-07-26 8:19 ` Christoph Hellwig 2021-07-26 8:19 ` [Cluster-devel] " Christoph Hellwig 2021-07-26 16:39 ` Darrick J. Wong 2021-07-26 16:39 ` [Cluster-devel] " Darrick J. Wong 2021-07-27 6:31 ` Christoph Hellwig 2021-07-27 6:31 ` [Cluster-devel] " Christoph Hellwig 2021-07-27 14:32 ` Darrick J. Wong 2021-07-27 14:32 ` [Cluster-devel] " Darrick J. Wong 2021-07-19 10:35 ` [PATCH 17/27] iomap: switch iomap_seek_hole " Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 17:22 ` Darrick J. Wong 2021-07-19 17:22 ` [Cluster-devel] " Darrick J. Wong 2021-07-26 8:22 ` Christoph Hellwig 2021-07-26 8:22 ` [Cluster-devel] " Christoph Hellwig 2021-07-26 16:41 ` Darrick J. Wong 2021-07-26 16:41 ` [Cluster-devel] " Darrick J. Wong 2021-07-19 10:35 ` [PATCH 18/27] iomap: switch iomap_seek_data " Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:35 ` [PATCH 19/27] iomap: switch iomap_swapfile_activate " Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:35 ` [PATCH 20/27] fsdax: switch dax_iomap_rw " Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 22:10 ` Dave Chinner 2021-07-19 22:10 ` [Cluster-devel] " Dave Chinner 2021-07-26 8:25 ` Christoph Hellwig 2021-07-26 8:25 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:35 ` [PATCH 21/27] iomap: remove iomap_apply Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 17:48 ` Darrick J. Wong 2021-07-19 17:48 ` [Cluster-devel] " Darrick J. Wong 2021-07-19 10:35 ` [PATCH 22/27] iomap: pass an iomap_iter to various buffered I/O helpers Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 17:48 ` Darrick J. Wong 2021-07-19 17:48 ` [Cluster-devel] " Darrick J. Wong 2021-07-19 10:35 ` [PATCH 23/27] iomap: rework unshare flag Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 17:44 ` Darrick J. Wong 2021-07-19 17:44 ` [Cluster-devel] " Darrick J. Wong 2021-07-19 10:35 ` [PATCH 24/27] fsdax: factor out helpers to simplify the dax fault code Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:35 ` [PATCH 25/27] fsdax: factor out a dax_fault_actor() helper Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 10:35 ` [PATCH 26/27] fsdax: switch the fault handlers to use iomap_iter Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 17:35 ` Darrick J. Wong 2021-07-19 17:35 ` [Cluster-devel] " Darrick J. Wong 2021-07-19 10:35 ` [PATCH 27/27] iomap: constify iomap_iter_srcmap Christoph Hellwig 2021-07-19 10:35 ` [Cluster-devel] " Christoph Hellwig 2021-07-19 17:44 ` Darrick J. Wong 2021-07-19 17:44 ` [Cluster-devel] " Darrick J. Wong 2021-07-19 17:57 ` RFC: switch iomap to an iterator model Darrick J. Wong 2021-07-19 17:57 ` [Cluster-devel] " Darrick J. Wong 2021-07-27 8:07 ` DAX setup pains, was " Christoph Hellwig 2021-07-29 20:33 ` Darrick J. Wong 2021-07-29 20:33 ` [Cluster-devel] " Darrick J. Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210719103520.495450-10-hch@lst.de \ --to=hch@lst.de \ --cc=agruenba@redhat.com \ --cc=cluster-devel@redhat.com \ --cc=dan.j.williams@intel.com \ --cc=djwong@kernel.org \ --cc=linux-btrfs@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ --cc=nvdimm@lists.linux.dev \ --cc=ruansy.fnst@fujitsu.com \ --cc=willy@infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.