[30/50] xfs: introduce xfs_alloc_vextent_near_bno()

Message ID	20220611012659.3418072-31-david@fromorbit.com (mailing list archive)
State	Superseded, archived
Headers	show Return-Path: <linux-xfs-owner@kernel.org> From: Dave Chinner <david@fromorbit.com> To: linux-xfs@vger.kernel.org Subject: [PATCH 30/50] xfs: introduce xfs_alloc_vextent_near_bno() Date: Sat, 11 Jun 2022 11:26:39 +1000 Message-Id: <20220611012659.3418072-31-david@fromorbit.com> In-Reply-To: <20220611012659.3418072-1-david@fromorbit.com> References: <20220611012659.3418072-1-david@fromorbit.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	xfs: per-ag centric allocation alogrithms \| expand [RFC,00/50] xfs: per-ag centric allocation alogrithms [01/50] xfs: make last AG grow/shrink perag centric [02/50] xfs: kill xfs_ialloc_pagi_init() [03/50] xfs: pass perag to xfs_ialloc_read_agi() [04/50] xfs: kill xfs_alloc_pagf_init() [05/50] xfs: pass perag to xfs_alloc_read_agf() [06/50] xfs: pass perag to xfs_read_agi [07/50] xfs: pass perag to xfs_read_agf [08/50] xfs: pass perag to xfs_alloc_get_freelist [09/50] xfs: pass perag to xfs_alloc_put_freelist [10/50] xfs: pass perag to xfs_alloc_read_agfl [11/50] xfs: Pre-calculate per-AG agbno geometry [12/50] xfs: Pre-calculate per-AG agino geometry [13/50] xfs: replace xfs_ag_block_count() with perag accesses [14/50] xfs: make is_log_ag() a first class helper [15/50] xfs: active perag reference counting [16/50] xfs: rework the perag trace points to be perag centric [17/50] xfs: convert xfs_imap() to take a perag [18/50] xfs: use active perag references for inode allocation [19/50] xfs: inobt can use perags in many more places than it does [20/50] xfs: convert xfs_ialloc_next_ag() to an atomic [21/50] xfs: perags need atomic operational state [22/50] xfs: introduce xfs_for_each_perag_wrap() [23/50] xfs: rework xfs_alloc_vextent() [24/50] xfs: use xfs_alloc_vextent_this_ag() in _iterate_ags() [25/50] xfs: combine __xfs_alloc_vextent_this_ag and xfs_alloc_ag_vextent [26/50] xfs: use xfs_alloc_vextent_this_ag() where appropriate [27/50] xfs: factor xfs_bmap_btalloc() [28/50] xfs: use xfs_alloc_vextent_first_ag() where appropriate [29/50] xfs: use xfs_alloc_vextent_start_bno() where appropriate [30/50] xfs: introduce xfs_alloc_vextent_near_bno() [31/50] xfs: introduce xfs_alloc_vextent_exact_bno() [32/50] xfs: introduce xfs_alloc_vextent_prepare() [33/50] xfs: move allocation accounting to xfs_alloc_vextent_set_fsbno() [34/50] xfs: fold xfs_alloc_ag_vextent() into callers [35/50] xfs: convert xfs_alloc_vextent_iterate_ags() to use perag walker [36/50] xfs: convert trim to use for_each_perag_range [37/50] xfs: factor out filestreams from xfs_bmap_btalloc_nullfb [38/50] xfs: get rid of notinit from xfs_bmap_longest_free_extent [39/50] xfs: use xfs_bmap_longest_free_extent() in filestreams [40/50] xfs: move xfs_bmap_btalloc_filestreams() to xfs_filestreams.c [41/50] xfs: merge filestream AG lookup into xfs_filestream_select_ag() [42/50] xfs: merge new filestream AG selection into xfs_filestream_select_ag() [43/50] xfs: remove xfs_filestream_select_ag() longest extent check [44/50] xfs: factor out MRU hit case in xfs_filestream_select_ag [45/50] xfs: track an active perag reference in filestreams [46/50] xfs: use for_each_perag_wrap in xfs_filestream_pick_ag [47/50] xfs: pass perag to filestreams tracing [48/50] xfs: return a referenced perag from filestreams allocator [49/50] xfs: refactor the filestreams allocator pick functions [50/50] xfs: fix low space alloc deadlock

diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c index 65d1d48beef6..3678323ac3e4 100644 --- a/fs/xfs/libxfs/xfs_alloc.c +++ b/fs/xfs/libxfs/xfs_alloc.c @@ -3442,29 +3442,38 @@ xfs_alloc_vextent_first_ag( } /* - * Allocate an extent (variable-size). - * Depending on the allocation type, we either look in a single allocation - * group or loop over the allocation groups to find the result. + * Allocate an extent as close to the target as possible. If there are not + * viable candidates in the AG, then fail the allocation. */ int -xfs_alloc_vextent( - struct xfs_alloc_arg *args) +xfs_alloc_vextent_near_bno( + struct xfs_alloc_arg *args, + xfs_rfsblock_t target) { + struct xfs_mount *mp = args->mp; + bool need_pag = !args->pag; int error; - switch (args->type) { - case XFS_ALLOCTYPE_NEAR_BNO: - args->pag = xfs_perag_get(args->mp, - XFS_FSB_TO_AGNO(args->mp, args->fsbno)); - error = xfs_alloc_vextent_this_ag(args); - xfs_perag_put(args->pag); + error = xfs_alloc_vextent_check_args(args, target); + if (error) { + if (error == -ENOSPC) + return 0; return error; - default: - ASSERT(0); - /* NOTREACHED */ } - /* Should never get here */ - return -EFSCORRUPTED; + + args->agno = XFS_FSB_TO_AGNO(mp, target); + args->agbno = XFS_FSB_TO_AGBNO(mp, target); + args->type = XFS_ALLOCTYPE_NEAR_BNO; + if (need_pag) + args->pag = xfs_perag_get(args->mp, args->agno); + error = xfs_alloc_ag_vextent(args); + if (need_pag) + xfs_perag_put(args->pag); + if (error) + return error; + + xfs_alloc_vextent_set_fsbno(args); + return 0; } /* Ensure that the freelist is at full capacity. */ diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h index 5487dff3d68a..f38a2f8e20fb 100644 --- a/fs/xfs/libxfs/xfs_alloc.h +++ b/fs/xfs/libxfs/xfs_alloc.h @@ -113,19 +113,19 @@ xfs_alloc_log_agf( struct xfs_buf *bp, /* buffer for a.g. freelist header */ uint32_t fields);/* mask of fields to be logged (XFS_AGF_...) */ -/* - * Allocate an extent (variable-size). - */ -int /* error */ -xfs_alloc_vextent( - xfs_alloc_arg_t *args); /* allocation argument structure */ - /* * Allocate an extent in the specific AG defined by args->fsbno. If there is no * space in that AG, then the allocation will fail. */ int xfs_alloc_vextent_this_ag(struct xfs_alloc_arg *args); +/* + * Allocate an extent as close to the target as possible. If there are not + * viable candidates in the AG, then fail the allocation. + */ +int xfs_alloc_vextent_near_bno(struct xfs_alloc_arg *args, + xfs_rfsblock_t target); + /* * Best effort full filesystem allocation scan. * diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index dfb92dbe16b2..a62875984c9c 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -654,11 +654,7 @@ xfs_bmap_extents_to_btree( } else if (tp->t_flags & XFS_TRANS_LOWMODE) { error = xfs_alloc_vextent_start_ag(&args, tp->t_firstblock); } else { - args.type = XFS_ALLOCTYPE_NEAR_BNO; - args.fsbno = tp->t_firstblock; - args.pag = xfs_perag_get(mp, XFS_FSB_TO_AGNO(mp, args.fsbno)); - error = xfs_alloc_vextent_this_ag(&args); - xfs_perag_put(args.pag); + error = xfs_alloc_vextent_near_bno(&args, tp->t_firstblock); } if (error) goto out_root_realloc; @@ -811,12 +807,7 @@ xfs_bmap_local_to_extents( error = xfs_alloc_vextent_start_ag(&args, XFS_INO_TO_FSB(args.mp, ip->i_ino)); } else { - args.fsbno = tp->t_firstblock; - args.type = XFS_ALLOCTYPE_NEAR_BNO; - args.pag = xfs_perag_get(args.mp, - XFS_FSB_TO_AGNO(args.mp, args.fsbno)); - error = xfs_alloc_vextent_this_ag(&args); - xfs_perag_put(args.pag); + error = xfs_alloc_vextent_near_bno(&args, tp->t_firstblock); } if (error) goto done; @@ -3247,7 +3238,6 @@ xfs_bmap_btalloc_filestreams( int notinit = 0; int error; - args->type = XFS_ALLOCTYPE_NEAR_BNO; args->total = ap->total; start_agno = XFS_FSB_TO_AGNO(mp, args->fsbno); @@ -3583,7 +3573,7 @@ xfs_btalloc_at_eof( } if (ag_only) - error = xfs_alloc_vextent(args); + error = xfs_alloc_vextent_near_bno(args, ap->blkno); else error = xfs_alloc_vextent_start_ag(args, ap->blkno); if (error) @@ -3664,7 +3654,6 @@ xfs_btalloc_nullfb( ap->blkno = XFS_INO_TO_FSB(mp, ap->ip->i_ino); } xfs_bmap_adjacent(ap); - args->fsbno = ap->blkno; /* * Search for an allocation group with a single extent large enough for @@ -3688,7 +3677,7 @@ xfs_btalloc_nullfb( } if (is_filestream) - error = xfs_alloc_vextent(args); + error = xfs_alloc_vextent_near_bno(args, ap->blkno); else error = xfs_alloc_vextent_start_ag(args, ap->blkno); if (error) @@ -3758,8 +3747,6 @@ xfs_btalloc_near( ap->blkno = ap->tp->t_firstblock; xfs_bmap_adjacent(ap); - args->fsbno = ap->blkno; - args->type = XFS_ALLOCTYPE_NEAR_BNO; args->total = ap->total; args->minlen = ap->minlen; @@ -3771,7 +3758,7 @@ xfs_btalloc_near( if (args->fsbno != NULLFSBLOCK) return 0; } - return xfs_alloc_vextent(args); + return xfs_alloc_vextent_near_bno(args, ap->blkno); } STATIC int diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c index cf4b19549334..0e2ef8b42c4a 100644 --- a/fs/xfs/libxfs/xfs_bmap_btree.c +++ b/fs/xfs/libxfs/xfs_bmap_btree.c @@ -247,11 +247,8 @@ xfs_bmbt_alloc_block( error = xfs_alloc_vextent_start_ag(&args, cur->bc_tp->t_firstblock); } else { - args.type = XFS_ALLOCTYPE_NEAR_BNO; - args.pag = xfs_perag_get(args.mp, - XFS_FSB_TO_AGNO(args.mp, args.fsbno)); - error = xfs_alloc_vextent_this_ag(&args); - xfs_perag_put(args.pag); + error = xfs_alloc_vextent_near_bno(&args, + cur->bc_tp->t_firstblock); } if (error) goto error0; diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 2084bee7a31b..590fb2bb4363 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -717,23 +717,17 @@ xfs_ialloc_ag_alloc( isaligned = 1; } else args.alignment = igeo->cluster_align; - /* - * Need to figure out where to allocate the inode blocks. - * Ideally they should be spaced out through the a.g. - * For now, just allocate blocks up front. - */ - args.agbno = be32_to_cpu(agi->agi_root); - args.fsbno = XFS_AGB_TO_FSB(args.mp, pag->pag_agno, args.agbno); /* * Allocate a fixed-size extent of inodes. */ - args.type = XFS_ALLOCTYPE_NEAR_BNO; args.prod = 1; /* * Allow space for the inode btree to split. */ args.minleft = igeo->inobt_maxlevels; - error = xfs_alloc_vextent_this_ag(&args); + error = xfs_alloc_vextent_near_bno(&args, + XFS_AGB_TO_FSB(args.mp, pag->pag_agno, + be32_to_cpu(agi->agi_root))); if (error) return error; } @@ -743,11 +737,11 @@ xfs_ialloc_ag_alloc( * alignment. */ if (isaligned && args.fsbno == NULLFSBLOCK) { - args.type = XFS_ALLOCTYPE_NEAR_BNO; - args.agbno = be32_to_cpu(agi->agi_root); - args.fsbno = XFS_AGB_TO_FSB(args.mp, pag->pag_agno, args.agbno); args.alignment = igeo->cluster_align; - if ((error = xfs_alloc_vextent(&args))) + error = xfs_alloc_vextent_near_bno(&args, + XFS_AGB_TO_FSB(args.mp, pag->pag_agno, + be32_to_cpu(agi->agi_root))); + if (error) return error; } @@ -759,9 +753,6 @@ xfs_ialloc_ag_alloc( igeo->ialloc_min_blks < igeo->ialloc_blks && args.fsbno == NULLFSBLOCK) { sparse_alloc: - args.type = XFS_ALLOCTYPE_NEAR_BNO; - args.agbno = be32_to_cpu(agi->agi_root); - args.fsbno = XFS_AGB_TO_FSB(args.mp, pag->pag_agno, args.agbno); args.alignment = args.mp->m_sb.sb_spino_align; args.prod = 1; @@ -783,7 +774,9 @@ xfs_ialloc_ag_alloc( args.mp->m_sb.sb_inoalignmt) - igeo->ialloc_blks; - error = xfs_alloc_vextent_this_ag(&args); + error = xfs_alloc_vextent_near_bno(&args, + XFS_AGB_TO_FSB(args.mp, pag->pag_agno, + be32_to_cpu(agi->agi_root))); if (error) return error; diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c index fa6cd2502970..9b28211d5a4c 100644 --- a/fs/xfs/libxfs/xfs_ialloc_btree.c +++ b/fs/xfs/libxfs/xfs_ialloc_btree.c @@ -105,14 +105,13 @@ __xfs_inobt_alloc_block( args.mp = cur->bc_mp; args.pag = cur->bc_ag.pag; args.oinfo = XFS_RMAP_OINFO_INOBT; - args.fsbno = XFS_AGB_TO_FSB(args.mp, cur->bc_ag.pag->pag_agno, sbno); args.minlen = 1; args.maxlen = 1; args.prod = 1; - args.type = XFS_ALLOCTYPE_NEAR_BNO; args.resv = resv; - error = xfs_alloc_vextent_this_ag(&args); + error = xfs_alloc_vextent_near_bno(&args, + XFS_AGB_TO_FSB(args.mp, args.pag->pag_agno, sbno)); if (error) return error; diff --git a/fs/xfs/libxfs/xfs_refcount_btree.c b/fs/xfs/libxfs/xfs_refcount_btree.c index bf4049b42f7d..7da175ac5cf6 100644 --- a/fs/xfs/libxfs/xfs_refcount_btree.c +++ b/fs/xfs/libxfs/xfs_refcount_btree.c @@ -67,14 +67,13 @@ xfs_refcountbt_alloc_block( args.tp = cur->bc_tp; args.mp = cur->bc_mp; args.pag = cur->bc_ag.pag; - args.type = XFS_ALLOCTYPE_NEAR_BNO; - args.fsbno = XFS_AGB_TO_FSB(cur->bc_mp, cur->bc_ag.pag->pag_agno, - xfs_refc_block(args.mp)); args.oinfo = XFS_RMAP_OINFO_REFC; args.minlen = args.maxlen = args.prod = 1; args.resv = XFS_AG_RESV_METADATA; - error = xfs_alloc_vextent_this_ag(&args); + error = xfs_alloc_vextent_near_bno(&args, + XFS_AGB_TO_FSB(args.mp, args.pag->pag_agno, + xfs_refc_block(args.mp))); if (error) goto out_error; trace_xfs_refcountbt_alloc_block(cur->bc_mp, cur->bc_ag.pag->pag_agno,

[30/50] xfs: introduce xfs_alloc_vextent_near_bno()

Commit Message

Patch