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 X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AE65C433E6 for ; Wed, 20 Jan 2021 18:18:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F3DC0233FC for ; Wed, 20 Jan 2021 18:18:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391925AbhATSSS (ORCPT ); Wed, 20 Jan 2021 13:18:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:47134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391868AbhATSR7 (ORCPT ); Wed, 20 Jan 2021 13:17:59 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5C833233ED; Wed, 20 Jan 2021 18:17:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611166625; bh=MXcL5xxpoxbaBs8ogNANUaj+c2tAvr/SBQjpEvQ+pKE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ygd3KdPMRG9N2ax87S+X19TxQxafd6MDGZ5EBirS5Ig8nfXW6jgjJa3TOpOZ1+Qi5 cP5GnySM2SWuC0/kbYGKIpKGttZ5lJJg8hB8GrQ3IRrRW1F6zCK2P31o7QTUJOLR8H 79oKK+C/DsvgsxrpZnzSbsh2s8ZOsK5WhRJifEZYCt4wvOOsS4OFnQqG49O4OUr3ck vvIUABMhPHzrauSphnCa/XLFXQ210V4yS8roHOJjRNm22qbNKBZyg8EriO0wUFEbWn VHQpZjgzfPo5d5sUM8quVgCrMMzwt3Qgs/umvPMDi2hv9pkussCgeXuoHMmJYwljmu 47kK8dTwYvvjQ== Date: Wed, 20 Jan 2021 10:17:04 -0800 From: "Darrick J. Wong" To: Christoph Hellwig Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, avi@scylladb.com Subject: Re: [PATCH 09/11] iomap: pass a flags argument to iomap_dio_rw Message-ID: <20210120181704.GB3134581@magnolia> References: <20210118193516.2915706-1-hch@lst.de> <20210118193516.2915706-10-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210118193516.2915706-10-hch@lst.de> Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Mon, Jan 18, 2021 at 08:35:14PM +0100, Christoph Hellwig wrote: > 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: Christoph Hellwig > --- > fs/btrfs/file.c | 7 +++---- > fs/ext4/file.c | 5 ++--- > fs/gfs2/file.c | 7 ++----- > fs/iomap/direct-io.c | 11 +++++------ > fs/xfs/xfs_file.c | 7 +++---- > fs/zonefs/super.c | 4 ++-- > include/linux/iomap.h | 10 ++++++++-- > 7 files changed, 25 insertions(+), 26 deletions(-) > > diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c > index 0e41459b8de667..ddfd2e2adedf58 100644 > --- a/fs/btrfs/file.c > +++ b/fs/btrfs/file.c > @@ -1949,8 +1949,8 @@ static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from) > goto buffered; > } > > - dio = __iomap_dio_rw(iocb, from, &btrfs_dio_iomap_ops, > - &btrfs_dio_ops, is_sync_kiocb(iocb)); > + dio = __iomap_dio_rw(iocb, from, &btrfs_dio_iomap_ops, &btrfs_dio_ops, > + 0); > > btrfs_inode_unlock(inode, ilock_flags); > > @@ -3622,8 +3622,7 @@ static ssize_t btrfs_direct_read(struct kiocb *iocb, struct iov_iter *to) > return 0; > > btrfs_inode_lock(inode, BTRFS_ILOCK_SHARED); > - ret = iomap_dio_rw(iocb, to, &btrfs_dio_iomap_ops, &btrfs_dio_ops, > - is_sync_kiocb(iocb)); > + ret = iomap_dio_rw(iocb, to, &btrfs_dio_iomap_ops, &btrfs_dio_ops, 0); > btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED); > return ret; > } > diff --git a/fs/ext4/file.c b/fs/ext4/file.c > index 349b27f0dda0cb..194f5d00fa3267 100644 > --- a/fs/ext4/file.c > +++ b/fs/ext4/file.c > @@ -74,8 +74,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); > @@ -550,7 +549,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; > > diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c > index b39b339feddc93..89609c2997177a 100644 > --- a/fs/gfs2/file.c > +++ b/fs/gfs2/file.c > @@ -797,9 +797,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); > @@ -833,8 +831,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: > diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c > index 604103ab76f9c5..32dbbf7dd4aadb 100644 > --- a/fs/iomap/direct-io.c > +++ b/fs/iomap/direct-io.c > @@ -420,13 +420,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; > @@ -434,9 +436,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); > @@ -598,11 +597,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 flags) Can this be named "dio_flags", since it's passed directly into __iomap_dio_rw? > { > struct iomap_dio *dio; > > - dio = __iomap_dio_rw(iocb, iter, ops, dops, wait_for_completion); > + dio = __iomap_dio_rw(iocb, iter, ops, dops, flags); > if (IS_ERR_OR_NULL(dio)) > return PTR_ERR_OR_ZERO(dio); > return iomap_dio_complete(dio); > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c > index bffd7240cefb7f..b181db42f2f32f 100644 > --- a/fs/xfs/xfs_file.c > +++ b/fs/xfs/xfs_file.c > @@ -232,8 +232,7 @@ xfs_file_dio_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; > @@ -535,7 +534,7 @@ xfs_file_dio_write_aligned( > } > trace_xfs_file_direct_write(iocb, from); > ret = iomap_dio_rw(iocb, from, &xfs_direct_write_iomap_ops, > - &xfs_dio_write_ops, is_sync_kiocb(iocb)); > + &xfs_dio_write_ops, 0); > out_unlock: > if (iolock) > xfs_iunlock(ip, iolock); > @@ -603,7 +602,7 @@ xfs_file_dio_write_unaligned( > */ > trace_xfs_file_direct_write(iocb, from); > ret = iomap_dio_rw(iocb, from, &xfs_direct_write_iomap_ops, > - &xfs_dio_write_ops, true); > + &xfs_dio_write_ops, IOMAP_DIO_FORCE_WAIT); > out_unlock: > if (iolock) > xfs_iunlock(ip, iolock); > diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c > index bec47f2d074beb..0e7ab0bc00ae8e 100644 > --- a/fs/zonefs/super.c > +++ b/fs/zonefs/super.c > @@ -780,7 +780,7 @@ static ssize_t zonefs_file_dio_write(struct kiocb *iocb, struct iov_iter *from) > ret = zonefs_file_dio_append(iocb, from); > else > ret = iomap_dio_rw(iocb, from, &zonefs_iomap_ops, > - &zonefs_write_dio_ops, sync); > + &zonefs_write_dio_ops, 0); > if (zi->i_ztype == ZONEFS_ZTYPE_SEQ && > (ret > 0 || ret == -EIOCBQUEUED)) { > if (ret > 0) > @@ -917,7 +917,7 @@ static ssize_t zonefs_file_read_iter(struct kiocb *iocb, struct iov_iter *to) > } > file_accessed(iocb->ki_filp); > ret = iomap_dio_rw(iocb, to, &zonefs_iomap_ops, > - &zonefs_read_dio_ops, is_sync_kiocb(iocb)); > + &zonefs_read_dio_ops, 0); > } else { > ret = generic_file_read_iter(iocb, to); > if (ret == -EIO) > diff --git a/include/linux/iomap.h b/include/linux/iomap.h > index 5bd3cac4df9cb4..b322598dc10ec0 100644 > --- a/include/linux/iomap.h > +++ b/include/linux/iomap.h > @@ -256,12 +256,18 @@ struct iomap_dio_ops { > struct bio *bio, loff_t file_offset); > }; > > +/* > + * Wait for the I/O to complete in iomap_dio_rw even if the kiocb is not > + * synchronous. > + */ > +#define IOMAP_DIO_FORCE_WAIT (1 << 0) > + > 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 flags); > 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 flags); ...and please make the naming of that last parameter consistent with the definitions. :) Everything else here looks ok to me. --D > ssize_t iomap_dio_complete(struct iomap_dio *dio); > int iomap_dio_iopoll(struct kiocb *kiocb, bool spin); > > -- > 2.29.2 >