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 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 985B5CDB46F for ; Tue, 23 Jun 2026 13:52:34 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4gl62S6fNTz2yVZ; Tue, 23 Jun 2026 23:52:32 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2607:7c80:54:3::133" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1782222752; cv=none; b=fRFSk5+2VIIYEVIWn4lyHicLVqffJfumB8fB14YqdSOl1hnFMnW1jhKazXObVjQ1YM+91RgktQHEKKZWX/NkTqy7v4l4XaS+MInel99hSvUNKnevqvVGBLk+4Ce2ZcCc+xfwIhNz7WZFQvvyCdPrdzzdBPCx2cnZrNRqNTOik7WRWUmWzeVr8VdaVkusj2A4ltE1qSH0VkOGuUdTFVwDf01wtB9CeFm0pwtFE0JF5B3RFuJOl8edYY1K3PBXtMhoAahhDov9BEtX4ChvIYCfMZpaxbUsbix76bkMj1WwDZ3QD2AOOmy4BCp6pTGD6O32325qWQ6Gtah1I8VFzghFOw== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1782222752; c=relaxed/relaxed; bh=BZtqiiIQedvJG2eJnZoCituw+d7bspysidkPSjAIZJI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iPFJg+NVHh30RkPywdQ+Y/Y2ckMGr1iABV91PlZE1l4qezGx92cVLmyUv93uNtfg+ZVC+JVBv+irwMijRQCTXku2GELVY1vuqAE8r91eghi9EltnBvBglyHk+bCI9VJ7+8A4MnxhCRNQnDfdd+mMXOhckQ4fMhqRjMQL2OQmY8B0WaRfyx2xJJsqgAHafLMWc/gD6zbYpvHsFZMqYVeJrTk7z/LYOcT3hpsyXTSOASOevRK653VqU3dNxXjGE6ikd8LrWHfHEUtlkBDzW5+9psB9s+0g1HfJcnBDUaXK/jPfUnm9laevm/mXuI6Oao51HCTqc4nL2ahnaBbjS+1b6w== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=fail (p=none dis=none) header.from=lst.de; dkim=pass (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=4AYyXdKZ; dkim-atps=neutral; spf=none (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=batv+1ce5920da89166e1197d+8339+infradead.org+hch@bombadil.srs.infradead.org; receiver=lists.ozlabs.org) smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: lists.ozlabs.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=4AYyXdKZ; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=bombadil.srs.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=batv+1ce5920da89166e1197d+8339+infradead.org+hch@bombadil.srs.infradead.org; receiver=lists.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4gl62S1Qpjz2xM7 for ; Tue, 23 Jun 2026 23:52:32 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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=BZtqiiIQedvJG2eJnZoCituw+d7bspysidkPSjAIZJI=; b=4AYyXdKZ48EQyV3nDhD0dclYim FYc3iQVhHs4OS22PKdZG76Hy20s+rO0CBpl050BMBzqro4xifdC8tyHCTIon85OhrNpmfpDoQZhBx J59XsPa+Uc2u8JnSslTfXw/HhkAD2ehC6koZY2s0omzIP24PLcyiWus5Wp0zBh4tGBfqNeyqqSkJz vQTwHrFnmhfUDJ5QQFNBsSqtaq7bIt8dkyGEN8NkNKtT4VIknRJWZIPUb3m3iWznTTGKEZvoS1Mrv O2qU/kqEhZc4DH4K4A7ol0F2ce8TJgyorZ58ERl4RzMXNqZn5ANxpGkzbgIi+vnzoqlHUDaXOmygx jLxtUgMQ==; Received: from [2001:4bb8:2f6:ef61:5b2b:8638:3844:9408] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.99.1 #2 (Red Hat Linux)) id 1wc1YA-00000006NDF-2Zk8; Tue, 23 Jun 2026 13:52:27 +0000 From: Christoph Hellwig To: Christian Brauner , "Darrick J. Wong" Cc: Kelu Ye , Yifan Zhao , Ritesh Harjani , Joanne Koong , Namjae Jeon , Sungjong Seo , Hyunchul Lee , Konstantin Komarov , Miklos Szeredi , fuse-devel@lists.linux.dev, ntfs3@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 2/2] iomap: submit read bio after each extent Date: Tue, 23 Jun 2026 15:51:37 +0200 Message-ID: <20260623135208.1812933-3-hch@lst.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260623135208.1812933-1-hch@lst.de> References: <20260623135208.1812933-1-hch@lst.de> X-Mailing-List: linux-erofs@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html 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. Change ->submit_read to be called after each iteration, and pass a force argument to indicate that the bio must be submitted set on the last iteration. Switch the bio based users to always submit, while keeping the single submit for fuse. Fixes: dfeab2e95a75 ("erofs: add multiple device support") Reported-by: Kelu Ye Reported-by: Yifan Zhao Signed-off-by: Christoph Hellwig --- fs/exfat/iomap.c | 4 ++-- fs/fuse/file.c | 6 +++++- fs/iomap/bio.c | 11 +++++++---- fs/iomap/buffered-io.c | 23 +++++++++++++++-------- fs/ntfs/aops.c | 4 ++-- fs/ntfs3/inode.c | 4 ++-- fs/xfs/xfs_aops.c | 5 +++-- include/linux/iomap.h | 5 +++-- 8 files changed, 39 insertions(+), 23 deletions(-) diff --git a/fs/exfat/iomap.c b/fs/exfat/iomap.c index 190fc6471f84..58e25c4e8587 100644 --- a/fs/exfat/iomap.c +++ b/fs/exfat/iomap.c @@ -251,9 +251,9 @@ static void exfat_iomap_read_end_io(struct bio *bio) } static void exfat_iomap_bio_submit_read(const struct iomap_iter *iter, - struct iomap_read_folio_ctx *ctx) + struct iomap_read_folio_ctx *ctx, bool force) { - iomap_bio_submit_read_endio(iter, ctx, exfat_iomap_read_end_io); + iomap_bio_submit_read_endio(iter, ctx, force, exfat_iomap_read_end_io); } const struct iomap_read_ops exfat_iomap_bio_read_ops = { diff --git a/fs/fuse/file.c b/fs/fuse/file.c index e052a0d44dee..6fa3b1f55c95 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -982,13 +982,17 @@ static int fuse_iomap_read_folio_range_async(const struct iomap_iter *iter, } static void fuse_iomap_submit_read(const struct iomap_iter *iter, - struct iomap_read_folio_ctx *ctx) + struct iomap_read_folio_ctx *ctx, bool force) { struct fuse_fill_read_data *data = ctx->read_ctx; + if (!force) + return; + if (data->ia) fuse_send_readpages(data->ia, data->file, data->nr_bytes, data->fc->async_read); + ctx->read_ctx = NULL; } static const struct iomap_read_ops fuse_iomap_read_ops = { diff --git a/fs/iomap/bio.c b/fs/iomap/bio.c index 0f31e35567b4..f71aaaf60301 100644 --- a/fs/iomap/bio.c +++ b/fs/iomap/bio.c @@ -79,7 +79,8 @@ u32 iomap_finish_ioend_buffered_read(struct iomap_ioend *ioend) } void iomap_bio_submit_read_endio(const struct iomap_iter *iter, - struct iomap_read_folio_ctx *ctx, bio_end_io_t end_io) + struct iomap_read_folio_ctx *ctx, bool force, + bio_end_io_t end_io) { struct bio *bio = ctx->read_ctx; @@ -87,13 +88,15 @@ void iomap_bio_submit_read_endio(const struct iomap_iter *iter, if (iter->iomap.flags & IOMAP_F_INTEGRITY) fs_bio_integrity_alloc(bio); submit_bio(bio); + + ctx->read_ctx = NULL; } EXPORT_SYMBOL_GPL(iomap_bio_submit_read_endio); static void iomap_bio_submit_read(const struct iomap_iter *iter, - struct iomap_read_folio_ctx *ctx) + struct iomap_read_folio_ctx *ctx, bool force) { - return iomap_bio_submit_read_endio(iter, ctx, iomap_read_end_io); + return iomap_bio_submit_read_endio(iter, ctx, force, iomap_read_end_io); } static struct bio_set *iomap_read_bio_set(struct iomap_read_folio_ctx *ctx) @@ -116,7 +119,7 @@ static void iomap_read_alloc_bio(const struct iomap_iter *iter, /* Submit the existing range if there was one. */ if (ctx->read_ctx) - ctx->ops->submit_read(iter, ctx); + ctx->ops->submit_read(iter, ctx, true); /* Same as readahead_gfp_mask: */ if (ctx->rac) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 8d4806dc46d4..06a216d37548 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -524,6 +524,13 @@ static void iomap_read_end(struct folio *folio, size_t bytes_submitted) } } +static void iomap_submit_read(struct iomap_iter *iter, + struct iomap_read_folio_ctx *ctx, bool force) +{ + if (ctx->read_ctx && ctx->ops->submit_read) + ctx->ops->submit_read(iter, ctx, force); +} + static int iomap_read_folio_iter(struct iomap_iter *iter, struct iomap_read_folio_ctx *ctx, size_t *bytes_submitted) { @@ -642,12 +649,12 @@ 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) { + iomap_submit_read(&iter, ctx, false); 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_submit_read(&iter, ctx, true); if (ctx->cur_folio) iomap_read_end(ctx->cur_folio, bytes_submitted); @@ -718,12 +725,12 @@ 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) { + iomap_submit_read(&iter, ctx, false); 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_submit_read(&iter, ctx, true); if (ctx->cur_folio) iomap_read_end(ctx->cur_folio, cur_bytes_submitted); diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c index f2bb56506046..c32ecc28cb52 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c @@ -38,9 +38,9 @@ static void ntfs_iomap_read_end_io(struct bio *bio) } static void ntfs_iomap_bio_submit_read(const struct iomap_iter *iter, - struct iomap_read_folio_ctx *ctx) + struct iomap_read_folio_ctx *ctx, bool force) { - iomap_bio_submit_read_endio(iter, ctx, ntfs_iomap_read_end_io); + iomap_bio_submit_read_endio(iter, ctx, force, ntfs_iomap_read_end_io); } static const struct iomap_read_ops ntfs_iomap_bio_read_ops = { diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c index f9600aba1548..110c9b8208e1 100644 --- a/fs/ntfs3/inode.c +++ b/fs/ntfs3/inode.c @@ -607,9 +607,9 @@ static void ntfs_iomap_read_end_io(struct bio *bio) } static void ntfs_iomap_bio_submit_read(const struct iomap_iter *iter, - struct iomap_read_folio_ctx *ctx) + struct iomap_read_folio_ctx *ctx, bool force) { - iomap_bio_submit_read_endio(iter, ctx, ntfs_iomap_read_end_io); + iomap_bio_submit_read_endio(iter, ctx, force, ntfs_iomap_read_end_io); } static const struct iomap_read_ops ntfs_iomap_bio_read_ops = { diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 51293b6f331f..42ebb2265408 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -758,13 +758,14 @@ xfs_vm_bmap( static void xfs_bio_submit_read( const struct iomap_iter *iter, - struct iomap_read_folio_ctx *ctx) + struct iomap_read_folio_ctx *ctx, + bool force) { struct bio *bio = ctx->read_ctx; /* defer read completions to the ioend workqueue */ iomap_init_ioend(iter->inode, bio, ctx->read_ctx_file_offset, 0); - iomap_bio_submit_read_endio(iter, ctx, xfs_end_bio); + iomap_bio_submit_read_endio(iter, ctx, force, xfs_end_bio); } static const struct iomap_read_ops xfs_iomap_read_ops = { diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 56b43d594e6e..266844b62372 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -528,7 +528,7 @@ struct iomap_read_ops { * This is optional. */ void (*submit_read)(const struct iomap_iter *iter, - struct iomap_read_folio_ctx *ctx); + struct iomap_read_folio_ctx *ctx, bool force); /* * Optional, allows filesystem to specify own bio_set, so new bio's @@ -623,7 +623,8 @@ extern struct bio_set iomap_ioend_bioset; int iomap_bio_read_folio_range(const struct iomap_iter *iter, struct iomap_read_folio_ctx *ctx, size_t plen); void iomap_bio_submit_read_endio(const struct iomap_iter *iter, - struct iomap_read_folio_ctx *ctx, bio_end_io_t end_io); + struct iomap_read_folio_ctx *ctx, bool force, + bio_end_io_t end_io); extern const struct iomap_read_ops iomap_bio_read_ops; -- 2.53.0