From: Eric Sandeen <esandeen@redhat.com>
To: Dave Jiang <dave.jiang@intel.com>,
tytso@mit.edu, darrick.wong@oracle.com, jack@suse.cz,
zwisler@kernel.org
Cc: linux-nvdimm@lists.01.org, david@fromorbit.com,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
lczerner@redhat.com, linux-ext4@vger.kernel.org, hch@lst.de
Subject: Re: [PATCH v2 2/2] [PATCH] xfs: Close race between direct IO and xfs_break_layouts()
Date: Fri, 10 Aug 2018 13:31:57 -0500 [thread overview]
Message-ID: <be8603ab-ccb2-3f0d-4dbf-7935fc3ed357@redhat.com> (raw)
In-Reply-To: <153374942137.42241.10539674028265137668.stgit@djiang5-desk3.ch.intel.com>
On 8/8/18 12:31 PM, Dave Jiang wrote:
> This patch is the duplicate of ross's fix for ext4 for xfs.
>
> If the refcount of a page is lowered between the time that it is returned
> by dax_busy_page() and when the refcount is again checked in
> xfs_break_layouts() => ___wait_var_event(), the waiting function
> xfs_wait_dax_page() will never be called. This means that
> xfs_break_layouts() will still have 'retry' set to false, so we'll stop
> looping and never check the refcount of other pages in this inode.
>
> Instead, always continue looping as long as dax_layout_busy_page() gives us
> a page which it found with an elevated refcount.
Hi Dave, does this have a testcase? Have you seen the issue using Ross's
xfstest generic/503 or is there some other test? Apologies if I missed
prior discussion on a testcase or race frequency...
Thanks,
-Eric
> Signed-off-by: Dave Jiang <dave.jiang@intel.com>
> Reviewed-by: Jan Kara <jack@suse.cz>
> ---
>
> Sorry resend, forgot to add Jan's reviewed-by.
>
> v2:
> - Rename parameter from did_unlock to retry (Jan)
>
> fs/xfs/xfs_file.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index a3e7767a5715..cd6f0d8c4922 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -721,12 +721,10 @@ xfs_file_write_iter(
>
> static void
> xfs_wait_dax_page(
> - struct inode *inode,
> - bool *did_unlock)
> + struct inode *inode)
> {
> struct xfs_inode *ip = XFS_I(inode);
>
> - *did_unlock = true;
> xfs_iunlock(ip, XFS_MMAPLOCK_EXCL);
> schedule();
> xfs_ilock(ip, XFS_MMAPLOCK_EXCL);
> @@ -736,7 +734,7 @@ static int
> xfs_break_dax_layouts(
> struct inode *inode,
> uint iolock,
> - bool *did_unlock)
> + bool *retry)
> {
> struct page *page;
>
> @@ -746,9 +744,10 @@ xfs_break_dax_layouts(
> if (!page)
> return 0;
>
> + *retry = true;
> return ___wait_var_event(&page->_refcount,
> atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE,
> - 0, 0, xfs_wait_dax_page(inode, did_unlock));
> + 0, 0, xfs_wait_dax_page(inode));
> }
>
> int
>
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
next prev parent reply other threads:[~2018-08-10 18:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-08 17:31 [PATCH v2 2/2] [PATCH] xfs: Close race between direct IO and xfs_break_layouts() Dave Jiang
2018-08-10 15:48 ` Darrick J. Wong
2018-08-10 15:54 ` Dave Jiang
2018-08-10 16:02 ` Darrick J. Wong
2018-08-10 16:05 ` Dave Jiang
2018-08-10 18:31 ` Eric Sandeen [this message]
2018-08-10 19:23 ` Dave Jiang
2018-08-10 19:24 ` Ross Zwisler
2018-08-10 19:26 ` Eric Sandeen
-- strict thread matches above, loose matches on Subject: below --
2018-08-08 17:25 [PATCH v2 1/2] ext4: Close race between direct IO and ext4_break_layouts() Dave Jiang
2018-08-08 17:26 ` [PATCH v2 2/2] [PATCH] xfs: Close race between direct IO and xfs_break_layouts() Dave Jiang
2018-08-09 8:57 ` Jan Kara
2018-08-09 16:21 ` Dave Jiang
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=be8603ab-ccb2-3f0d-4dbf-7935fc3ed357@redhat.com \
--to=esandeen@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=dave.jiang@intel.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=lczerner@redhat.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@redhat.com \
--cc=tytso@mit.edu \
--cc=zwisler@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;
as well as URLs for NNTP newsgroup(s).