mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

xfs: restore allocation trylock iteration

Browse source 
It was accidentally dropped when refactoring the allocation code,
resulting in the AG iteration always doing blocking AG iteration.
This results in a small performance regression for a specific fsmark
test that runs more user data writer threads than there are AGs.

Reported-by: kernel test robot <oliver.sang@intel.com>
Fixes: 2edf06a50f ("xfs: factor xfs_alloc_vextent_this_ag() for _iterate_ags()")
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Dave Chinner 2023-06-05 04:06:27 +10:00 committed by Dave Chinner
parent 89a4bf0dc3
commit 00dcd17cfa
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs/xfs/libxfs/xfs_alloc.c
View file

@ -3187,7 +3187,8 @@ xfs_alloc_vextent_check_args(
*/ */
static int static int
xfs_alloc_vextent_prepare_ag( xfs_alloc_vextent_prepare_ag(
struct xfs_alloc_arg *args) struct xfs_alloc_arg *args,
uint32_t flags)
{ {
bool need_pag = !args->pag; bool need_pag = !args->pag;
int error; int error;
@ -3196,7 +3197,7 @@ xfs_alloc_vextent_prepare_ag(
args->pag = xfs_perag_get(args->mp, args->agno); args->pag = xfs_perag_get(args->mp, args->agno);
args->agbp = NULL; args->agbp = NULL;
error = xfs_alloc_fix_freelist(args, 0); error = xfs_alloc_fix_freelist(args, flags);
if (error) { if (error) {
trace_xfs_alloc_vextent_nofix(args); trace_xfs_alloc_vextent_nofix(args);
if (need_pag) if (need_pag)
@ -3336,7 +3337,7 @@ xfs_alloc_vextent_this_ag(
return error; return error;
} }
error = xfs_alloc_vextent_prepare_ag(args); error = xfs_alloc_vextent_prepare_ag(args, 0);
if (!error && args->agbp) if (!error && args->agbp)
error = xfs_alloc_ag_vextent_size(args); error = xfs_alloc_ag_vextent_size(args);
@ -3380,7 +3381,7 @@ xfs_alloc_vextent_iterate_ags(
for_each_perag_wrap_range(mp, start_agno, restart_agno, for_each_perag_wrap_range(mp, start_agno, restart_agno,
mp->m_sb.sb_agcount, agno, args->pag) { mp->m_sb.sb_agcount, agno, args->pag) {
args->agno = agno; args->agno = agno;
error = xfs_alloc_vextent_prepare_ag(args); error = xfs_alloc_vextent_prepare_ag(args, flags);
if (error) if (error)
break; break;
if (!args->agbp) { if (!args->agbp) {
@ -3546,7 +3547,7 @@ xfs_alloc_vextent_exact_bno(
return error; return error;
} }
error = xfs_alloc_vextent_prepare_ag(args); error = xfs_alloc_vextent_prepare_ag(args, 0);
if (!error && args->agbp) if (!error && args->agbp)
error = xfs_alloc_ag_vextent_exact(args); error = xfs_alloc_ag_vextent_exact(args);
@ -3587,7 +3588,7 @@ xfs_alloc_vextent_near_bno(
if (needs_perag) if (needs_perag)
args->pag = xfs_perag_grab(mp, args->agno); args->pag = xfs_perag_grab(mp, args->agno);
error = xfs_alloc_vextent_prepare_ag(args); error = xfs_alloc_vextent_prepare_ag(args, 0);
if (!error && args->agbp) if (!error && args->agbp)
error = xfs_alloc_ag_vextent_near(args); error = xfs_alloc_ag_vextent_near(args);