Commit 676a659b authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: retry allocations when locality-based search fails

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: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarAllison Henderson <allison.henderson@oracle.com>
parent 9d5e8492
...@@ -84,6 +84,7 @@ xfs_bmap_rtalloc( ...@@ -84,6 +84,7 @@ xfs_bmap_rtalloc(
xfs_extlen_t minlen = mp->m_sb.sb_rextsize; xfs_extlen_t minlen = mp->m_sb.sb_rextsize;
xfs_extlen_t raminlen; xfs_extlen_t raminlen;
bool rtlocked = false; bool rtlocked = false;
bool ignore_locality = false;
int error; int error;
align = xfs_get_extsz_hint(ap->ip); align = xfs_get_extsz_hint(ap->ip);
...@@ -158,6 +159,9 @@ xfs_bmap_rtalloc( ...@@ -158,6 +159,9 @@ xfs_bmap_rtalloc(
/* /*
* Realtime allocation, done through xfs_rtallocate_extent. * Realtime allocation, done through xfs_rtallocate_extent.
*/ */
if (ignore_locality)
ap->blkno = 0;
else
do_div(ap->blkno, mp->m_sb.sb_rextsize); do_div(ap->blkno, mp->m_sb.sb_rextsize);
rtb = ap->blkno; rtb = ap->blkno;
ap->length = ralen; ap->length = ralen;
...@@ -197,6 +201,15 @@ xfs_bmap_rtalloc( ...@@ -197,6 +201,15 @@ xfs_bmap_rtalloc(
goto retry; 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->blkno = NULLFSBLOCK;
ap->length = 0; ap->length = 0;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment