From: "Darrick J. Wong" <djwong@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 23/42] xfs: introduce xfs_alloc_vextent_exact_bno()
Date: Wed, 1 Feb 2023 15:00:47 -0800 [thread overview]
Message-ID: <Y9rvH5Ri5ipvZeYo@magnolia> (raw)
In-Reply-To: <20230118224505.1964941-24-david@fromorbit.com>
On Thu, Jan 19, 2023 at 09:44:46AM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Two of the callers to xfs_alloc_vextent_this_ag() actually want
> exact block number allocation, not anywhere-in-ag allocation. Split
> this out from _this_ag() as a first class citizen so no external
> extent allocation code needs to care about args->type anymore.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
> fs/xfs/libxfs/xfs_ag.c | 6 ++--
> fs/xfs/libxfs/xfs_alloc.c | 65 ++++++++++++++++++++++++++++++++------
> fs/xfs/libxfs/xfs_alloc.h | 13 ++++++--
> fs/xfs/libxfs/xfs_bmap.c | 6 ++--
> fs/xfs/libxfs/xfs_ialloc.c | 6 ++--
> fs/xfs/scrub/repair.c | 4 +--
> 6 files changed, 73 insertions(+), 27 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_ag.c b/fs/xfs/libxfs/xfs_ag.c
> index 053d77a283f7..86696a1c6891 100644
> --- a/fs/xfs/libxfs/xfs_ag.c
> +++ b/fs/xfs/libxfs/xfs_ag.c
> @@ -888,7 +888,6 @@ xfs_ag_shrink_space(
> .tp = *tpp,
> .mp = mp,
> .pag = pag,
> - .type = XFS_ALLOCTYPE_THIS_BNO,
> .minlen = delta,
> .maxlen = delta,
> .oinfo = XFS_RMAP_OINFO_SKIP_UPDATE,
> @@ -920,8 +919,6 @@ xfs_ag_shrink_space(
> if (delta >= aglen)
> return -EINVAL;
>
> - args.fsbno = XFS_AGB_TO_FSB(mp, pag->pag_agno, aglen - delta);
> -
> /*
> * Make sure that the last inode cluster cannot overlap with the new
> * end of the AG, even if it's sparse.
> @@ -939,7 +936,8 @@ xfs_ag_shrink_space(
> return error;
>
> /* internal log shouldn't also show up in the free space btrees */
> - error = xfs_alloc_vextent_this_ag(&args);
> + error = xfs_alloc_vextent_exact_bno(&args,
> + XFS_AGB_TO_FSB(mp, pag->pag_agno, aglen - delta));
> if (!error && args.agbno == NULLAGBLOCK)
> error = -ENOSPC;
>
> diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
> index 485a73eab9d9..b810a94aad70 100644
> --- a/fs/xfs/libxfs/xfs_alloc.c
> +++ b/fs/xfs/libxfs/xfs_alloc.c
> @@ -3272,28 +3272,34 @@ xfs_alloc_vextent_set_fsbno(
> */
> int
> xfs_alloc_vextent_this_ag(
> - struct xfs_alloc_arg *args)
> + struct xfs_alloc_arg *args,
> + xfs_agnumber_t agno)
> {
> struct xfs_mount *mp = args->mp;
> xfs_agnumber_t minimum_agno = 0;
> + xfs_rfsblock_t target = XFS_AGB_TO_FSB(mp, agno, 0);
Same xfs_rfsblock_t vs. xfs_fsblock_t comment here too.
These conversions look like a good improvement though -- it's very
helpful that we can now look at an xfs_alloc_vextent_* call and know
exactly which behavior we're getting.
--D
> int error;
>
> if (args->tp->t_highest_agno != NULLAGNUMBER)
> minimum_agno = args->tp->t_highest_agno;
>
> - error = xfs_alloc_vextent_check_args(args, args->fsbno);
> + if (minimum_agno > agno) {
> + trace_xfs_alloc_vextent_skip_deadlock(args);
> + args->fsbno = NULLFSBLOCK;
> + return 0;
> + }
> +
> + error = xfs_alloc_vextent_check_args(args, target);
> if (error) {
> if (error == -ENOSPC)
> return 0;
> return error;
> }
>
> - args->agno = XFS_FSB_TO_AGNO(mp, args->fsbno);
> - if (minimum_agno > args->agno) {
> - trace_xfs_alloc_vextent_skip_deadlock(args);
> - args->fsbno = NULLFSBLOCK;
> - return 0;
> - }
> + args->agno = agno;
> + args->agbno = 0;
> + args->fsbno = target;
> + args->type = XFS_ALLOCTYPE_THIS_AG;
>
> error = xfs_alloc_ag_vextent(args);
> xfs_alloc_vextent_set_fsbno(args, minimum_agno);
> @@ -3450,7 +3456,7 @@ xfs_alloc_vextent_start_ag(
> * pass, so will not recurse into AGs lower than indicated by fsbno.
> */
> int
> - xfs_alloc_vextent_first_ag(
> +xfs_alloc_vextent_first_ag(
> struct xfs_alloc_arg *args,
> xfs_rfsblock_t target)
> {
> @@ -3472,12 +3478,51 @@ int
> start_agno = max(minimum_agno, XFS_FSB_TO_AGNO(mp, target));
> args->type = XFS_ALLOCTYPE_THIS_AG;
> args->fsbno = target;
> - error = xfs_alloc_vextent_iterate_ags(args, minimum_agno,
> + error = xfs_alloc_vextent_iterate_ags(args, minimum_agno,
> start_agno, 0);
> xfs_alloc_vextent_set_fsbno(args, minimum_agno);
> return error;
> }
>
> +/*
> + * Allocate within a single AG only.
> + */
> +int
> +xfs_alloc_vextent_exact_bno(
> + struct xfs_alloc_arg *args,
> + xfs_rfsblock_t target)
> +{
> + struct xfs_mount *mp = args->mp;
> + xfs_agnumber_t minimum_agno = 0;
> + int error;
> +
> + if (args->tp->t_highest_agno != NULLAGNUMBER)
> + minimum_agno = args->tp->t_highest_agno;
> +
> + error = xfs_alloc_vextent_check_args(args, target);
> + if (error) {
> + if (error == -ENOSPC)
> + return 0;
> + return error;
> + }
> +
> + args->agno = XFS_FSB_TO_AGNO(mp, target);
> + if (minimum_agno > args->agno) {
> + trace_xfs_alloc_vextent_skip_deadlock(args);
> + return 0;
> + }
> +
> + args->agbno = XFS_FSB_TO_AGBNO(mp, target);
> + args->fsbno = target;
> + args->type = XFS_ALLOCTYPE_THIS_BNO;
> + error = xfs_alloc_ag_vextent(args);
> + if (error)
> + return error;
> +
> + xfs_alloc_vextent_set_fsbno(args, minimum_agno);
> + return 0;
> +}
> +
> /*
> * Allocate an extent as close to the target as possible. If there are not
> * viable candidates in the AG, then fail the allocation.
> diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h
> index f38a2f8e20fb..106b4deb1110 100644
> --- a/fs/xfs/libxfs/xfs_alloc.h
> +++ b/fs/xfs/libxfs/xfs_alloc.h
> @@ -114,10 +114,10 @@ xfs_alloc_log_agf(
> uint32_t fields);/* mask of fields to be logged (XFS_AGF_...) */
>
> /*
> - * Allocate an extent in the specific AG defined by args->fsbno. If there is no
> - * space in that AG, then the allocation will fail.
> + * Allocate an extent anywhere in the specific AG given. If there is no
> + * space matching the requirements in that AG, then the allocation will fail.
> */
> -int xfs_alloc_vextent_this_ag(struct xfs_alloc_arg *args);
> +int xfs_alloc_vextent_this_ag(struct xfs_alloc_arg *args, xfs_agnumber_t agno);
>
> /*
> * Allocate an extent as close to the target as possible. If there are not
> @@ -126,6 +126,13 @@ int xfs_alloc_vextent_this_ag(struct xfs_alloc_arg *args);
> int xfs_alloc_vextent_near_bno(struct xfs_alloc_arg *args,
> xfs_rfsblock_t target);
>
> +/*
> + * Allocate an extent exactly at the target given. If this is not possible
> + * then the allocation fails.
> + */
> +int xfs_alloc_vextent_exact_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 4446b035eed5..c9902df16e25 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -3514,7 +3514,6 @@ xfs_bmap_btalloc_at_eof(
> xfs_extlen_t nextminlen = 0;
>
> atype = args->type;
> - args->type = XFS_ALLOCTYPE_THIS_BNO;
> args->alignment = 1;
>
> /*
> @@ -3532,8 +3531,8 @@ xfs_bmap_btalloc_at_eof(
> else
> args->minalignslop = 0;
>
> - args->pag = xfs_perag_get(mp, XFS_FSB_TO_AGNO(mp, args->fsbno));
> - error = xfs_alloc_vextent_this_ag(args);
> + args->pag = xfs_perag_get(mp, XFS_FSB_TO_AGNO(mp, ap->blkno));
> + error = xfs_alloc_vextent_exact_bno(args, ap->blkno);
> xfs_perag_put(args->pag);
> if (error)
> return error;
> @@ -3546,7 +3545,6 @@ xfs_bmap_btalloc_at_eof(
> */
> args->pag = NULL;
> args->type = atype;
> - args->fsbno = ap->blkno;
> args->alignment = stripe_align;
> args->minlen = nextminlen;
> args->minalignslop = 0;
> diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
> index daa6f7055bba..d2525f0cc6cd 100644
> --- a/fs/xfs/libxfs/xfs_ialloc.c
> +++ b/fs/xfs/libxfs/xfs_ialloc.c
> @@ -662,8 +662,6 @@ xfs_ialloc_ag_alloc(
> goto sparse_alloc;
> if (likely(newino != NULLAGINO &&
> (args.agbno < be32_to_cpu(agi->agi_length)))) {
> - args.fsbno = XFS_AGB_TO_FSB(args.mp, pag->pag_agno, args.agbno);
> - args.type = XFS_ALLOCTYPE_THIS_BNO;
> args.prod = 1;
>
> /*
> @@ -684,7 +682,9 @@ xfs_ialloc_ag_alloc(
>
> /* Allow space for the inode btree to split. */
> args.minleft = igeo->inobt_maxlevels;
> - error = xfs_alloc_vextent_this_ag(&args);
> + error = xfs_alloc_vextent_exact_bno(&args,
> + XFS_AGB_TO_FSB(args.mp, pag->pag_agno,
> + args.agbno));
> if (error)
> return error;
>
> diff --git a/fs/xfs/scrub/repair.c b/fs/xfs/scrub/repair.c
> index 5f4b50aac4bb..1b71174ec0d6 100644
> --- a/fs/xfs/scrub/repair.c
> +++ b/fs/xfs/scrub/repair.c
> @@ -328,14 +328,12 @@ xrep_alloc_ag_block(
> args.mp = sc->mp;
> args.pag = sc->sa.pag;
> args.oinfo = *oinfo;
> - args.fsbno = XFS_AGB_TO_FSB(args.mp, sc->sa.pag->pag_agno, 0);
> args.minlen = 1;
> args.maxlen = 1;
> args.prod = 1;
> - args.type = XFS_ALLOCTYPE_THIS_AG;
> args.resv = resv;
>
> - error = xfs_alloc_vextent_this_ag(&args);
> + error = xfs_alloc_vextent_this_ag(&args, sc->sa.pag->pag_agno);
> if (error)
> return error;
> if (args.fsbno == NULLFSBLOCK)
> --
> 2.39.0
>
next prev parent reply other threads:[~2023-02-01 23:00 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-18 22:44 [PATCH 00/42] xfs: per-ag centric allocation alogrithms Dave Chinner
2023-01-18 22:44 ` [PATCH 01/42] xfs: fix low space alloc deadlock Dave Chinner
2023-01-19 16:39 ` Allison Henderson
2024-12-23 9:43 ` luminosity1999
2023-01-18 22:44 ` [PATCH 02/42] xfs: prefer free inodes at ENOSPC over chunk allocation Dave Chinner
2023-01-19 19:08 ` Allison Henderson
2023-01-18 22:44 ` [PATCH 03/42] xfs: block reservation too large for minleft allocation Dave Chinner
2023-01-19 20:38 ` Allison Henderson
2023-01-18 22:44 ` [PATCH 04/42] xfs: drop firstblock constraints from allocation setup Dave Chinner
2023-01-19 22:03 ` Allison Henderson
2023-01-18 22:44 ` [PATCH 05/42] xfs: t_firstblock is tracking AGs not blocks Dave Chinner
2023-01-19 22:12 ` Allison Henderson
2023-01-18 22:44 ` [PATCH 06/42] xfs: don't assert fail on transaction cancel with deferred ops Dave Chinner
2023-01-19 22:18 ` Allison Henderson
2023-01-18 22:44 ` [PATCH 07/42] xfs: active perag reference counting Dave Chinner
2023-01-21 5:16 ` Allison Henderson
2023-02-01 19:08 ` Darrick J. Wong
2023-02-06 22:56 ` Dave Chinner
2023-01-18 22:44 ` [PATCH 08/42] xfs: rework the perag trace points to be perag centric Dave Chinner
2023-01-21 5:16 ` Allison Henderson
2023-01-18 22:44 ` [PATCH 09/42] xfs: convert xfs_imap() to take a perag Dave Chinner
2023-02-01 19:10 ` Darrick J. Wong
2023-01-18 22:44 ` [PATCH 10/42] xfs: use active perag references for inode allocation Dave Chinner
2023-01-22 6:48 ` Allison Henderson
2023-01-18 22:44 ` [PATCH 11/42] xfs: inobt can use perags in many more places than it does Dave Chinner
2023-01-22 6:48 ` Allison Henderson
2023-01-18 22:44 ` [PATCH 12/42] xfs: convert xfs_ialloc_next_ag() to an atomic Dave Chinner
2023-01-22 7:03 ` Allison Henderson
2023-01-18 22:44 ` [PATCH 13/42] xfs: perags need atomic operational state Dave Chinner
2023-01-23 4:04 ` Allison Henderson
2023-01-18 22:44 ` [PATCH 14/42] xfs: introduce xfs_for_each_perag_wrap() Dave Chinner
2023-01-23 5:41 ` Allison Henderson
2023-02-06 23:14 ` Dave Chinner
2023-02-01 19:28 ` Darrick J. Wong
2023-01-18 22:44 ` [PATCH 15/42] xfs: rework xfs_alloc_vextent() Dave Chinner
2023-02-01 19:39 ` Darrick J. Wong
2023-01-18 22:44 ` [PATCH 16/42] xfs: factor xfs_alloc_vextent_this_ag() for _iterate_ags() Dave Chinner
2023-01-18 22:44 ` [PATCH 17/42] xfs: combine __xfs_alloc_vextent_this_ag and xfs_alloc_ag_vextent Dave Chinner
2023-02-01 22:25 ` Darrick J. Wong
2023-01-18 22:44 ` [PATCH 18/42] xfs: use xfs_alloc_vextent_this_ag() where appropriate Dave Chinner
2023-01-18 22:44 ` [PATCH 19/42] xfs: factor xfs_bmap_btalloc() Dave Chinner
2023-01-18 22:44 ` [PATCH 20/42] xfs: use xfs_alloc_vextent_first_ag() where appropriate Dave Chinner
2023-02-01 22:43 ` Darrick J. Wong
2023-02-06 23:16 ` Dave Chinner
2023-01-18 22:44 ` [PATCH 21/42] xfs: use xfs_alloc_vextent_start_bno() " Dave Chinner
2023-02-01 22:51 ` Darrick J. Wong
2023-01-18 22:44 ` [PATCH 22/42] xfs: introduce xfs_alloc_vextent_near_bno() Dave Chinner
2023-02-01 22:52 ` Darrick J. Wong
2023-01-18 22:44 ` [PATCH 23/42] xfs: introduce xfs_alloc_vextent_exact_bno() Dave Chinner
2023-02-01 23:00 ` Darrick J. Wong [this message]
2023-01-18 22:44 ` [PATCH 24/42] xfs: introduce xfs_alloc_vextent_prepare() Dave Chinner
2023-01-18 22:44 ` [PATCH 25/42] xfs: move allocation accounting to xfs_alloc_vextent_set_fsbno() Dave Chinner
2023-01-18 22:44 ` [PATCH 26/42] xfs: fold xfs_alloc_ag_vextent() into callers Dave Chinner
2023-01-18 22:44 ` [PATCH 27/42] xfs: move the minimum agno checks into xfs_alloc_vextent_check_args Dave Chinner
2023-01-18 22:44 ` [PATCH 28/42] xfs: convert xfs_alloc_vextent_iterate_ags() to use perag walker Dave Chinner
2023-02-01 23:13 ` Darrick J. Wong
2023-01-18 22:44 ` [PATCH 29/42] xfs: convert trim to use for_each_perag_range Dave Chinner
2023-02-01 23:15 ` Darrick J. Wong
2023-02-06 23:19 ` Dave Chinner
2023-01-18 22:44 ` [PATCH 30/42] xfs: factor out filestreams from xfs_bmap_btalloc_nullfb Dave Chinner
2023-01-18 22:44 ` [PATCH 31/42] xfs: get rid of notinit from xfs_bmap_longest_free_extent Dave Chinner
2023-01-18 22:44 ` [PATCH 32/42] xfs: use xfs_bmap_longest_free_extent() in filestreams Dave Chinner
2023-01-18 22:44 ` [PATCH 33/42] xfs: move xfs_bmap_btalloc_filestreams() to xfs_filestreams.c Dave Chinner
2023-01-18 22:44 ` [PATCH 34/42] xfs: merge filestream AG lookup into xfs_filestream_select_ag() Dave Chinner
2023-01-18 22:44 ` [PATCH 35/42] xfs: merge new filestream AG selection " Dave Chinner
2023-01-18 22:44 ` [PATCH 36/42] xfs: remove xfs_filestream_select_ag() longest extent check Dave Chinner
2023-01-18 22:45 ` [PATCH 37/42] xfs: factor out MRU hit case in xfs_filestream_select_ag Dave Chinner
2023-01-18 22:45 ` [PATCH 38/42] xfs: track an active perag reference in filestreams Dave Chinner
2023-01-18 22:45 ` [PATCH 39/42] xfs: use for_each_perag_wrap in xfs_filestream_pick_ag Dave Chinner
2023-01-18 22:45 ` [PATCH 40/42] xfs: pass perag to filestreams tracing Dave Chinner
2023-01-18 22:45 ` [PATCH 41/42] xfs: return a referenced perag from filestreams allocator Dave Chinner
2023-02-02 0:01 ` Darrick J. Wong
2023-02-06 23:22 ` Dave Chinner
2023-01-18 22:45 ` [PATCH 42/42] xfs: refactor the filestreams allocator pick functions Dave Chinner
2023-02-02 0:08 ` Darrick J. Wong
2023-02-06 23:26 ` Dave Chinner
2023-02-02 0:14 ` [PATCH 00/42] xfs: per-ag centric allocation alogrithms Darrick J. Wong
2023-02-06 23:13 ` Dave Chinner
-- strict thread matches above, loose matches on Subject: below --
2023-02-09 22:17 [PATCH v3 " Dave Chinner
2023-02-09 22:18 ` [PATCH 23/42] xfs: introduce xfs_alloc_vextent_exact_bno() Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y9rvH5Ri5ipvZeYo@magnolia \
--to=djwong@kernel.org \
--cc=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox