All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Brian Foster <bfoster@redhat.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 11/11] xfs: avoid ABBA deadlock when scrubbing parent pointers
Date: Thu, 19 Apr 2018 10:33:40 -0700	[thread overview]
Message-ID: <20180419173340.GZ24738@magnolia> (raw)
In-Reply-To: <20180419125606.GE25844@bfoster.bfoster>

On Thu, Apr 19, 2018 at 08:56:07AM -0400, Brian Foster wrote:
> On Tue, Apr 17, 2018 at 07:40:44PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> > 
> > In normal operation, the XFS convention is to take an inode's iolock
> > and then allocate a transaction.  However, when scrubbing parent inodes
> > this is inverted -- we allocated the transaction to do the scrub, and
> > now we're trying to grab the parent's iolock.  This can lead to ABBA
> > deadlocks: some thread grabbed the parent's iolock and is waiting for
> > space for a transaction while our parent scrubber is sitting on a
> > transaction trying to get the parent's iolock.
> > 
> 
> Is that really an issue if the scrub transaction doesn't acquire a log
> reservation (or does it in certain circumstances)..?

Once we get to the repair series the transactions will have reservations
for logging metadata changes from the metadata rebuilds.

For a non-repair scrub invocation it's pretty simple:
1. Allocate zero-reservation (empty) transaction
2. Iterate metadata, check stuff
3. Cancel transaction, exit to userland

For a repair it's much more complicated:
1. Allocate a big permanent-reservation transaction
2. Iterate metadata, check stuff (same as #2 above)
3. If the metadata is ok, cancel and exit to userland
4. Create set of records that metadata is supposed to have
5. Zap metadata root
6. Insert record, roll transaction, repeat...
7. Commit transaction
8. Run non-repair scrub to see if we fixed it.

So this patch is more of a cleanup to prepare for the circumstances
changing later. :)

--D

