mirror of
https://github.com/torvalds/linux.git
synced 2026-11-06 21:58:01 +01:00
xfs: add support for lazy direct read bounce buffering
Currently direct I/O reads always bounce buffer the I/O to deal with the case where userspace is modifying the buffer in-flight while reading data into it. This is a very expensive countermeasure for something no sane application should do, so try to avoid it by reading without a bounce buffer first, and retrying the read on a checksum failure. This avoids the cost of bounce buffering for sanely behave applications. For the rare case of an application regularly modifying in-flight buffers, allow forcing the always bounce buffer behavior through sysfs. And now that we have that knob, allow disabling read-side bounce buffering entirely for those who live fast and dangerous. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: "Darrick J. Wong" <djwong@kernel.org> Link: https://patch.msgid.link/20260909060924.1102037-14-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
85fa731672
commit
a9a7b9e868
|
|
@ -271,8 +271,7 @@ xfs_file_dio_read(
|
|||
return ret;
|
||||
if (mapping_stable_writes(iocb->ki_filp->f_mapping)) {
|
||||
ret = iomap_dio_rw(iocb, to, &xfs_read_iomap_ops,
|
||||
&xfs_dio_read_bounce_ops, IOMAP_DIO_BOUNCE,
|
||||
NULL, 0);
|
||||
&xfs_dio_read_bounce_ops, 0, NULL, 0);
|
||||
} else {
|
||||
ret = iomap_dio_read_simple(iocb, to, xfs_read_iomap_begin);
|
||||
if (ret == -ENOTBLK)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* Copyright (c) 2016-2025 Christoph Hellwig.
|
||||
* Copyright (c) 2016-2026 Christoph Hellwig.
|
||||
* All Rights Reserved.
|
||||
*/
|
||||
#include "xfs_platform.h"
|
||||
|
|
@ -19,14 +19,100 @@
|
|||
#include <linux/bio-integrity.h>
|
||||
|
||||
static void
|
||||
xfs_end_io_read(
|
||||
xfs_dio_bounce_end_io(
|
||||
struct bio *bio)
|
||||
{
|
||||
struct iomap_ioend *ioend = iomap_ioend_from_bio(bio);
|
||||
int error = blk_status_to_errno(bio->bi_status);
|
||||
struct bio *orig_bio = bio->bi_private;
|
||||
|
||||
if (!error && (ioend->io_flags & IOMAP_IOEND_INTEGRITY))
|
||||
if ((ioend->io_flags & IOMAP_IOEND_INTEGRITY) && !bio->bi_status)
|
||||
error = iomap_ioend_integrity_verify(ioend);
|
||||
iomap_bounce_read_end_io(ioend, orig_bio, error);
|
||||
}
|
||||
|
||||
static void
|
||||
xfs_bounce_submit_ioend(
|
||||
struct iomap_ioend *ioend)
|
||||
{
|
||||
if (ioend->io_flags & IOMAP_IOEND_INTEGRITY)
|
||||
fs_bio_integrity_alloc(&ioend->io_bio);
|
||||
ioend->io_bio.bi_end_io = xfs_dio_bounce_end_io;
|
||||
bio_set_flag(&ioend->io_bio, BIO_COMPLETE_IN_TASK);
|
||||
submit_bio(&ioend->io_bio);
|
||||
}
|
||||
|
||||
static void
|
||||
xfs_end_bio_bounced(
|
||||
struct bio *bio)
|
||||
{
|
||||
/*
|
||||
* Just complete the original ioends as all verification is done by the
|
||||
* end_io handlers for the clone bio(s).
|
||||
*/
|
||||
iomap_finish_ioends(iomap_ioend_from_bio(bio),
|
||||
blk_status_to_errno(bio->bi_status));
|
||||
}
|
||||
|
||||
static void
|
||||
xfs_read_bounce_and_resubmit(
|
||||
struct iomap_ioend *ioend)
|
||||
{
|
||||
struct bio *bio = &ioend->io_bio;
|
||||
struct xfs_inode *ip = XFS_I(ioend->io_inode);
|
||||
unsigned int nofs_flag = memalloc_nofs_save();
|
||||
|
||||
trace_xfs_bounce_reread(ip, ioend->io_offset, ioend->io_size);
|
||||
|
||||
/*
|
||||
* Free the bio integrity data for the original bio, as we'll allocate
|
||||
* a new one for each sub-I/O, which could deadlock if we keep the
|
||||
* integrity data for the original bio around.
|
||||
*/
|
||||
if (bio_integrity(bio))
|
||||
fs_bio_integrity_free(bio);
|
||||
|
||||
/*
|
||||
* Resubmit the bio through the iomap bounce machinery. The original
|
||||
* bio itself is not resubmitted to the block layer, but just used to
|
||||
* track I/O completion of the cloned bios.
|
||||
*/
|
||||
bio_prepare_reissue(bio, xfs_inode_buftarg(ip)->bt_bdev);
|
||||
bio->bi_iter = (struct bvec_iter) {
|
||||
.bi_sector = ioend->io_sector,
|
||||
.bi_size = ioend->io_size,
|
||||
.bi_offset = ioend->io_bvec_offset,
|
||||
};
|
||||
bio->bi_end_io = xfs_end_bio_bounced;
|
||||
iomap_bounce_read(ioend, bdev_logical_block_size(bio->bi_bdev),
|
||||
xfs_bounce_submit_ioend);
|
||||
memalloc_nofs_restore(nofs_flag);
|
||||
}
|
||||
|
||||
static void
|
||||
xfs_end_io_read(
|
||||
struct bio *bio)
|
||||
{
|
||||
struct iomap_ioend *ioend = iomap_ioend_from_bio(bio);
|
||||
struct xfs_inode *ip = XFS_I(ioend->io_inode);
|
||||
struct xfs_mount *mp = ip->i_mount;
|
||||
int error = blk_status_to_errno(bio->bi_status);
|
||||
|
||||
if (!error && (ioend->io_flags & IOMAP_IOEND_INTEGRITY)) {
|
||||
error = iomap_ioend_integrity_verify(ioend);
|
||||
if ((ioend->io_flags & IOMAP_IOEND_DIRECT) &&
|
||||
READ_ONCE(mp->m_read_bounce) == XFS_READ_BOUNCE_LAZY) {
|
||||
/*
|
||||
* We only really need to retry for guard tag errors,
|
||||
* but right now we can't distinguish them from other
|
||||
* (i.e, reftag) errors.
|
||||
*/
|
||||
if (error) {
|
||||
xfs_read_bounce_and_resubmit(ioend);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
iomap_finish_ioends(ioend, error);
|
||||
}
|
||||
|
|
@ -38,7 +124,18 @@ xfs_ioend_submit_read(
|
|||
loff_t file_offset,
|
||||
u16 ioend_flags)
|
||||
{
|
||||
iomap_init_ioend(inode, bio, file_offset, ioend_flags);
|
||||
struct xfs_inode *ip = XFS_I(inode);
|
||||
struct xfs_mount *mp = ip->i_mount;
|
||||
struct iomap_ioend *ioend;
|
||||
|
||||
ioend = iomap_init_ioend(inode, bio, file_offset, ioend_flags);
|
||||
if ((ioend_flags & IOMAP_IOEND_DIRECT) &&
|
||||
READ_ONCE(mp->m_read_bounce) == XFS_READ_BOUNCE_ALWAYS) {
|
||||
iomap_bounce_read(ioend, bdev_logical_block_size(bio->bi_bdev),
|
||||
xfs_bounce_submit_ioend);
|
||||
return;
|
||||
}
|
||||
|
||||
if (ioend_flags & IOMAP_IOEND_INTEGRITY)
|
||||
fs_bio_integrity_alloc(bio);
|
||||
bio->bi_end_io = xfs_end_io_read;
|
||||
|
|
|
|||
|
|
@ -142,6 +142,12 @@ struct xfs_freecounter {
|
|||
uint64_t res_saved;
|
||||
};
|
||||
|
||||
enum xfs_read_bounce {
|
||||
XFS_READ_BOUNCE_NEVER,
|
||||
XFS_READ_BOUNCE_ALWAYS,
|
||||
XFS_READ_BOUNCE_LAZY,
|
||||
};
|
||||
|
||||
/*
|
||||
* The struct xfsmount layout is optimised to separate read-mostly variables
|
||||
* from variables that are frequently modified. We put the read-mostly variables
|
||||
|
|
@ -177,6 +183,7 @@ typedef struct xfs_mount {
|
|||
struct workqueue_struct *m_sync_workqueue;
|
||||
struct workqueue_struct *m_blockgc_wq;
|
||||
struct workqueue_struct *m_inodegc_wq;
|
||||
enum xfs_read_bounce m_read_bounce;
|
||||
|
||||
int m_bsize; /* fs logical block size */
|
||||
uint8_t m_blkbit_log; /* blocklog + NBBY */
|
||||
|
|
@ -291,6 +298,7 @@ typedef struct xfs_mount {
|
|||
struct xfs_zone_info *m_zone_info; /* zone allocator information */
|
||||
struct dentry *m_debugfs; /* debugfs parent */
|
||||
struct xfs_kobj m_kobj;
|
||||
struct xfs_kobj m_csum_kobj;
|
||||
struct xfs_kobj m_error_kobj;
|
||||
struct xfs_kobj m_error_meta_kobj;
|
||||
struct xfs_error_cfg m_error_cfg[XFS_ERR_CLASS_MAX][XFS_ERR_ERRNO_MAX];
|
||||
|
|
|
|||
|
|
@ -2317,6 +2317,7 @@ xfs_init_fs_context(
|
|||
mp->m_logbufs = -1;
|
||||
mp->m_logbsize = -1;
|
||||
mp->m_allocsize_log = 16; /* 64k */
|
||||
mp->m_read_bounce = XFS_READ_BOUNCE_LAZY;
|
||||
|
||||
xfs_hooks_init(&mp->m_dir_update_hooks);
|
||||
|
||||
|
|
|
|||
|
|
@ -392,6 +392,71 @@ const struct kobj_type xfs_stats_ktype = {
|
|||
.default_groups = xfs_stats_groups,
|
||||
};
|
||||
|
||||
static inline struct xfs_mount *csum_to_mp(struct kobject *kobj)
|
||||
{
|
||||
return container_of(to_kobj(kobj), struct xfs_mount, m_csum_kobj);
|
||||
}
|
||||
|
||||
static bool
|
||||
xfs_has_read_bounce(
|
||||
struct xfs_mount *mp)
|
||||
{
|
||||
if (bdev_has_integrity_csum(mp->m_ddev_targp->bt_bdev))
|
||||
return true;
|
||||
if (mp->m_rtdev_targp &&
|
||||
bdev_has_integrity_csum(mp->m_rtdev_targp->bt_bdev))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
static const char * const bounce_modes[] = {
|
||||
[XFS_READ_BOUNCE_NEVER] = "never",
|
||||
[XFS_READ_BOUNCE_ALWAYS] = "always",
|
||||
[XFS_READ_BOUNCE_LAZY] = "lazy",
|
||||
};
|
||||
|
||||
static ssize_t
|
||||
read_bounce_show(
|
||||
struct kobject *kobj,
|
||||
char *buf)
|
||||
{
|
||||
struct xfs_mount *mp = csum_to_mp(kobj);
|
||||
|
||||
return sysfs_emit(buf, "%s\n",
|
||||
bounce_modes[READ_ONCE(mp->m_read_bounce)]);
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
read_bounce_store(
|
||||
struct kobject *kobj,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct xfs_mount *mp = csum_to_mp(kobj);
|
||||
int ret;
|
||||
|
||||
if (!xfs_has_read_bounce(mp))
|
||||
return -EINVAL;
|
||||
ret = sysfs_match_string(bounce_modes, buf);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
WRITE_ONCE(mp->m_read_bounce, ret);
|
||||
return count;
|
||||
}
|
||||
XFS_SYSFS_ATTR_RW(read_bounce);
|
||||
|
||||
static struct attribute *xfs_csum_attrs[] = {
|
||||
ATTR_LIST(read_bounce),
|
||||
NULL,
|
||||
};
|
||||
ATTRIBUTE_GROUPS(xfs_csum);
|
||||
|
||||
static const struct kobj_type xfs_csum_ktype = {
|
||||
.release = xfs_sysfs_release,
|
||||
.sysfs_ops = &xfs_sysfs_ops,
|
||||
.default_groups = xfs_csum_groups,
|
||||
};
|
||||
|
||||
/* xlog */
|
||||
|
||||
static inline struct xlog *
|
||||
|
|
@ -817,11 +882,17 @@ xfs_mount_sysfs_init(
|
|||
if (error)
|
||||
goto out_remove_fsdir;
|
||||
|
||||
/* .../xfs/<dev>/csum/ */
|
||||
error = xfs_sysfs_init(&mp->m_csum_kobj, &xfs_csum_ktype, &mp->m_kobj,
|
||||
"csum");
|
||||
if (error)
|
||||
goto out_remove_stats_dir;
|
||||
|
||||
/* .../xfs/<dev>/error/ */
|
||||
error = xfs_sysfs_init(&mp->m_error_kobj, &xfs_error_ktype,
|
||||
&mp->m_kobj, "error");
|
||||
if (error)
|
||||
goto out_remove_stats_dir;
|
||||
goto out_remove_csum_dir;
|
||||
|
||||
/* .../xfs/<dev>/error/fail_at_unmount */
|
||||
error = sysfs_create_file(&mp->m_error_kobj.kobject,
|
||||
|
|
@ -835,12 +906,14 @@ xfs_mount_sysfs_init(
|
|||
"metadata", &mp->m_error_meta_kobj,
|
||||
xfs_error_meta_init);
|
||||
if (error)
|
||||
goto out_remove_error_dir;
|
||||
goto out_remove_csum_dir;
|
||||
|
||||
return 0;
|
||||
|
||||
out_remove_error_dir:
|
||||
xfs_sysfs_del(&mp->m_error_kobj);
|
||||
out_remove_csum_dir:
|
||||
xfs_sysfs_del(&mp->m_csum_kobj);
|
||||
out_remove_stats_dir:
|
||||
xfs_sysfs_del(&mp->m_stats.xs_kobj);
|
||||
out_remove_fsdir:
|
||||
|
|
@ -864,6 +937,7 @@ xfs_mount_sysfs_del(
|
|||
}
|
||||
xfs_sysfs_del(&mp->m_error_meta_kobj);
|
||||
xfs_sysfs_del(&mp->m_error_kobj);
|
||||
xfs_sysfs_del(&mp->m_csum_kobj);
|
||||
xfs_sysfs_del(&mp->m_stats.xs_kobj);
|
||||
xfs_sysfs_del(&mp->m_kobj);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1896,6 +1896,7 @@ DEFINE_SIMPLE_IO_EVENT(xfs_zero_eof);
|
|||
DEFINE_SIMPLE_IO_EVENT(xfs_end_io_direct_write);
|
||||
DEFINE_SIMPLE_IO_EVENT(xfs_file_splice_read);
|
||||
DEFINE_SIMPLE_IO_EVENT(xfs_zoned_map_blocks);
|
||||
DEFINE_SIMPLE_IO_EVENT(xfs_bounce_reread);
|
||||
|
||||
DECLARE_EVENT_CLASS(xfs_itrunc_class,
|
||||
TP_PROTO(struct xfs_inode *ip, xfs_fsize_t new_size),
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user