All of lore.kernel.org
 help / color / mirror / Atom feed
From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v15 01/37] xfsprogs: fix an ABBA deadlock in xfs_rename
Date: Thu, 18 Feb 2021 09:44:36 -0700	[thread overview]
Message-ID: <20210218164512.4659-2-allison.henderson@oracle.com> (raw)
In-Reply-To: <20210218164512.4659-1-allison.henderson@oracle.com>

From: "Darrick J. Wong" <darrick.wong@oracle.com>

Source kernel commit: 6da1b4b1ab36d80a3994fd4811c8381de10af604

When overlayfs is running on top of xfs and the user unlinks a file in
the overlay, overlayfs will create a whiteout inode and ask xfs to
"rename" the whiteout file atop the one being unlinked.  If the file
being unlinked loses its one nlink, we then have to put the inode on the
unlinked list.

This requires us to grab the AGI buffer of the whiteout inode to take it
off the unlinked list (which is where whiteouts are created) and to grab
the AGI buffer of the file being deleted.  If the whiteout was created
in a higher numbered AG than the file being deleted, we'll lock the AGIs
in the wrong order and deadlock.

Therefore, grab all the AGI locks we think we'll need ahead of time, and
in order of increasing AG number per the locking rules.

Reported-by: wenli xie <wlxie7296@gmail.com>
Fixes: 93597ae8dac0 ("xfs: Fix deadlock between AGI and AGF when target_ip exists in xfs_rename()")
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
 libxfs/xfs_dir2.h    | 2 --
 libxfs/xfs_dir2_sf.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h
index e553786..d03e609 100644
--- a/libxfs/xfs_dir2.h
+++ b/libxfs/xfs_dir2.h
@@ -47,8 +47,6 @@ extern int xfs_dir_lookup(struct xfs_trans *tp, struct xfs_inode *dp,
 extern int xfs_dir_removename(struct xfs_trans *tp, struct xfs_inode *dp,
 				struct xfs_name *name, xfs_ino_t ino,
 				xfs_extlen_t tot);
-extern bool xfs_dir2_sf_replace_needblock(struct xfs_inode *dp,
-				xfs_ino_t inum);
 extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp,
 				struct xfs_name *name, xfs_ino_t inum,
 				xfs_extlen_t tot);
