From: "Darrick J. Wong" <djwong@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 21/42] xfs: use xfs_alloc_vextent_start_bno() where appropriate
Date: Wed, 1 Feb 2023 14:51:23 -0800 [thread overview]
Message-ID: <Y9rs68OoaskIAXsd@magnolia> (raw)
In-Reply-To: <20230118224505.1964941-22-david@fromorbit.com>
On Thu, Jan 19, 2023 at 09:44:44AM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> Change obvious callers of single AG allocation to use
> xfs_alloc_vextent_start_bno(). Callers no long need to specify
> XFS_ALLOCTYPE_START_BNO, and so the type can be driven inward and
> removed.
>
> While doing this, also pass the allocation target fsb as a parameter
> rather than encoding it in args->fsbno.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
> fs/xfs/libxfs/xfs_alloc.c | 24 ++++++++++---------
> fs/xfs/libxfs/xfs_alloc.h | 13 ++++++++--
> fs/xfs/libxfs/xfs_bmap.c | 43 ++++++++++++++++++++--------------
> fs/xfs/libxfs/xfs_bmap_btree.c | 9 ++-----
> 4 files changed, 51 insertions(+), 38 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
> index 186ce3aee9e0..294f80d596d9 100644
> --- a/fs/xfs/libxfs/xfs_alloc.c
> +++ b/fs/xfs/libxfs/xfs_alloc.c
> @@ -3189,7 +3189,6 @@ xfs_alloc_vextent_check_args(
> struct xfs_mount *mp = args->mp;
> xfs_agblock_t agsize;
>
> - args->otype = args->type;
> args->agbno = NULLAGBLOCK;
>
> /*
> @@ -3345,7 +3344,7 @@ xfs_alloc_vextent_iterate_ags(
> trace_xfs_alloc_vextent_loopfailed(args);
>
> if (args->agno == start_agno &&
> - args->otype == XFS_ALLOCTYPE_START_BNO)
> + args->otype == XFS_ALLOCTYPE_NEAR_BNO)
> args->type = XFS_ALLOCTYPE_THIS_AG;
>
> /*
> @@ -3373,7 +3372,7 @@ xfs_alloc_vextent_iterate_ags(
> }
>
> flags = 0;
> - if (args->otype == XFS_ALLOCTYPE_START_BNO) {
> + if (args->otype == XFS_ALLOCTYPE_NEAR_BNO) {
> args->agbno = XFS_FSB_TO_AGBNO(mp, args->fsbno);
> args->type = XFS_ALLOCTYPE_NEAR_BNO;
> }
> @@ -3396,18 +3395,22 @@ xfs_alloc_vextent_iterate_ags(
> * otherwise will wrap back to the start AG and run a second blocking pass to
> * the end of the filesystem.
> */
> -static int
> +int
> xfs_alloc_vextent_start_ag(
> struct xfs_alloc_arg *args,
> - xfs_agnumber_t minimum_agno)
> + xfs_rfsblock_t target)
Same xfs_fsblock_t vs. xfs_rfsblock_t comment as the last patch. The
rest looks ok though.
--D
> {
> struct xfs_mount *mp = args->mp;
> + xfs_agnumber_t minimum_agno = 0;
> xfs_agnumber_t start_agno;
> xfs_agnumber_t rotorstep = xfs_rotorstep;
> bool bump_rotor = false;
> int error;
>
> - error = xfs_alloc_vextent_check_args(args, args->fsbno);
> + 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;
> @@ -3416,14 +3419,15 @@ xfs_alloc_vextent_start_ag(
>
> if ((args->datatype & XFS_ALLOC_INITIAL_USER_DATA) &&
> xfs_is_inode32(mp)) {
> - args->fsbno = XFS_AGB_TO_FSB(mp,
> + target = XFS_AGB_TO_FSB(mp,
> ((mp->m_agfrotor / rotorstep) %
> mp->m_sb.sb_agcount), 0);
> bump_rotor = 1;
> }
> - start_agno = max(minimum_agno, XFS_FSB_TO_AGNO(mp, args->fsbno));
> - args->agbno = XFS_FSB_TO_AGBNO(mp, args->fsbno);
> + start_agno = max(minimum_agno, XFS_FSB_TO_AGNO(mp, target));
> + args->agbno = XFS_FSB_TO_AGBNO(mp, target);
> args->type = XFS_ALLOCTYPE_NEAR_BNO;
> + args->fsbno = target;
>
> error = xfs_alloc_vextent_iterate_ags(args, minimum_agno, start_agno,
> XFS_ALLOC_FLAG_TRYLOCK);
> @@ -3498,8 +3502,6 @@ xfs_alloc_vextent(
> error = xfs_alloc_vextent_this_ag(args);
> xfs_perag_put(args->pag);
> break;
> - case XFS_ALLOCTYPE_START_BNO:
> - return xfs_alloc_vextent_start_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 73697dd3ca55..5487dff3d68a 100644
> --- a/fs/xfs/libxfs/xfs_alloc.h
> +++ b/fs/xfs/libxfs/xfs_alloc.h
> @@ -20,7 +20,6 @@ unsigned int xfs_agfl_size(struct xfs_mount *mp);
> * Freespace allocation types. Argument to xfs_alloc_[v]extent.
> */
> #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 */
> #define XFS_ALLOCTYPE_THIS_BNO 0x40 /* at exactly this block */
>
> @@ -29,7 +28,6 @@ typedef unsigned int xfs_alloctype_t;
>
> #define XFS_ALLOC_TYPES \
> { XFS_ALLOCTYPE_THIS_AG, "THIS_AG" }, \
> - { XFS_ALLOCTYPE_START_BNO, "START_BNO" }, \
> { XFS_ALLOCTYPE_NEAR_BNO, "NEAR_BNO" }, \
> { XFS_ALLOCTYPE_THIS_BNO, "THIS_BNO" }
>
> @@ -128,6 +126,17 @@ xfs_alloc_vextent(
> */
> int xfs_alloc_vextent_this_ag(struct xfs_alloc_arg *args);
>
> +/*
> + * Best effort full filesystem allocation scan.
> + *
> + * Locality aware allocation will be attempted in the initial AG, but on failure
> + * non-localised attempts will be made. The AGs are constrained by previous
> + * allocations in the current transaction. Two passes will be made - the first
> + * non-blocking, the second blocking.
> + */
> +int xfs_alloc_vextent_start_ag(struct xfs_alloc_arg *args,
> + xfs_rfsblock_t target);
> +
> /*
> * Iterate from the AG indicated from args->fsbno through to the end of the
> * filesystem attempting blocking allocation. This is for use in last
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index eb3dc8d5319b..aefcdf2bfd57 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -646,12 +646,11 @@ xfs_bmap_extents_to_btree(
> args.mp = mp;
> xfs_rmap_ino_bmbt_owner(&args.oinfo, ip->i_ino, whichfork);
>
> - args.type = XFS_ALLOCTYPE_START_BNO;
> - args.fsbno = XFS_INO_TO_FSB(mp, ip->i_ino);
> args.minlen = args.maxlen = args.prod = 1;
> args.wasdel = wasdel;
> *logflagsp = 0;
> - error = xfs_alloc_vextent(&args);
> + error = xfs_alloc_vextent_start_ag(&args,
> + XFS_INO_TO_FSB(mp, ip->i_ino));
> if (error)
> goto out_root_realloc;
>
> @@ -792,15 +791,15 @@ xfs_bmap_local_to_extents(
> args.total = total;
> args.minlen = args.maxlen = args.prod = 1;
> xfs_rmap_ino_owner(&args.oinfo, ip->i_ino, whichfork, 0);
> +
> /*
> * Allocate a block. We know we need only one, since the
> * file currently fits in an inode.
> */
> - args.fsbno = XFS_INO_TO_FSB(args.mp, ip->i_ino);
> - args.type = XFS_ALLOCTYPE_START_BNO;
> args.total = total;
> args.minlen = args.maxlen = args.prod = 1;
> - error = xfs_alloc_vextent(&args);
> + error = xfs_alloc_vextent_start_ag(&args,
> + XFS_INO_TO_FSB(args.mp, ip->i_ino));
> if (error)
> goto done;
>
> @@ -3208,7 +3207,6 @@ xfs_bmap_btalloc_select_lengths(
> int notinit = 0;
> int error = 0;
>
> - args->type = XFS_ALLOCTYPE_START_BNO;
> if (ap->tp->t_flags & XFS_TRANS_LOWMODE) {
> args->total = ap->minlen;
> args->minlen = ap->minlen;
> @@ -3500,7 +3498,8 @@ xfs_bmap_btalloc_at_eof(
> struct xfs_bmalloca *ap,
> struct xfs_alloc_arg *args,
> xfs_extlen_t blen,
> - int stripe_align)
> + int stripe_align,
> + bool ag_only)
> {
> struct xfs_mount *mp = args->mp;
> xfs_alloctype_t atype;
> @@ -3565,7 +3564,10 @@ xfs_bmap_btalloc_at_eof(
> args->minalignslop = 0;
> }
>
> - error = xfs_alloc_vextent(args);
> + if (ag_only)
> + error = xfs_alloc_vextent(args);
> + else
> + error = xfs_alloc_vextent_start_ag(args, ap->blkno);
> if (error)
> return error;
>
> @@ -3591,13 +3593,17 @@ xfs_bmap_btalloc_best_length(
> {
> struct xfs_mount *mp = args->mp;
> xfs_extlen_t blen = 0;
> + bool is_filestream = false;
> int error;
>
> + if ((ap->datatype & XFS_ALLOC_USERDATA) &&
> + xfs_inode_is_filestream(ap->ip))
> + is_filestream = true;
> +
> /*
> * Determine the initial block number we will target for allocation.
> */
> - if ((ap->datatype & XFS_ALLOC_USERDATA) &&
> - xfs_inode_is_filestream(ap->ip)) {
> + if (is_filestream) {
> xfs_agnumber_t agno = xfs_filestream_lookup_ag(ap->ip);
> if (agno == NULLAGNUMBER)
> agno = 0;
> @@ -3613,8 +3619,7 @@ xfs_bmap_btalloc_best_length(
> * the request. If one isn't found, then adjust the minimum allocation
> * size to the largest space found.
> */
> - if ((ap->datatype & XFS_ALLOC_USERDATA) &&
> - xfs_inode_is_filestream(ap->ip)) {
> + if (is_filestream) {
> /*
> * If there is very little free space before we start a
> * filestreams allocation, we're almost guaranteed to fail to
> @@ -3639,14 +3644,18 @@ xfs_bmap_btalloc_best_length(
> * trying.
> */
> if (ap->aeof && !(ap->tp->t_flags & XFS_TRANS_LOWMODE)) {
> - error = xfs_bmap_btalloc_at_eof(ap, args, blen, stripe_align);
> + error = xfs_bmap_btalloc_at_eof(ap, args, blen, stripe_align,
> + is_filestream);
> if (error)
> return error;
> if (args->fsbno != NULLFSBLOCK)
> return 0;
> }
>
> - error = xfs_alloc_vextent(args);
> + if (is_filestream)
> + error = xfs_alloc_vextent(args);
> + else
> + error = xfs_alloc_vextent_start_ag(args, ap->blkno);
> if (error)
> return error;
> if (args->fsbno != NULLFSBLOCK)
> @@ -3658,9 +3667,7 @@ xfs_bmap_btalloc_best_length(
> */
> if (args->minlen > ap->minlen) {
> args->minlen = ap->minlen;
> - args->type = XFS_ALLOCTYPE_START_BNO;
> - args->fsbno = ap->blkno;
> - error = xfs_alloc_vextent(args);
> + error = xfs_alloc_vextent_start_ag(args, ap->blkno);
> if (error)
> return error;
> }
> diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c
> index d42c1a1da1fc..b8ad95050c9b 100644
> --- a/fs/xfs/libxfs/xfs_bmap_btree.c
> +++ b/fs/xfs/libxfs/xfs_bmap_btree.c
> @@ -214,9 +214,6 @@ xfs_bmbt_alloc_block(
> if (!args.wasdel && args.tp->t_blk_res == 0)
> return -ENOSPC;
>
> - args.fsbno = be64_to_cpu(start->l);
> - args.type = XFS_ALLOCTYPE_START_BNO;
> -
> /*
> * If we are coming here from something like unwritten extent
> * conversion, there has been no data extent allocation already done, so
> @@ -227,7 +224,7 @@ xfs_bmbt_alloc_block(
> args.minleft = xfs_bmapi_minleft(cur->bc_tp, cur->bc_ino.ip,
> cur->bc_ino.whichfork);
>
> - error = xfs_alloc_vextent(&args);
> + error = xfs_alloc_vextent_start_ag(&args, be64_to_cpu(start->l));
> if (error)
> return error;
>
> @@ -237,10 +234,8 @@ xfs_bmbt_alloc_block(
> * a full btree split. Try again and if
> * successful activate the lowspace algorithm.
> */
> - args.fsbno = 0;
> args.minleft = 0;
> - args.type = XFS_ALLOCTYPE_START_BNO;
> - error = xfs_alloc_vextent(&args);
> + error = xfs_alloc_vextent_start_ag(&args, 0);
> if (error)
> return error;
> cur->bc_tp->t_flags |= XFS_TRANS_LOWMODE;
> --
> 2.39.0
>
next prev parent reply other threads:[~2023-02-01 22:51 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 [this message]
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 21/42] xfs: use xfs_alloc_vextent_start_bno() 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=Y9rs68OoaskIAXsd@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.