Skip to content

Commit

Permalink
xfs: retry allocations when locality-based search fails
Browse files Browse the repository at this point in the history
If a realtime allocation fails because we can't find a sufficiently
large free extent satisfying locality rules, relax the locality rules
and try again.  This reduces the occurrence of short writes to realtime
files when the write size is large and the free space is fragmented.

This was originally discovered by running generic/186 with the realtime
reflink patchset and a 128k cow extent size hint, but the short write
symptoms can manifest with a 128k extent size hint and no reflink, so
apply the fix now.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
  • Loading branch information
Darrick J. Wong committed May 20, 2021
1 parent 9d5e849 commit 676a659
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion fs/xfs/xfs_bmap_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ xfs_bmap_rtalloc(
xfs_extlen_t minlen = mp->m_sb.sb_rextsize;
xfs_extlen_t raminlen;
bool rtlocked = false;
bool ignore_locality = false;
int error;

align = xfs_get_extsz_hint(ap->ip);
Expand Down Expand Up @@ -158,7 +159,10 @@ xfs_bmap_rtalloc(
/*
* Realtime allocation, done through xfs_rtallocate_extent.
*/
do_div(ap->blkno, mp->m_sb.sb_rextsize);
if (ignore_locality)
ap->blkno = 0;
else
do_div(ap->blkno, mp->m_sb.sb_rextsize);
rtb = ap->blkno;
ap->length = ralen;
raminlen = max_t(xfs_extlen_t, 1, minlen / mp->m_sb.sb_rextsize);
Expand Down Expand Up @@ -197,6 +201,15 @@ xfs_bmap_rtalloc(
goto retry;
}

if (!ignore_locality && ap->blkno != 0) {
/*
* If we can't allocate near a specific rt extent, try again
* without locality criteria.
*/
ignore_locality = true;
goto retry;
}

ap->blkno = NULLFSBLOCK;
ap->length = 0;
return 0;
Expand Down

0 comments on commit 676a659

Please sign in to comment.