From: Brian Foster <bfoster@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH for-4.14] xfs: fix AIM7 regression
Date: Thu, 19 Oct 2017 07:38:48 -0400 [thread overview]
Message-ID: <20171019113848.GA8911@bfoster.bfoster> (raw)
In-Reply-To: <20171019074705.24827-1-hch@lst.de>
On Thu, Oct 19, 2017 at 09:47:05AM +0200, Christoph Hellwig wrote:
> Apparently our current rwsem code doesn't like doing the trylock, then
> lock for real scheme. So change our read/write methods to just do the
> trylock for the RWF_NOWAIT case. This fixes a ~25% regression in
> AIM7.
>
The code looks fine, but this seems really strange. If the trylock
fails, then wouldn't the blocking lock have slept anyways if done
initially? Is there any more background info available on this, or
perhaps a theory on why there is such a significant regression..?
Brian
> Fixes: 91f9943e ("fs: support RWF_NOWAIT for buffered reads")
> Reported-by: kernel test robot <xiaolong.ye@intel.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/xfs/xfs_file.c | 21 +++++++++++++--------
> 1 file changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index 309e26c9dddb..f40b5da5d467 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -237,11 +237,13 @@ xfs_file_dax_read(
> if (!count)
> return 0; /* skip atime */
>
> - if (!xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED)) {
> - if (iocb->ki_flags & IOCB_NOWAIT)
> + if (iocb->ki_flags & IOCB_NOWAIT) {
> + if (!xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED))
> return -EAGAIN;
> + } else {
> xfs_ilock(ip, XFS_IOLOCK_SHARED);
> }
> +
> ret = dax_iomap_rw(iocb, to, &xfs_iomap_ops);
> xfs_iunlock(ip, XFS_IOLOCK_SHARED);
>
> @@ -259,9 +261,10 @@ xfs_file_buffered_aio_read(
>
> trace_xfs_file_buffered_read(ip, iov_iter_count(to), iocb->ki_pos);
>
> - if (!xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED)) {
> - if (iocb->ki_flags & IOCB_NOWAIT)
> + if (iocb->ki_flags & IOCB_NOWAIT) {
> + if (!xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED))
> return -EAGAIN;
> + } else {
> xfs_ilock(ip, XFS_IOLOCK_SHARED);
> }
> ret = generic_file_read_iter(iocb, to);
> @@ -552,9 +555,10 @@ xfs_file_dio_aio_write(
> iolock = XFS_IOLOCK_SHARED;
> }
>
> - if (!xfs_ilock_nowait(ip, iolock)) {
> - if (iocb->ki_flags & IOCB_NOWAIT)
> + if (iocb->ki_flags & IOCB_NOWAIT) {
> + if (!xfs_ilock_nowait(ip, iolock))
> return -EAGAIN;
> + } else {
> xfs_ilock(ip, iolock);
> }
>
> @@ -606,9 +610,10 @@ xfs_file_dax_write(
> size_t count;
> loff_t pos;
>
> - if (!xfs_ilock_nowait(ip, iolock)) {
> - if (iocb->ki_flags & IOCB_NOWAIT)
> + if (iocb->ki_flags & IOCB_NOWAIT) {
> + if (!xfs_ilock_nowait(ip, iolock))
> return -EAGAIN;
> + } else {
> xfs_ilock(ip, iolock);
> }
>
> --
> 2.14.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-10-19 11:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-19 7:47 [PATCH for-4.14] xfs: fix AIM7 regression Christoph Hellwig
2017-10-19 11:38 ` Brian Foster [this message]
2017-10-19 13:14 ` Christoph Hellwig
2017-10-19 22:44 ` Darrick J. Wong
2017-10-20 6:55 ` Christoph Hellwig
2017-11-07 10:22 ` 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=20171019113848.GA8911@bfoster.bfoster \
--to=bfoster@redhat.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/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