> Brian
> 
> > Therefore, convert all iolock attempts to use trylock; if that fails,
> > they can use the existing mechanisms to back off and try again.
> > 
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> >  fs/xfs/scrub/common.c |   22 ++++++++++++++++++++++
> >  fs/xfs/scrub/common.h |    2 ++
> >  fs/xfs/scrub/parent.c |   16 ++++++++++++++--
> >  3 files changed, 38 insertions(+), 2 deletions(-)
> > 
> > 
> > diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
> > index f5e281a..93f9e7d 100644
> > --- a/fs/xfs/scrub/common.c
> > +++ b/fs/xfs/scrub/common.c
> > @@ -787,3 +787,25 @@ xfs_scrub_buffer_recheck(
> >  	sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT;
> >  	trace_xfs_scrub_block_error(sc, bp->b_bn, fa);
> >  }
> > +
> > +/*
> > + * Try to lock an inode in violation of the usual locking order rules.  For
> > + * example, trying to get the IOLOCK while in transaction context, or just
> > + * plain breaking AG-order or inode-order inode locking rules.  Either way,
> > + * the only way to avoid an ABBA deadlock is to use trylock and back off if
> > + * we can't.
> > + */
> > +int
> > +xfs_scrub_ilock_inverted(
> > +	struct xfs_inode	*ip,
> > +	uint			lock_mode)
> > +{
> > +	int			i;
> > +
> > +	for (i = 0; i < 20; i++) {
> > +		if (xfs_ilock_nowait(ip, lock_mode))
> > +			return 0;
> > +		delay(1);
> > +	}
> > +	return -EDEADLOCK;
> > +}
> > diff --git a/fs/xfs/scrub/common.h b/fs/xfs/scrub/common.h
> > index 8296873..191c369 100644
> > --- a/fs/xfs/scrub/common.h
> > +++ b/fs/xfs/scrub/common.h
> > @@ -151,4 +151,6 @@ static inline bool xfs_scrub_found_corruption(struct xfs_scrub_metadata *sm)
> >  			       XFS_SCRUB_OFLAG_XCORRUPT);
> >  }
> >  
> > +int xfs_scrub_ilock_inverted(struct xfs_inode *ip, uint lock_mode);
> > +
> >  #endif	/* __XFS_SCRUB_COMMON_H__ */
> > diff --git a/fs/xfs/scrub/parent.c b/fs/xfs/scrub/parent.c
> > index 1fb88c1..19cd54d 100644
> > --- a/fs/xfs/scrub/parent.c
> > +++ b/fs/xfs/scrub/parent.c
> > @@ -211,7 +211,9 @@ xfs_scrub_parent_validate(
> >  	 */
> >  	xfs_iunlock(sc->ip, sc->ilock_flags);
> >  	sc->ilock_flags = 0;
> > -	xfs_ilock(dp, XFS_IOLOCK_SHARED);
> > +	error = xfs_scrub_ilock_inverted(dp, XFS_IOLOCK_SHARED);
> > +	if (error)
> > +		goto out_rele;
> >  
> >  	/* Go looking for our dentry. */
> >  	error = xfs_scrub_parent_count_parent_dentries(sc, dp, &nlink);
> > @@ -220,8 +222,10 @@ xfs_scrub_parent_validate(
> >  
> >  	/* Drop the parent lock, relock this inode. */
> >  	xfs_iunlock(dp, XFS_IOLOCK_SHARED);
> > +	error = xfs_scrub_ilock_inverted(sc->ip, XFS_IOLOCK_EXCL);
> > +	if (error)
> > +		goto out_rele;
> >  	sc->ilock_flags = XFS_IOLOCK_EXCL;
> > -	xfs_ilock(sc->ip, sc->ilock_flags);
> >  
> >  	/*
> >  	 * If we're an unlinked directory, the parent /won't/ have a link
> > @@ -323,5 +327,13 @@ xfs_scrub_parent(
> >  	if (try_again && tries == 20)
> >  		xfs_scrub_set_incomplete(sc);
> >  out:
> > +	/*
> > +	 * If we failed to lock the parent inode even after a retry, just mark
> > +	 * this scrub incomplete and return.
> > +	 */
> > +	if (sc->try_harder && error == -EDEADLOCK) {
> > +		error = 0;
> > +		xfs_scrub_set_incomplete(sc);
> > +	}
> >  	return error;
> >  }
> > 
> > --
> > 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
> --
> 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

  reply	other threads:[~2018-04-19 17:34 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-18  2:39 [PATCH 00/11] xfs-4.18: online scrub fixes Darrick J. Wong
2018-04-18  2:39 ` [PATCH 01/11] xfs: skip scrub xref if corruption already noted Darrick J. Wong
2018-04-18 15:03   ` Brian Foster
2018-04-18 16:02     ` Darrick J. Wong
2018-04-18  2:39 ` [PATCH 02/11] xfs: create the XFS_QMOPT_QUOTIP_LOCKED flag Darrick J. Wong
2018-04-18 15:33   ` Brian Foster
2018-04-18 16:55     ` Darrick J. Wong
2018-04-18 17:09       ` Brian Foster
2018-04-19  8:32   ` Christoph Hellwig
2018-04-21 18:42     ` Darrick J. Wong
2018-04-18  2:39 ` [PATCH 03/11] xfs: report failing address when dquot verifier fails Darrick J. Wong
2018-04-18 18:33   ` Brian Foster
2018-04-18  2:40 ` [PATCH 04/11] xfs: refactor dquot iteration Darrick J. Wong
2018-04-18 18:34   ` Brian Foster
2018-04-18 22:20     ` Darrick J. Wong
2018-04-18  2:40 ` [PATCH 05/11] xfs: avoid ilock games in the quota scrubber Darrick J. Wong
2018-04-18 18:34   ` Brian Foster
2018-04-18  2:40 ` [PATCH 06/11] xfs: quota scrub should use bmapbtd scrubber Darrick J. Wong
2018-04-18 18:34   ` Brian Foster
2018-04-18 20:00     ` Darrick J. Wong
2018-04-19 11:20       ` Brian Foster
2018-04-18  2:40 ` [PATCH 07/11] xfs: superblock scrub should use uncached buffers Darrick J. Wong
2018-04-19 12:55   ` Brian Foster
2018-04-19 17:25     ` Darrick J. Wong
2018-04-19 18:57       ` Brian Foster
2018-04-20  0:07         ` Dave Chinner
2018-04-21  0:29           ` Darrick J. Wong
2018-04-20  0:05       ` Dave Chinner
2018-04-18  2:40 ` [PATCH 08/11] xfs: clean up scrub usage of KM_NOFS Darrick J. Wong
2018-04-19 12:55   ` Brian Foster
2018-04-18  2:40 ` [PATCH 09/11] xfs: btree scrub should check minrecs Darrick J. Wong
2018-04-19 12:55   ` Brian Foster
2018-04-18  2:40 ` [PATCH 10/11] xfs: refactor scrub transaction allocation function Darrick J. Wong
2018-04-19 12:56   ` Brian Foster
2018-04-18  2:40 ` [PATCH 11/11] xfs: avoid ABBA deadlock when scrubbing parent pointers Darrick J. Wong
2018-04-19 12:56   ` Brian Foster
2018-04-19 17:33     ` Darrick J. Wong [this message]
2018-04-19 18:58       ` Brian Foster
2018-04-19 19:06         ` Darrick J. Wong
2018-04-21  0:31           ` Darrick J. Wong

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=20180419173340.GZ24738@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=bfoster@redhat.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.