Skip to contentSkip to conversation

don't build bios/contexts over multiple iomaps

PATCH Applied Christoph Hellwig 4 participants 7 messages Jun 19 – Jun 23

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi all,

this patch changes how iomap submits bios for reads. The old behavior to build up bios across iomap was already considered problematic for a while, but we now ran into a erofs bug because of it, so it's time to finally fix it.

#1 lore raw

PATCH 1/1 iomap: submit read bio after each extent

Currently the iomap buffered read path tries to build up read context (i.e. bios for the typical block based case) over multiple iomaps as long as the sector matches. This does not take into account files that can map to multiple different devices. While this could be fixed by a bdev check in iomap_bio_read_folio_range, the building up of I/O over iomaps actually was a problem for the not yet merged ext2 iomap port, as that does want to send out I/O at the end of an indirect block mapped range.

So instead of adding more checks move over to a model where a bio only spans a single iomap. File systems can still create iomap that span more than an extent if they want to build larger I/O.

---
 fs/iomap/buffered-io.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
fs/iomap/buffered-io.c +14 -8
index 8d4806dc46d4..7449cfd995d5 100644
@@ -524,6 +524,14 @@ static void iomap_read_end(struct folio *folio, size_t bytes_submitted)
 	}
 }
 
+static void iomap_read_submit(struct iomap_iter *iter,
+		struct iomap_read_folio_ctx *ctx)
+{
+	if (ctx->read_ctx && ctx->ops->submit_read)
+		ctx->ops->submit_read(iter, ctx);
+	ctx->read_ctx = NULL;
+}
+
 static int iomap_read_folio_iter(struct iomap_iter *iter,
 		struct iomap_read_folio_ctx *ctx, size_t *bytes_submitted)
 {
@@ -642,12 +650,11 @@ void iomap_read_folio(const struct iomap_ops *ops,
 		fsverity_readahead(ctx->vi, folio->index,
 				   folio_nr_pages(folio));
 
-	while ((ret = iomap_iter(&iter, ops)) > 0)
+	while ((ret = iomap_iter(&iter, ops)) > 0) {
 		iter.status = iomap_read_folio_iter(&iter, ctx,
 				&bytes_submitted);
-
-	if (ctx->read_ctx && ctx->ops->submit_read)
-		ctx->ops->submit_read(&iter, ctx);
+		iomap_read_submit(&iter, ctx);
+	}
 
 	if (ctx->cur_folio)
 		iomap_read_end(ctx->cur_folio, bytes_submitted);
@@ -718,12 +725,11 @@ void iomap_readahead(const struct iomap_ops *ops,
 		fsverity_readahead(ctx->vi, readahead_index(rac),
 				readahead_count(rac));
 
-	while (iomap_iter(&iter, ops) > 0)
+	while (iomap_iter(&iter, ops) > 0) {
 		iter.status = iomap_readahead_iter(&iter, ctx,
 					&cur_bytes_submitted);
-
-	if (ctx->read_ctx && ctx->ops->submit_read)
-		ctx->ops->submit_read(&iter, ctx);
+		iomap_read_submit(&iter, ctx);
+	}
 
 	if (ctx->cur_folio)
 		iomap_read_end(ctx->cur_folio, cur_bytes_submitted);
Signature · 1 line
2.53.0
Reviewed-by on v1 1/1
#2 lore raw

Re: [PATCH] iomap: submit read bio after each extent

Quoted 9 lines · Christoph Hellwig

Currently the iomap buffered read path tries to build up read context (i.e. bios for the typical block based case) over multiple iomaps as long as the sector matches. This does not take into account files that can map to multiple different devices. While this could be fixed by a bdev check in iomap_bio_read_folio_range, the building up of I/O over iomaps actually was a problem for the not yet merged ext2 iomap port, as that does want to send out I/O at the end of an indirect block mapped range.

Quoted 7 lines

So instead of adding more checks move over to a model where a bio only spans a single iomap. File systems can still create iomap that span more than an extent if they want to build larger I/O.

Thanks,
Gao Xiang

maintainer Applied
#3 lore raw

Re: [PATCH] iomap: submit read bio after each extent

In reply to Christoph Hellwig
Quoted 10 lines · Christoph Hellwig

Currently the iomap buffered read path tries to build up read context (i.e. bios for the typical block based case) over multiple iomaps as long as the sector matches. This does not take into account files that can map to multiple different devices. While this could be fixed by a bdev check in iomap_bio_read_folio_range, the building up of I/O over iomaps actually was a problem for the not yet merged ext2 iomap port, as that does want to send out I/O at the end of an indirect block mapped range.

[...]

Applied to the vfs-7.3.iomap branch of the vfs/vfs.git tree. Patches in the vfs-7.3.iomap branch should appear in linux-next soon.

Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.

It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.

Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs-7.3.iomap

[1/1] iomap: submit read bio after each extent

      https://git.kernel.org/vfs/vfs/c/dce5617fca3a
#4 lore raw

Re: [PATCH] iomap: submit read bio after each extent

Hi Christian,

Quoted 10 lines · Christian Brauner
Quoted 9 lines · Christoph Hellwig

Currently the iomap buffered read path tries to build up read context (i.e. bios for the typical block based case) over multiple iomaps as long as the sector matches. This does not take into account files that can map to multiple different devices. While this could be fixed by a bdev check in iomap_bio_read_folio_range, the building up of I/O over iomaps actually was a problem for the not yet merged ext2 iomap port, as that does want to send out I/O at the end of an indirect block mapped range.

Quoted 4 lines
Quoted 1 line

[...]

Applied to the vfs-7.3.iomap branch of the vfs/vfs.git tree. Patches in the vfs-7.3.iomap branch should appear in linux-next soon.

btw, could we address this issue in the 7.2 cycle?

Not because that is a quite common case and needs a rush fix, but Just because that can be reproducible under given circumstances and users can get corrupted data.

Or if we need to hear thoughts from others, I think we could delay one or two weeks though.

Thanks,
Gao Xiang

#5 lore raw

Re: [PATCH] iomap: submit read bio after each extent

In reply to Christoph Hellwig
Quoted 26 lines · Christoph Hellwig

Currently the iomap buffered read path tries to build up read context (i.e. bios for the typical block based case) over multiple iomaps as long as the sector matches. This does not take into account files that can map to multiple different devices. While this could be fixed by a bdev check in iomap_bio_read_folio_range, the building up of I/O over iomaps actually was a problem for the not yet merged ext2 iomap port, as that does want to send out I/O at the end of an indirect block mapped range.

So instead of adding more checks move over to a model where a bio only spans a single iomap. File systems can still create iomap that span more than an extent if they want to build larger I/O.

---
 fs/iomap/buffered-io.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
fs/iomap/buffered-io.c +0 -0
index 8d4806dc46d4..7449cfd995d5 100644

fs/iomap/buffered-io.c static void iomap_read_end(struct folio *folio, size_t bytes_submitted) · line 532

Quoted 9 lines
fs/iomap/buffered-io.c +6 -0
@@ -524,6 +524,14 @@ static void iomap_read_end(struct folio *folio, size_t bytes_submitted)
        }
 }
 
+static void iomap_read_submit(struct iomap_iter *iter,
+               struct iomap_read_folio_ctx *ctx)
+{
+       if (ctx->read_ctx && ctx->ops->submit_read)
+               ctx->ops->submit_read(iter, ctx);
+       ctx->read_ctx = NULL;

Does it make sense to move this line to the bio submit_read callback instead of unconditionally clearing it here? If we clear it here, I think this makes read_ctx only able to hold per-mapping state instead of also being able to hold persistent state across mappings. fuse currently uses read_ctx to hold per-request state (though this patch wouldn't break anything since fuse only ever returns one mapping covering the whole request).

Thanks,
Joanne

#6 lore raw

Re: [PATCH] iomap: submit read bio after each extent

Quoted 7 lines · Joanne Koong

Does it make sense to move this line to the bio submit_read callback instead of unconditionally clearing it here? If we clear it here, I think this makes read_ctx only able to hold per-mapping state instead of also being able to hold persistent state across mappings. fuse currently uses read_ctx to hold per-request state (though this patch wouldn't break anything since fuse only ever returns one mapping covering the whole request).

I've done that for v2, also we also need a new argument to ->submit_read for that to be useful.