Commit adad6411 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Zhihao Cheng
Browse files

iomap: pass a flags argument to iomap_dio_rw 

mainline inclusion
from mainline-v5.12-rc1
commit 2f632965
category: perf
bugzilla: https://gitee.com/openeuler/kernel/issues/I90ZB5
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2f63296578cad1ae681152d5b2122a4595195f16



--------------------------------

Pass a set of flags to iomap_dio_rw instead of the boolean
wait_for_completion argument.  The IOMAP_DIO_FORCE_WAIT flag
replaces the wait_for_completion, but only needs to be passed
when the iocb isn't synchronous to start with to simplify the
callers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
[djwong: rework xfs_file.c so that we can push iomap changes separately]
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Conflicts:
	fs/btrfs/inode.c
	fs/xfs/xfs_file.c
	fs/zonefs/super.c
Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
parent c97411a3

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -8084,10 +8084,10 @@ ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
	 */

	if (current->journal_info)

		ret = iomap_dio_rw(iocb, iter, &btrfs_dio_iomap_ops,

				   &btrfs_sync_dops, is_sync_kiocb(iocb));

				   &btrfs_sync_dops, 0);

	else

		ret = iomap_dio_rw(iocb, iter, &btrfs_dio_iomap_ops,

				   &btrfs_dio_ops, is_sync_kiocb(iocb));

				   &btrfs_dio_ops, 0);



	if (ret == -ENOTBLK)

		ret = 0;

fs/ext4/file.c

+2 −3
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ static ssize_t ext4_dio_read_iter(struct kiocb *iocb, struct iov_iter *to) 
		return generic_file_read_iter(iocb, to);

	}



	ret = iomap_dio_rw(iocb, to, &ext4_iomap_ops, NULL,

			   is_sync_kiocb(iocb));

	ret = iomap_dio_rw(iocb, to, &ext4_iomap_ops, NULL, 0);

	inode_unlock_shared(inode);



	file_accessed(iocb->ki_filp);
@@ -573,7 +572,7 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	if (ilock_shared)

		iomap_ops = &ext4_iomap_overwrite_ops;

	ret = iomap_dio_rw(iocb, from, iomap_ops, &ext4_dio_write_ops,

			   is_sync_kiocb(iocb) || unaligned_io || extend);

			   (unaligned_io || extend) ? IOMAP_DIO_FORCE_WAIT : 0);

	if (ret == -ENOTBLK)

		ret = 0;

fs/gfs2/file.c

+2 −5
Original line number Diff line number Diff line
@@ -798,9 +798,7 @@ static ssize_t gfs2_file_direct_read(struct kiocb *iocb, struct iov_iter *to, 
	if (ret)

		goto out_uninit;



	ret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL,

			   is_sync_kiocb(iocb));



	ret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL, 0);

	gfs2_glock_dq(gh);

out_uninit:

	gfs2_holder_uninit(gh);
@@ -834,8 +832,7 @@ static ssize_t gfs2_file_direct_write(struct kiocb *iocb, struct iov_iter *from, 
	if (offset + len > i_size_read(&ip->i_inode))

		goto out;



	ret = iomap_dio_rw(iocb, from, &gfs2_iomap_ops, NULL,

			   is_sync_kiocb(iocb));

	ret = iomap_dio_rw(iocb, from, &gfs2_iomap_ops, NULL, 0);

	if (ret == -ENOTBLK)

		ret = 0;

out:

fs/iomap/direct-io.c

+5 −6
Original line number Diff line number Diff line
@@ -439,13 +439,15 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length, 
struct iomap_dio *

__iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,

		const struct iomap_ops *ops, const struct iomap_dio_ops *dops,

		bool wait_for_completion)

		unsigned int dio_flags)

{

	struct address_space *mapping = iocb->ki_filp->f_mapping;

	struct inode *inode = file_inode(iocb->ki_filp);

	size_t count = iov_iter_count(iter);

	loff_t pos = iocb->ki_pos;

	loff_t end = iocb->ki_pos + count - 1, ret = 0;

	bool wait_for_completion =

		is_sync_kiocb(iocb) || (dio_flags & IOMAP_DIO_FORCE_WAIT);

	unsigned int iomap_flags = IOMAP_DIRECT;

	struct blk_plug plug;

	struct iomap_dio *dio;
@@ -453,9 +455,6 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, 
	if (!count)

		return NULL;



	if (WARN_ON(is_sync_kiocb(iocb) && !wait_for_completion))

		return ERR_PTR(-EIO);



	dio = kmalloc(sizeof(*dio), GFP_KERNEL);

	if (!dio)

		return ERR_PTR(-ENOMEM);
@@ -620,11 +619,11 @@ EXPORT_SYMBOL_GPL(__iomap_dio_rw); 
ssize_t

iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,

		const struct iomap_ops *ops, const struct iomap_dio_ops *dops,

		bool wait_for_completion)

		unsigned int dio_flags)

{

	struct iomap_dio *dio;



	dio = __iomap_dio_rw(iocb, iter, ops, dops, wait_for_completion);

	dio = __iomap_dio_rw(iocb, iter, ops, dops, dio_flags);

	if (IS_ERR_OR_NULL(dio))

		return PTR_ERR_OR_ZERO(dio);

	return iomap_dio_complete(dio);

fs/xfs/xfs_file.c

+2 −3
Original line number Diff line number Diff line
@@ -263,8 +263,7 @@ xfs_file_dio_aio_read( 
	ret = xfs_ilock_iocb(iocb, XFS_IOLOCK_SHARED);

	if (ret)

		return ret;

	ret = iomap_dio_rw(iocb, to, &xfs_read_iomap_ops, NULL,

			is_sync_kiocb(iocb));

	ret = iomap_dio_rw(iocb, to, &xfs_read_iomap_ops, NULL, 0);

	xfs_iunlock(ip, XFS_IOLOCK_SHARED);



	return ret;
@@ -651,7 +650,7 @@ xfs_file_dio_aio_write( 
	 */

	ret = iomap_dio_rw(iocb, from, &xfs_direct_write_iomap_ops,

			   &xfs_dio_write_ops,

			   is_sync_kiocb(iocb) || unaligned_io);

			   unaligned_io ? IOMAP_DIO_FORCE_WAIT : 0);

out:

	if (iolock)

		xfs_iunlock(ip, iolock);