diff --git a/libxfs/xfs_dir2_sf.c b/libxfs/xfs_dir2_sf.c
index fbbb638..e5a8e0c 100644
--- a/libxfs/xfs_dir2_sf.c
+++ b/libxfs/xfs_dir2_sf.c
@@ -1018,7 +1018,7 @@ xfs_dir2_sf_removename(
 /*
  * Check whether the sf dir replace operation need more blocks.
  */
-bool
+static bool
 xfs_dir2_sf_replace_needblock(
 	struct xfs_inode	*dp,
 	xfs_ino_t		inum)
-- 
2.7.4


  reply	other threads:[~2021-02-18 18:45 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-18 16:44 [PATCH v15 00/37] xfsprogs: Delayed Attributes Allison Henderson
2021-02-18 16:44 ` Allison Henderson [this message]
2021-02-18 16:44 ` [PATCH v15 02/37] xfsprogs: Add helper for checking per-inode extent count overflow Allison Henderson
2021-02-18 16:44 ` [PATCH v15 03/37] xfsprogs: Check for extent overflow when trivally adding a new extent Allison Henderson
2021-02-18 16:44 ` [PATCH v15 04/37] xfsprogs: Check for extent overflow when punching a hole Allison Henderson
2021-02-18 16:44 ` [PATCH v15 05/37] xfsprogs: Check for extent overflow when adding dir entries Allison Henderson
2021-02-18 16:44 ` [PATCH v15 06/37] xfsprogs: Check for extent overflow when removing " Allison Henderson
2021-02-18 16:44 ` [PATCH v15 07/37] xfsprogs: Check for extent overflow when renaming " Allison Henderson
2021-02-18 16:44 ` [PATCH v15 08/37] xfsprogs: Check for extent overflow when adding/removing xattrs Allison Henderson
2021-02-18 16:44 ` [PATCH v15 09/37] xfsprogs: Check for extent overflow when writing to unwritten extent Allison Henderson
2021-02-18 16:44 ` [PATCH v15 10/37] xfsprogs: Check for extent overflow when moving extent from cow to data fork Allison Henderson
2021-02-18 16:44 ` [PATCH v15 11/37] xfsprogs: Check for extent overflow when swapping extents Allison Henderson
2021-02-18 16:44 ` [PATCH v15 12/37] xfsprogs: Introduce error injection to reduce maximum inode fork extent count Allison Henderson
2021-02-18 16:44 ` [PATCH v15 13/37] xfsprogs: Remove duplicate assert statement in xfs_bmap_btalloc() Allison Henderson
2021-02-18 16:44 ` [PATCH v15 14/37] xfsprogs: Compute bmap extent alignments in a separate function Allison Henderson
2021-02-18 16:44 ` [PATCH v15 15/37] xfsprogs: Process allocated extent " Allison Henderson
2021-02-18 16:44 ` [PATCH v15 16/37] xfsprogs: Introduce error injection to allocate only minlen size extents for files Allison Henderson
2021-02-18 16:44 ` [PATCH v15 17/37] libxfs: expose inobtcount in xfs geometry Allison Henderson
2021-02-18 16:44 ` [PATCH v15 18/37] xfsprogs: Add helper xfs_attr_node_remove_step Allison Henderson
2021-02-18 16:44 ` [PATCH v15 19/37] xfsprogs: Add xfs_attr_node_remove_cleanup Allison Henderson
2021-02-18 16:44 ` [PATCH v15 20/37] xfsprogs: Hoist transaction handling in xfs_attr_node_remove_step Allison Henderson
2021-02-18 16:44 ` [PATCH v15 21/37] xfsprogs: Hoist xfs_attr_set_shortform Allison Henderson
2021-02-18 16:44 ` [PATCH v15 22/37] xfsprogs: Add helper xfs_attr_set_fmt Allison Henderson
2021-02-18 16:44 ` [PATCH v15 23/37] xfsprogs: Separate xfs_attr_node_addname and xfs_attr_node_addname_work Allison Henderson
2021-02-18 16:44 ` [PATCH v15 24/37] xfsprogs: Add helper xfs_attr_node_addname_find_attr Allison Henderson
2021-02-18 16:45 ` [PATCH v15 25/37] xfsprogs: Hoist xfs_attr_node_addname Allison Henderson
2021-02-18 16:45 ` [PATCH v15 26/37] xfsprogs: Hoist xfs_attr_leaf_addname Allison Henderson
2021-02-18 16:45 ` [PATCH v15 27/37] xfsprogs: Hoist node transaction handling Allison Henderson
2021-02-18 16:45 ` [PATCH v15 28/37] xfsprogs: Add delay ready attr remove routines Allison Henderson
2021-02-18 16:45 ` [PATCH v15 29/37] xfsprogs: Add delay ready attr set routines Allison Henderson
2021-02-18 16:45 ` [PATCH v15 30/37] xfsprogs: Add state machine tracepoints Allison Henderson
2021-02-18 16:45 ` [PATCH v15 31/37] xfsprogs: Rename __xfs_attr_rmtval_remove Allison Henderson
2021-02-18 16:45 ` [PATCH v15 32/37] xfsprogs: Set up infastructure for deferred attribute operations Allison Henderson
2021-02-18 16:45 ` [PATCH v15 33/37] xfsprogs: Skip flip flags for delayed attrs Allison Henderson
2021-02-18 16:45 ` [PATCH v15 34/37] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2021-02-18 16:45 ` [PATCH v15 35/37] xfsprogs: Remove unused xfs_attr_*_args Allison Henderson
2021-02-18 16:45 ` [PATCH v15 36/37] xfsprogs: Add delayed attributes error tag Allison Henderson
2021-02-18 16:45 ` [PATCH v15 37/37] xfsprogs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson

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=20210218164512.4659-2-allison.henderson@oracle.com \
    --to=allison.henderson@oracle.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.