From: Jan Kara <jack@suse.cz>
To: Gabriel Krisman Bertazi <krisman@collabora.com>
Cc: viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org,
jack@suse.cz, khazhy@google.com, kernel@collabora.com
Subject: Re: [PATCH v3 1/3] direct-io: clean up error paths of do_blockdev_direct_IO
Date: Mon, 7 Sep 2020 11:32:41 +0200 [thread overview]
Message-ID: <20200907093241.GD16559@quack2.suse.cz> (raw)
In-Reply-To: <20200905052023.3719585-2-krisman@collabora.com>
On Sat 05-09-20 01:20:21, Gabriel Krisman Bertazi wrote:
> In preparation to resort DIO checks, reduce code duplication of error
> handling in do_blockdev_direct_IO.
>
> Changes since V1:
> - Remove fail_dio_unlocked (Me)
> - Ensure fail_dio won't call inode_unlock() for writes (Jan Kara)
Please add the patch changelogs below the diffstat. That way they won't be
in the final changelog (which is the right thing to do because they are
mostly irrelevant for the final patch).
Otherwise the patch looks good to me so feel free to add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
>
> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
> ---
> fs/direct-io.c | 35 ++++++++++++++---------------------
> 1 file changed, 14 insertions(+), 21 deletions(-)
>
> diff --git a/fs/direct-io.c b/fs/direct-io.c
> index 183299892465..6c11db1cec27 100644
> --- a/fs/direct-io.c
> +++ b/fs/direct-io.c
> @@ -1170,7 +1170,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
> blkbits = blksize_bits(bdev_logical_block_size(bdev));
> blocksize_mask = (1 << blkbits) - 1;
> if (align & blocksize_mask)
> - goto out;
> + return -EINVAL;
> }
>
> /* watch out for a 0 len io from a tricksy fs */
> @@ -1178,9 +1178,8 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
> return 0;
>
> dio = kmem_cache_alloc(dio_cache, GFP_KERNEL);
> - retval = -ENOMEM;
> if (!dio)
> - goto out;
> + return -ENOMEM;
> /*
> * Believe it or not, zeroing out the page array caused a .5%
> * performance regression in a database benchmark. So, we take
> @@ -1199,22 +1198,16 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
>
> retval = filemap_write_and_wait_range(mapping, offset,
> end - 1);
> - if (retval) {
> - inode_unlock(inode);
> - kmem_cache_free(dio_cache, dio);
> - goto out;
> - }
> + if (retval)
> + goto fail_dio;
> }
> }
>
> /* Once we sampled i_size check for reads beyond EOF */
> dio->i_size = i_size_read(inode);
> if (iov_iter_rw(iter) == READ && offset >= dio->i_size) {
> - if (dio->flags & DIO_LOCKING)
> - inode_unlock(inode);
> - kmem_cache_free(dio_cache, dio);
> retval = 0;
> - goto out;
> + goto fail_dio;
> }
>
> /*
> @@ -1258,14 +1251,8 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
> */
> retval = sb_init_dio_done_wq(dio->inode->i_sb);
> }
> - if (retval) {
> - /*
> - * We grab i_mutex only for reads so we don't have
> - * to release it here
> - */
> - kmem_cache_free(dio_cache, dio);
> - goto out;
> - }
> + if (retval)
> + goto fail_dio;
> }
>
> /*
> @@ -1368,7 +1355,13 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
> } else
> BUG_ON(retval != -EIOCBQUEUED);
>
> -out:
> + return retval;
> +
> +fail_dio:
> + if (dio->flags & DIO_LOCKING && iov_iter_rw(iter) == READ)
> + inode_unlock(inode);
> +
> + kmem_cache_free(dio_cache, dio);
> return retval;
> }
>
> --
> 2.28.0
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2020-09-07 9:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-05 5:20 [PATCH v3 0/3] Unaligned DIO read error path fix and clean ups Gabriel Krisman Bertazi
2020-09-05 5:20 ` [PATCH v3 1/3] direct-io: clean up error paths of do_blockdev_direct_IO Gabriel Krisman Bertazi
2020-09-07 9:32 ` Jan Kara [this message]
2020-09-05 5:20 ` [PATCH v3 2/3] direct-io: don't force writeback for reads beyond EOF Gabriel Krisman Bertazi
2020-09-05 5:20 ` [PATCH v3 3/3] direct-io: defer alignment check until after the EOF check Gabriel Krisman Bertazi
2020-09-07 9:36 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200907093241.GD16559@quack2.suse.cz \
--to=jack@suse.cz \
--cc=kernel@collabora.com \
--cc=khazhy@google.com \
--cc=krisman@collabora.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).