From: "Darrick J. Wong" <djwong@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 20/42] xfs: use xfs_alloc_vextent_first_ag() where appropriate
Date: Wed, 1 Feb 2023 14:43:13 -0800 [thread overview]
Message-ID: <Y9rrAam9LzgERBYY@magnolia> (raw)
In-Reply-To: <20230118224505.1964941-21-david@fromorbit.com>
On Thu, Jan 19, 2023 at 09:44:43AM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Change obvious callers of single AG allocation to use
> xfs_alloc_vextent_first_ag(). This gets rid of
> XFS_ALLOCTYPE_FIRST_AG as the type used within
> xfs_alloc_vextent_first_ag() during iteration is _THIS_AG. Hence we
> can remove the setting of args->type from all the callers of
> _first_ag() and remove the alloctype.
>
> While doing this, pass the allocation target fsb as a parameter
> rather than encoding it in args->fsbno. This starts the process
> of making args->fsbno an output only variable rather than
> input/output.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
> fs/xfs/libxfs/xfs_alloc.c | 35 +++++++++++++++++++----------------
> fs/xfs/libxfs/xfs_alloc.h | 10 ++++++++--
> fs/xfs/libxfs/xfs_bmap.c | 31 ++++++++++++++++---------------
> 3 files changed, 43 insertions(+), 33 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
> index 28b79facf2e3..186ce3aee9e0 100644
> --- a/fs/xfs/libxfs/xfs_alloc.c
> +++ b/fs/xfs/libxfs/xfs_alloc.c
> @@ -3183,7 +3183,8 @@ xfs_alloc_read_agf(
> */
> static int
> xfs_alloc_vextent_check_args(
> - struct xfs_alloc_arg *args)
> + struct xfs_alloc_arg *args,
> + xfs_rfsblock_t target)
Isn't xfs_rfsblock_t supposed to be used to measure quantities of raw fs
blocks, and not the segmented agno/agbno numbers that we encode in most
places?
> {
> struct xfs_mount *mp = args->mp;
> xfs_agblock_t agsize;
> @@ -3201,13 +3202,13 @@ xfs_alloc_vextent_check_args(
> args->maxlen = agsize;
> if (args->alignment == 0)
> args->alignment = 1;
> - ASSERT(XFS_FSB_TO_AGNO(mp, args->fsbno) < mp->m_sb.sb_agcount);
> - ASSERT(XFS_FSB_TO_AGBNO(mp, args->fsbno) < agsize);
> + ASSERT(XFS_FSB_TO_AGNO(mp, target) < mp->m_sb.sb_agcount);
> + ASSERT(XFS_FSB_TO_AGBNO(mp, target) < agsize);
Yes, I think @target should be xfs_fsblock_t since we pass it to
XFS_FSB_TO_AG{,B}NO here.
> ASSERT(args->minlen <= args->maxlen);
> ASSERT(args->minlen <= agsize);
> ASSERT(args->mod < args->prod);
> - if (XFS_FSB_TO_AGNO(mp, args->fsbno) >= mp->m_sb.sb_agcount ||
> - XFS_FSB_TO_AGBNO(mp, args->fsbno) >= agsize ||
> + if (XFS_FSB_TO_AGNO(mp, target) >= mp->m_sb.sb_agcount ||
> + XFS_FSB_TO_AGBNO(mp, target) >= agsize ||
> args->minlen > args->maxlen || args->minlen > agsize ||
> args->mod >= args->prod) {
> args->fsbno = NULLFSBLOCK;
> @@ -3281,7 +3282,7 @@ xfs_alloc_vextent_this_ag(
> if (args->tp->t_highest_agno != NULLAGNUMBER)
> minimum_agno = args->tp->t_highest_agno;
>
> - error = xfs_alloc_vextent_check_args(args);
> + error = xfs_alloc_vextent_check_args(args, args->fsbno);
> if (error) {
> if (error == -ENOSPC)
> return 0;
> @@ -3406,7 +3407,7 @@ xfs_alloc_vextent_start_ag(
> bool bump_rotor = false;
> int error;
>
> - error = xfs_alloc_vextent_check_args(args);
> + error = xfs_alloc_vextent_check_args(args, args->fsbno);
> if (error) {
> if (error == -ENOSPC)
> return 0;
> @@ -3444,25 +3445,29 @@ xfs_alloc_vextent_start_ag(
> * filesystem attempting blocking allocation. This does not wrap or try a second
> * pass, so will not recurse into AGs lower than indicated by fsbno.
> */
> -static int
> -xfs_alloc_vextent_first_ag(
> +int
> + xfs_alloc_vextent_first_ag(
> struct xfs_alloc_arg *args,
> - xfs_agnumber_t minimum_agno)
> -{
> + xfs_rfsblock_t target)
> + {
Extra spaces here, and seemingly another variable that ought to be
xfs_fsblock_t?
--D
> struct xfs_mount *mp = args->mp;
> + xfs_agnumber_t minimum_agno = 0;
> xfs_agnumber_t start_agno;
> int error;
>
> - error = xfs_alloc_vextent_check_args(args);
> + 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;
> }
>
> - start_agno = max(minimum_agno, XFS_FSB_TO_AGNO(mp, args->fsbno));
> -
> + 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,
> start_agno, 0);
> xfs_alloc_vextent_set_fsbno(args, minimum_agno);
> @@ -3495,8 +3500,6 @@ xfs_alloc_vextent(
> break;
> case XFS_ALLOCTYPE_START_BNO:
> return xfs_alloc_vextent_start_ag(args, minimum_agno);
> - case XFS_ALLOCTYPE_FIRST_AG:
> - return xfs_alloc_vextent_first_ag(args, minimum_agno);
> default:
> error = -EFSCORRUPTED;
> ASSERT(0);
> diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h
> index 0a9ad6cd18e2..73697dd3ca55 100644
> --- a/fs/xfs/libxfs/xfs_alloc.h
> +++ b/fs/xfs/libxfs/xfs_alloc.h
> @@ -19,7 +19,6 @@ unsigned int xfs_agfl_size(struct xfs_mount *mp);
> /*
> * Freespace allocation types. Argument to xfs_alloc_[v]extent.
> */
> -#define XFS_ALLOCTYPE_FIRST_AG 0x02 /* ... start at ag 0 */
> #define XFS_ALLOCTYPE_THIS_AG 0x08 /* anywhere in this a.g. */
> #define XFS_ALLOCTYPE_START_BNO 0x10 /* near this block else anywhere */
> #define XFS_ALLOCTYPE_NEAR_BNO 0x20 /* in this a.g. and near this block */
> @@ -29,7 +28,6 @@ unsigned int xfs_agfl_size(struct xfs_mount *mp);
> typedef unsigned int xfs_alloctype_t;
>
> #define XFS_ALLOC_TYPES \
> - { XFS_ALLOCTYPE_FIRST_AG, "FIRST_AG" }, \
> { XFS_ALLOCTYPE_THIS_AG, "THIS_AG" }, \
> { XFS_ALLOCTYPE_START_BNO, "START_BNO" }, \
> { XFS_ALLOCTYPE_NEAR_BNO, "NEAR_BNO" }, \
> @@ -130,6 +128,14 @@ xfs_alloc_vextent(
> */
> int xfs_alloc_vextent_this_ag(struct xfs_alloc_arg *args);
>
> +/*
> + * Iterate from the AG indicated from args->fsbno through to the end of the
> + * filesystem attempting blocking allocation. This is for use in last
> + * resort allocation attempts when everything else has failed.
> + */
> +int xfs_alloc_vextent_first_ag(struct xfs_alloc_arg *args,
> + xfs_rfsblock_t target);
> +
> /*
> * Free an extent.
> */
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index cdf3b551ef7b..eb3dc8d5319b 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -3248,13 +3248,6 @@ xfs_bmap_btalloc_filestreams(
> int notinit = 0;
> int error;
>
> - if (ap->tp->t_flags & XFS_TRANS_LOWMODE) {
> - args->type = XFS_ALLOCTYPE_FIRST_AG;
> - args->total = ap->minlen;
> - args->minlen = ap->minlen;
> - return 0;
> - }
> -
> args->type = XFS_ALLOCTYPE_NEAR_BNO;
> args->total = ap->total;
>
> @@ -3462,9 +3455,7 @@ xfs_bmap_exact_minlen_extent_alloc(
> */
> ap->blkno = XFS_AGB_TO_FSB(mp, 0, 0);
>
> - args.fsbno = ap->blkno;
> args.oinfo = XFS_RMAP_OINFO_SKIP_UPDATE;
> - args.type = XFS_ALLOCTYPE_FIRST_AG;
> args.minlen = args.maxlen = ap->minlen;
> args.total = ap->total;
>
> @@ -3476,7 +3467,7 @@ xfs_bmap_exact_minlen_extent_alloc(
> args.resv = XFS_AG_RESV_NONE;
> args.datatype = ap->datatype;
>
> - error = xfs_alloc_vextent(&args);
> + error = xfs_alloc_vextent_first_ag(&args, ap->blkno);
> if (error)
> return error;
>
> @@ -3623,10 +3614,21 @@ xfs_bmap_btalloc_best_length(
> * size to the largest space found.
> */
> if ((ap->datatype & XFS_ALLOC_USERDATA) &&
> - xfs_inode_is_filestream(ap->ip))
> + xfs_inode_is_filestream(ap->ip)) {
> + /*
> + * If there is very little free space before we start a
> + * filestreams allocation, we're almost guaranteed to fail to
> + * find an AG with enough contiguous free space to succeed, so
> + * just go straight to the low space algorithm.
> + */
> + if (ap->tp->t_flags & XFS_TRANS_LOWMODE) {
> + args->minlen = ap->minlen;
> + goto critically_low_space;
> + }
> error = xfs_bmap_btalloc_filestreams(ap, args, &blen);
> - else
> + } else {
> error = xfs_bmap_btalloc_select_lengths(ap, args, &blen);
> + }
> if (error)
> return error;
>
> @@ -3673,10 +3675,9 @@ xfs_bmap_btalloc_best_length(
> * so they don't waste time on allocation modes that are unlikely to
> * succeed.
> */
> - args->fsbno = 0;
> - args->type = XFS_ALLOCTYPE_FIRST_AG;
> +critically_low_space:
> args->total = ap->minlen;
> - error = xfs_alloc_vextent(args);
> + error = xfs_alloc_vextent_first_ag(args, 0);
> if (error)
> return error;
> ap->tp->t_flags |= XFS_TRANS_LOWMODE;
> --
> 2.39.0
>
next prev parent reply other threads:[~2023-02-01 22:43 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 [this message]
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
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 20/42] xfs: use xfs_alloc_vextent_first_ag() where appropriate 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=Y9rrAam9LzgERBYY@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