github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

xfs: use BIO_COMPLETE_IN_TASK for bounce buffered read I/Os

Browse Source 
Stop using the xfs per-inode work struct for completing read bios, as
unlike writes we don't want to serialize reads on a single inode as
there is no exclusive resource contention for them.

Factor the code for kicking off a read that needs and ioend and the
task context completion into a single helper so that it is split off
the xfs_end_bio machinery, which is not only used for writes.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Link: https://patch.msgid.link/20260909060924.1102037-12-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2026-09-09 09:09:00 +03:00 committed by Jens Axboe
parent df7ed21685
commit b69e24b750
4 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/xfs/xfs_aops.c
View File

@ -583,12 +583,10 @@ xfs_bio_submit_read(
const struct iomap_iter *iter,
struct iomap_read_folio_ctx *ctx)
{
struct bio *bio = ctx->read_ctx;
/* defer read completions to the ioend workqueue */
iomap_init_ioend(iter->inode, bio, ctx->read_ctx_file_offset,
iomap_ioend_flags(&iter->iomap));
iomap_bio_submit_read_endio(iter, ctx, xfs_end_bio);
xfs_ioend_submit_read(iter->inode, ctx->read_ctx,
ctx->read_ctx_file_offset,
iomap_ioend_flags(&iter->iomap));
ctx->read_ctx = NULL;
}
static const struct iomap_read_ops xfs_iomap_read_ops = {

8
fs/xfs/xfs_file.c
View File

@ -242,14 +242,8 @@ xfs_dio_read_bounce_submit_io(
struct bio *bio,
loff_t file_offset)
{
struct iomap_ioend *ioend;
ioend = iomap_init_ioend(iter->inode, bio, file_offset,
xfs_ioend_submit_read(iter->inode, bio, file_offset,
iomap_ioend_flags(&iter->iomap) | IOMAP_IOEND_DIRECT);
if (ioend->io_flags & IOMAP_IOEND_INTEGRITY)
fs_bio_integrity_alloc(bio);
bio->bi_end_io = xfs_end_bio;
submit_bio(bio);
}
static const struct iomap_dio_ops xfs_dio_read_bounce_ops = {

32
fs/xfs/xfs_ioend.c
View File

@ -16,6 +16,32 @@
#include "xfs_reflink.h"
#include "xfs_zone_alloc.h"
#include "xfs_ioend.h"
#include <linux/bio-integrity.h>
static void
xfs_end_io_read(
struct bio *bio)
{
struct iomap_ioend *ioend = iomap_ioend_from_bio(bio);
int error = blk_status_to_errno(bio->bi_status);
iomap_finish_ioends(ioend, error);
}
void
xfs_ioend_submit_read(
struct inode *inode,
struct bio *bio,
loff_t file_offset,
u16 ioend_flags)
{
iomap_init_ioend(inode, bio, file_offset, ioend_flags);
if (ioend_flags & IOMAP_IOEND_INTEGRITY)
fs_bio_integrity_alloc(bio);
bio->bi_end_io = xfs_end_io_read;
bio_set_flag(bio, BIO_COMPLETE_IN_TASK);
submit_bio(bio);
}
static void
xfs_ioend_put_open_zones(
@ -148,11 +174,7 @@ xfs_end_io(
io_list))) {
list_del_init(&ioend->io_list);
iomap_ioend_try_merge(ioend, &tmp);
if (bio_op(&ioend->io_bio) == REQ_OP_READ)
iomap_finish_ioends(ioend,
blk_status_to_errno(ioend->io_bio.bi_status));
else
xfs_end_ioend_write(ioend);
xfs_end_ioend_write(ioend);
cond_resched();
}
}

2
fs/xfs/xfs_ioend.h
View File

@ -12,5 +12,7 @@ static inline bool xfs_ioend_is_append(struct iomap_ioend *ioend)
}
void xfs_end_bio(struct bio *bio);
void xfs_ioend_submit_read(struct inode *inode, struct bio *bio,
loff_t file_offset, u16 ioend_flags);
#endif /* __XFS_IOEND_H */