On Tue 07-06-22 04:11:06, Al Viro wrote:
> New helper to be used instead of direct checks for IOCB_DSYNC:
> iocb_is_dsync(iocb). Checks converted, which allows to avoid
> the IS_SYNC(iocb->ki_filp->f_mapping->host) part (4 cache lines)
> from iocb_flags() - it's checked in iocb_is_dsync() instead
>
> Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Does it really matter that much when we have io_is_direct() just two lines
above which does: IS_DAX(filp->f_mapping->host)?
Also presumably even if we got rid of the IS_DAX check, we'll need to do
file->f_mapping->host traversal sooner rather than later anyway so it is
not clear to me how much it helps performance to defer this traversal to a
bit later.
Finally it seems a bit error prone to be checking some IOCB_ flags directly
while IOCB_DSYNC needs to be checked with iocb_is_dsync() instead. I think
we'll grow some place mistakenly checking IOCB_DSYNC sooner rather than
later. So maybe at least rename IOCB_DSYNC to __IOCB_DSYNC to make it more
obvious in the name that something unusual is going on?
Honza
> ---
> block/fops.c | 2 +-
> fs/btrfs/file.c | 2 +-
> fs/direct-io.c | 2 +-
> fs/fuse/file.c | 2 +-
> fs/iomap/direct-io.c | 22 ++++++++++++----------
> fs/zonefs/super.c | 2 +-
> include/linux/fs.h | 10 ++++++++--
> 7 files changed, 25 insertions(+), 17 deletions(-)
>
> diff --git a/block/fops.c b/block/fops.c
> index d6b3276a6c68..6e86931ab847 100644
> --- a/block/fops.c
> +++ b/block/fops.c
> @@ -37,7 +37,7 @@ static unsigned int dio_bio_write_op(struct kiocb *iocb)
> unsigned int op = REQ_OP_WRITE | REQ_SYNC | REQ_IDLE;
>
> /* avoid the need for a I/O completion work item */
> - if (iocb->ki_flags & IOCB_DSYNC)
> + if (iocb_is_dsync(iocb))
> op |= REQ_FUA;
> return op;
> }
> diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
> index 98f81e304eb1..54358a5c9d56 100644
> --- a/fs/btrfs/file.c
> +++ b/fs/btrfs/file.c
> @@ -2021,7 +2021,7 @@ ssize_t btrfs_do_write_iter(struct kiocb *iocb, struct iov_iter *from,
> struct file *file = iocb->ki_filp;
> struct btrfs_inode *inode = BTRFS_I(file_inode(file));
> ssize_t num_written, num_sync;
> - const bool sync = iocb->ki_flags & IOCB_DSYNC;
> + const bool sync = iocb_is_dsync(iocb);
>
> /*
> * If the fs flips readonly due to some impossible error, although we
> diff --git a/fs/direct-io.c b/fs/direct-io.c
> index 840752006f60..39647eb56904 100644
> --- a/fs/direct-io.c
> +++ b/fs/direct-io.c
> @@ -1210,7 +1210,7 @@ ssize_t __blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
> */
> if (dio->is_async && iov_iter_rw(iter) == WRITE) {
> retval = 0;
> - if (iocb->ki_flags & IOCB_DSYNC)
> + if (iocb_is_dsync(iocb))
> retval = dio_set_defer_completion(dio);
> else if (!dio->inode->i_sb->s_dio_done_wq) {
> /*
> diff --git a/fs/fuse/file.c b/fs/fuse/file.c
> index 05caa2b9272e..00fa861aeead 100644
> --- a/fs/fuse/file.c
> +++ b/fs/fuse/file.c
> @@ -1042,7 +1042,7 @@ static unsigned int fuse_write_flags(struct kiocb *iocb)
> {
> unsigned int flags = iocb->ki_filp->f_flags;
>
> - if (iocb->ki_flags & IOCB_DSYNC)
> + if (iocb_is_dsync(iocb))
> flags |= O_DSYNC;
> if (iocb->ki_flags & IOCB_SYNC)
> flags |= O_SYNC;
> diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
> index 0f16479b13d6..2be8d9e98fbc 100644
> --- a/fs/iomap/direct-io.c
> +++ b/fs/iomap/direct-io.c
> @@ -548,17 +548,19 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
> }
>
> /* for data sync or sync, we need sync completion processing */
> - if (iocb->ki_flags & IOCB_DSYNC && !(dio_flags & IOMAP_DIO_NOSYNC))
> - dio->flags |= IOMAP_DIO_NEED_SYNC;
> + if (iocb_is_dsync(iocb)) {
> + if (!(dio_flags & IOMAP_DIO_NOSYNC))
> + dio->flags |= IOMAP_DIO_NEED_SYNC;
>
> - /*
> - * For datasync only writes, we optimistically try using FUA for
> - * this IO. Any non-FUA write that occurs will clear this flag,
> - * hence we know before completion whether a cache flush is
> - * necessary.
> - */
> - if ((iocb->ki_flags & (IOCB_DSYNC | IOCB_SYNC)) == IOCB_DSYNC)
> - dio->flags |= IOMAP_DIO_WRITE_FUA;
> + /*
> + * For datasync only writes, we optimistically try
> + * using FUA for this IO. Any non-FUA write that
> + * occurs will clear this flag, hence we know before
> + * completion whether a cache flush is necessary.
> + */
> + if (!(iocb->ki_flags & IOCB_SYNC))
> + dio->flags |= IOMAP_DIO_WRITE_FUA;
> + }
> }
>
> if (dio_flags & IOMAP_DIO_OVERWRITE_ONLY) {
> diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c
> index bcb21aea990a..04a98b4cd7ee 100644
> --- a/fs/zonefs/super.c
> +++ b/fs/zonefs/super.c
> @@ -746,7 +746,7 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from)
> REQ_OP_ZONE_APPEND | REQ_SYNC | REQ_IDLE, GFP_NOFS);
> bio->bi_iter.bi_sector = zi->i_zsector;
> bio->bi_ioprio = iocb->ki_ioprio;
> - if (iocb->ki_flags & IOCB_DSYNC)
> + if (iocb_is_dsync(iocb))
> bio->bi_opf |= REQ_FUA;
>
> ret = bio_iov_iter_get_pages(bio, from);
> diff --git a/include/linux/fs.h b/include/linux/fs.h
> index 6a2a4906041f..380a1292f4f9 100644
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@ -2720,6 +2720,12 @@ extern int vfs_fsync(struct file *file, int datasync);
> extern int sync_file_range(struct file *file, loff_t offset, loff_t nbytes,
> unsigned int flags);
>
> +static inline bool iocb_is_dsync(const struct kiocb *iocb)
> +{
> + return (iocb->ki_flags & IOCB_DSYNC) ||
> + IS_SYNC(iocb->ki_filp->f_mapping->host);
> +}
> +
> /*
> * Sync the bytes written if this was a synchronous write. Expect ki_pos
> * to already be updated for the write, and will return either the amount
> @@ -2727,7 +2733,7 @@ extern int sync_file_range(struct file *file, loff_t offset, loff_t nbytes,
> */
> static inline ssize_t generic_write_sync(struct kiocb *iocb, ssize_t count)
> {
> - if (iocb->ki_flags & IOCB_DSYNC) {
> + if (iocb_is_dsync(iocb)) {
> int ret = vfs_fsync_range(iocb->ki_filp,
> iocb->ki_pos - count, iocb->ki_pos - 1,
> (iocb->ki_flags & IOCB_SYNC) ? 0 : 1);
> @@ -3262,7 +3268,7 @@ static inline int iocb_flags(struct file *file)
> res |= IOCB_APPEND;
> if (file->f_flags & O_DIRECT)
> res |= IOCB_DIRECT;
> - if ((file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host))
> + if (file->f_flags & O_DSYNC)
> res |= IOCB_DSYNC;
> if (file->f_flags & __O_SYNC)
> res |= IOCB_SYNC;
> --
> 2.30.2
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
