* cleanup the bio handling in iomap v2 @ 2021-07-22 5:42 Christoph Hellwig 2021-07-22 5:42 ` [PATCH 1/2] iomap: simplify iomap_readpage_actor Christoph Hellwig 2021-07-22 5:42 ` [PATCH 2/2] iomap: simplify iomap_add_to_ioend Christoph Hellwig 0 siblings, 2 replies; 5+ messages in thread From: Christoph Hellwig @ 2021-07-22 5:42 UTC (permalink / raw) To: linux-xfs, linux-fsdevel; +Cc: Matthew Wilcox Hi all, this series cleans up the bio handling in the iomap buffered I/O code by dropping use of the very lowlevel helpers. We did only need them before Matthew converted the inflight counters to be byte based Changes sine v1: - fix readpage to properly handle bios that hit their byte size limit ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] iomap: simplify iomap_readpage_actor 2021-07-22 5:42 cleanup the bio handling in iomap v2 Christoph Hellwig @ 2021-07-22 5:42 ` Christoph Hellwig 2021-07-22 19:34 ` Darrick J. Wong 2021-07-22 5:42 ` [PATCH 2/2] iomap: simplify iomap_add_to_ioend Christoph Hellwig 1 sibling, 1 reply; 5+ messages in thread From: Christoph Hellwig @ 2021-07-22 5:42 UTC (permalink / raw) To: linux-xfs, linux-fsdevel; +Cc: Matthew Wilcox Now that the outstanding reads are counted in bytes, there is no need to use the low-level __bio_try_merge_page API, we can switch back to always using bio_add_page and simply iomap_readpage_actor again. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- fs/iomap/buffered-io.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 0597f5c186a33f..7898c1c47370e6 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -245,7 +245,6 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, struct iomap_readpage_ctx *ctx = data; struct page *page = ctx->cur_page; struct iomap_page *iop; - bool same_page = false, is_contig = false; loff_t orig_pos = pos; unsigned poff, plen; sector_t sector; @@ -269,16 +268,10 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, if (iop) atomic_add(plen, &iop->read_bytes_pending); - /* Try to merge into a previous segment if we can */ sector = iomap_sector(iomap, pos); - if (ctx->bio && bio_end_sector(ctx->bio) == sector) { - if (__bio_try_merge_page(ctx->bio, page, plen, poff, - &same_page)) - goto done; - is_contig = true; - } - - if (!is_contig || bio_full(ctx->bio, plen)) { + if (!ctx->bio || + bio_end_sector(ctx->bio) != sector || + bio_add_page(ctx->bio, page, plen, poff) != plen) { gfp_t gfp = mapping_gfp_constraint(page->mapping, GFP_KERNEL); gfp_t orig_gfp = gfp; unsigned int nr_vecs = DIV_ROUND_UP(length, PAGE_SIZE); @@ -302,9 +295,8 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, ctx->bio->bi_iter.bi_sector = sector; bio_set_dev(ctx->bio, iomap->bdev); ctx->bio->bi_end_io = iomap_read_end_io; + __bio_add_page(ctx->bio, page, plen, poff); } - - bio_add_page(ctx->bio, page, plen, poff); done: /* * Move the caller beyond our range so that it keeps making progress. -- 2.30.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] iomap: simplify iomap_readpage_actor 2021-07-22 5:42 ` [PATCH 1/2] iomap: simplify iomap_readpage_actor Christoph Hellwig @ 2021-07-22 19:34 ` Darrick J. Wong 0 siblings, 0 replies; 5+ messages in thread From: Darrick J. Wong @ 2021-07-22 19:34 UTC (permalink / raw) To: Christoph Hellwig; +Cc: linux-xfs, linux-fsdevel, Matthew Wilcox On Thu, Jul 22, 2021 at 07:42:55AM +0200, Christoph Hellwig wrote: > Now that the outstanding reads are counted in bytes, there is no need > to use the low-level __bio_try_merge_page API, we can switch back to > always using bio_add_page and simply iomap_readpage_actor again. s/simply/simplify/ ? > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org> With that corrected, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/iomap/buffered-io.c | 16 ++++------------ > 1 file changed, 4 insertions(+), 12 deletions(-) > > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 0597f5c186a33f..7898c1c47370e6 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -245,7 +245,6 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, > struct iomap_readpage_ctx *ctx = data; > struct page *page = ctx->cur_page; > struct iomap_page *iop; > - bool same_page = false, is_contig = false; > loff_t orig_pos = pos; > unsigned poff, plen; > sector_t sector; > @@ -269,16 +268,10 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, > if (iop) > atomic_add(plen, &iop->read_bytes_pending); > > - /* Try to merge into a previous segment if we can */ > sector = iomap_sector(iomap, pos); > - if (ctx->bio && bio_end_sector(ctx->bio) == sector) { > - if (__bio_try_merge_page(ctx->bio, page, plen, poff, > - &same_page)) > - goto done; > - is_contig = true; > - } > - > - if (!is_contig || bio_full(ctx->bio, plen)) { > + if (!ctx->bio || > + bio_end_sector(ctx->bio) != sector || > + bio_add_page(ctx->bio, page, plen, poff) != plen) { > gfp_t gfp = mapping_gfp_constraint(page->mapping, GFP_KERNEL); > gfp_t orig_gfp = gfp; > unsigned int nr_vecs = DIV_ROUND_UP(length, PAGE_SIZE); > @@ -302,9 +295,8 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, > ctx->bio->bi_iter.bi_sector = sector; > bio_set_dev(ctx->bio, iomap->bdev); > ctx->bio->bi_end_io = iomap_read_end_io; > + __bio_add_page(ctx->bio, page, plen, poff); > } > - > - bio_add_page(ctx->bio, page, plen, poff); > done: > /* > * Move the caller beyond our range so that it keeps making progress. > -- > 2.30.2 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] iomap: simplify iomap_add_to_ioend 2021-07-22 5:42 cleanup the bio handling in iomap v2 Christoph Hellwig 2021-07-22 5:42 ` [PATCH 1/2] iomap: simplify iomap_readpage_actor Christoph Hellwig @ 2021-07-22 5:42 ` Christoph Hellwig 2021-07-22 19:35 ` Darrick J. Wong 1 sibling, 1 reply; 5+ messages in thread From: Christoph Hellwig @ 2021-07-22 5:42 UTC (permalink / raw) To: linux-xfs, linux-fsdevel; +Cc: Matthew Wilcox Now that the outstanding writes are counted in bytes, there is no need to use the low-level __bio_try_merge_page API, we can switch back to always using bio_add_page and simply iomap_add_to_ioend again. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/iomap/buffered-io.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 7898c1c47370e6..d31e0d3b50c683 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1252,7 +1252,6 @@ iomap_add_to_ioend(struct inode *inode, loff_t offset, struct page *page, sector_t sector = iomap_sector(&wpc->iomap, offset); unsigned len = i_blocksize(inode); unsigned poff = offset & (PAGE_SIZE - 1); - bool merged, same_page = false; if (!wpc->ioend || !iomap_can_add_to_ioend(wpc, offset, sector)) { if (wpc->ioend) @@ -1260,19 +1259,13 @@ iomap_add_to_ioend(struct inode *inode, loff_t offset, struct page *page, wpc->ioend = iomap_alloc_ioend(inode, wpc, offset, sector, wbc); } - merged = __bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, - &same_page); - if (iop) - atomic_add(len, &iop->write_bytes_pending); - - if (!merged) { - if (bio_full(wpc->ioend->io_bio, len)) { - wpc->ioend->io_bio = - iomap_chain_bio(wpc->ioend->io_bio); - } - bio_add_page(wpc->ioend->io_bio, page, len, poff); + if (bio_add_page(wpc->ioend->io_bio, page, len, poff) != len) { + wpc->ioend->io_bio = iomap_chain_bio(wpc->ioend->io_bio); + __bio_add_page(wpc->ioend->io_bio, page, len, poff); } + if (iop) + atomic_add(len, &iop->write_bytes_pending); wpc->ioend->io_size += len; wbc_account_cgroup_owner(wbc, page, len); } -- 2.30.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] iomap: simplify iomap_add_to_ioend 2021-07-22 5:42 ` [PATCH 2/2] iomap: simplify iomap_add_to_ioend Christoph Hellwig @ 2021-07-22 19:35 ` Darrick J. Wong 0 siblings, 0 replies; 5+ messages in thread From: Darrick J. Wong @ 2021-07-22 19:35 UTC (permalink / raw) To: Christoph Hellwig; +Cc: linux-xfs, linux-fsdevel, Matthew Wilcox On Thu, Jul 22, 2021 at 07:42:56AM +0200, Christoph Hellwig wrote: > Now that the outstanding writes are counted in bytes, there is no need > to use the low-level __bio_try_merge_page API, we can switch back to > always using bio_add_page and simply iomap_add_to_ioend again. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Pretty straightforward. Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/iomap/buffered-io.c | 17 +++++------------ > 1 file changed, 5 insertions(+), 12 deletions(-) > > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 7898c1c47370e6..d31e0d3b50c683 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -1252,7 +1252,6 @@ iomap_add_to_ioend(struct inode *inode, loff_t offset, struct page *page, > sector_t sector = iomap_sector(&wpc->iomap, offset); > unsigned len = i_blocksize(inode); > unsigned poff = offset & (PAGE_SIZE - 1); > - bool merged, same_page = false; > > if (!wpc->ioend || !iomap_can_add_to_ioend(wpc, offset, sector)) { > if (wpc->ioend) > @@ -1260,19 +1259,13 @@ iomap_add_to_ioend(struct inode *inode, loff_t offset, struct page *page, > wpc->ioend = iomap_alloc_ioend(inode, wpc, offset, sector, wbc); > } > > - merged = __bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, > - &same_page); > - if (iop) > - atomic_add(len, &iop->write_bytes_pending); > - > - if (!merged) { > - if (bio_full(wpc->ioend->io_bio, len)) { > - wpc->ioend->io_bio = > - iomap_chain_bio(wpc->ioend->io_bio); > - } > - bio_add_page(wpc->ioend->io_bio, page, len, poff); > + if (bio_add_page(wpc->ioend->io_bio, page, len, poff) != len) { > + wpc->ioend->io_bio = iomap_chain_bio(wpc->ioend->io_bio); > + __bio_add_page(wpc->ioend->io_bio, page, len, poff); > } > > + if (iop) > + atomic_add(len, &iop->write_bytes_pending); > wpc->ioend->io_size += len; > wbc_account_cgroup_owner(wbc, page, len); > } > -- > 2.30.2 > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-07-22 19:35 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-07-22 5:42 cleanup the bio handling in iomap v2 Christoph Hellwig 2021-07-22 5:42 ` [PATCH 1/2] iomap: simplify iomap_readpage_actor Christoph Hellwig 2021-07-22 19:34 ` Darrick J. Wong 2021-07-22 5:42 ` [PATCH 2/2] iomap: simplify iomap_add_to_ioend Christoph Hellwig 2021-07-22 19:35 ` Darrick J. Wong
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).