xfs: fix an AGI lock acquisition ordering problem in xrep_dinode_findmode

Browse source

While reviewing the next patch which fixes an ABBA deadlock between the
AGI and a directory ILOCK, someone asked a question about why we're
holding the AGI in the first place.  The reason for that is to quiesce
the inode structures for that AG while we do a repair.

I then realized that the xrep_dinode_findmode invokes xchk_iscan_iter,
which walks the inobts (and hence the AGIs) to find all the inodes.
This itself is also an ABBA vector, since the damaged inode could be in
AG 5, which we hold while we scan AG 0 for directories.  5 -> 0 is not
allowed.

To address this, modify the iscan to allow trylock of the AGI buffer
using the flags argument to xfs_ialloc_read_agi that the previous patch
added.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

...

This commit is contained in:

Darrick J. Wong 2024-04-15 14:54:04 -07:00

parent 549d3c9a29

commit 2afd5276d3

4 changed files with 59 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

fs/xfs/scrub/inode_repair.c

View file

36

fs/xfs/scrub/iscan.c

View file

15

fs/xfs/scrub/iscan.h

View file

10

fs/xfs/scrub/trace.h

View file