Skip to content

Commit d808a8e

Browse files
dchinnerdgchinner
authored andcommitted
Merge tag 'scrub-merge-bmap-records-6.4_2023-04-12' of git://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux into guilt/xfs-for-next
xfs: merge bmap records for faster scrubs [v24.5] I started looking into performance problems with the data fork scrubber in generic/333, and noticed a few things that needed improving. First, due to design reasons, it's possible for file forks btrees to contain multiple contiguous mappings to the same physical space. Instead of checking each ondisk mapping individually, it's much faster to combine them when possible and check the combined mapping because that's fewer trips through the rmap btree, and we can drop this check-around behavior that it does when an rmapbt lookup produces a record that starts before or ends after a particular bmbt mapping. Second, I noticed that the bmbt scrubber decides to walk every reverse mapping in the filesystem if the file fork is in btree format. This is very costly, and only necessary if the inode repair code had to zap a fork to convince iget to work. Constraining the full-rmap scan to this one case means we can skip it for normal files, which drives the runtime of this test from 8 hours down to 45 minutes (observed with realtime reflink and rebuild-all mode.) Signed-off-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Dave Chinner <david@fromorbit.com>
2 parents 1e79123 + 1e59fdb commit d808a8e

2 files changed

Lines changed: 239 additions & 136 deletions

File tree

fs/xfs/libxfs/xfs_bmap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static inline int xfs_bmapi_whichfork(uint32_t bmapi_flags)
145145
{ BMAP_COWFORK, "COW" }
146146

147147
/* Return true if the extent is an allocated extent, written or not. */
148-
static inline bool xfs_bmap_is_real_extent(struct xfs_bmbt_irec *irec)
148+
static inline bool xfs_bmap_is_real_extent(const struct xfs_bmbt_irec *irec)
149149
{
150150
return irec->br_startblock != HOLESTARTBLOCK &&
151151
irec->br_startblock != DELAYSTARTBLOCK &&

0 commit comments

Comments
 (0)