From: Dave Chinner <david@fromorbit.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 29/36] xfs: use xfs_alloc_vextent_start_bno() where appropriate
Date: Fri, 3 Dec 2021 11:01:04 +1100 [thread overview]
Message-ID: <20211203000111.2800982-30-david@fromorbit.com> (raw)
In-Reply-To: <20211203000111.2800982-1-david@fromorbit.com>
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 | 34 ++++++++++-----------
fs/xfs/libxfs/xfs_alloc.h | 13 ++++++--
fs/xfs/libxfs/xfs_bmap.c | 54 ++++++++++++++++++----------------
fs/xfs/libxfs/xfs_bmap_btree.c | 8 ++---
4 files changed, 59 insertions(+), 50 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index 946899a5e3cb..9c22d101d3ca 100644
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -3174,7 +3174,6 @@ xfs_alloc_vextent_check_args(
struct xfs_mount *mp = args->mp;
xfs_agblock_t agsize;
- args->otype = args->type;
args->agbno = NULLAGBLOCK;
/*
@@ -3260,12 +3259,11 @@ xfs_alloc_vextent_this_ag(
/*
* Iterate all AGs trying to allocate an extent starting from @start_ag.
*
- * If the
- * incoming allocation type is XFS_ALLOCTYPE_NEAR_BNO, it means the allocation
- * attempts in @start_agno have locality information. If we fail to allocate in
- * that AG, then we revert to anywhere-in-AG for all the other AGs we attempt to
- * allocation in as there is no locality optimisation possible for those
- * allocations.
+ * If the incoming allocation type is XFS_ALLOCTYPE_NEAR_BNO, it means the
+ * allocation attempts in @start_agno have locality information. If we fail to
+ * allocate in that AG, then we revert to anywhere-in-AG for all the other AGs
+ * we attempt to allocation in as there is no locality optimisation possible for
+ * those allocations.
*
* When we wrap the AG iteration at the end of the filesystem, we have to be
* careful not to wrap into AGs below ones we already have locked in the
@@ -3299,7 +3297,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;
/*
* For the first allocation, we can try any AG to get
@@ -3326,7 +3324,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;
}
@@ -3345,9 +3343,10 @@ 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)
+ struct xfs_alloc_arg *args,
+ xfs_rfsblock_t target)
{
struct xfs_mount *mp = args->mp;
xfs_agnumber_t start_agno;
@@ -3355,7 +3354,7 @@ xfs_alloc_vextent_start_ag(
bool bump_rotor = false;
int error;
- error = xfs_alloc_vextent_check_args(args, args->fsbno);
+ error = xfs_alloc_vextent_check_args(args, target);
if (error) {
if (error == -ENOSPC)
return 0;
@@ -3364,14 +3363,17 @@ 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 = XFS_FSB_TO_AGNO(mp, args->fsbno);
- args->agbno = XFS_FSB_TO_AGBNO(mp, args->fsbno);
+
+ start_agno = XFS_FSB_TO_AGNO(mp, target);
+ args->agbno = XFS_FSB_TO_AGBNO(mp, target);
+ args->otype = XFS_ALLOCTYPE_NEAR_BNO;
args->type = XFS_ALLOCTYPE_NEAR_BNO;
+ args->fsbno = target;
error = xfs_alloc_vextent_iterate_ags(args, start_agno,
XFS_ALLOC_FLAG_TRYLOCK);
@@ -3439,8 +3441,6 @@ xfs_alloc_vextent(
error = xfs_alloc_vextent_this_ag(args);
xfs_perag_put(args->pag);
return error;
- case XFS_ALLOCTYPE_START_BNO:
- return xfs_alloc_vextent_start_ag(args);
default:
ASSERT(0);
/* NOTREACHED */
diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h
index 1b47c48c6060..a02ea72aa0c4 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" }
@@ -129,6 +127,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 52e00ce478e1..23a29b33e77c 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -651,13 +651,10 @@ xfs_bmap_extents_to_btree(
*logflagsp = 0;
xfs_rmap_ino_bmbt_owner(&args.oinfo, ip->i_ino, whichfork);
if (tp->t_firstblock == NULLFSBLOCK) {
- args.type = XFS_ALLOCTYPE_START_BNO;
- args.fsbno = XFS_INO_TO_FSB(mp, ip->i_ino);
- error = xfs_alloc_vextent(&args);
+ error = xfs_alloc_vextent_start_ag(&args,
+ XFS_INO_TO_FSB(mp, ip->i_ino));
} else if (tp->t_flags & XFS_TRANS_LOWMODE) {
- args.type = XFS_ALLOCTYPE_START_BNO;
- args.fsbno = tp->t_firstblock;
- error = xfs_alloc_vextent(&args);
+ error = xfs_alloc_vextent_start_ag(&args, tp->t_firstblock);
} else {
args.type = XFS_ALLOCTYPE_NEAR_BNO;
args.fsbno = tp->t_firstblock;
@@ -813,9 +810,8 @@ xfs_bmap_local_to_extents(
* file currently fits in an inode.
*/
if (tp->t_firstblock == NULLFSBLOCK) {
- args.fsbno = XFS_INO_TO_FSB(args.mp, ip->i_ino);
- args.type = XFS_ALLOCTYPE_START_BNO;
- error = xfs_alloc_vextent(&args);
+ 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;
@@ -3522,7 +3518,8 @@ xfs_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;
@@ -3587,7 +3584,10 @@ xfs_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;
@@ -3617,7 +3617,6 @@ xfs_btalloc_nullfb_bestlen(
int notinit = 0;
int error = 0;
- args->type = XFS_ALLOCTYPE_START_BNO;
args->total = ap->total;
startag = XFS_FSB_TO_AGNO(mp, args->fsbno);
@@ -3648,13 +3647,17 @@ xfs_btalloc_nullfb(
{
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;
@@ -3670,8 +3673,7 @@ xfs_btalloc_nullfb(
* 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)
error = xfs_bmap_btalloc_filestreams(ap, args, &blen);
else
error = xfs_btalloc_nullfb_bestlen(ap, args, &blen);
@@ -3679,14 +3681,18 @@ xfs_btalloc_nullfb(
return error;
if (ap->aeof) {
- error = xfs_btalloc_at_eof(ap, args, blen, stripe_align);
+ error = xfs_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)
@@ -3698,9 +3704,7 @@ xfs_btalloc_nullfb(
*/
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;
}
@@ -3737,10 +3741,7 @@ xfs_btalloc_low_mode(
args->total = args->minlen = ap->minlen;
if (xfs_inode_is_filestream(ap->ip))
return xfs_alloc_vextent_first_ag(args, ap->blkno);
-
- args->fsbno = ap->blkno;
- args->type = XFS_ALLOCTYPE_START_BNO;
- return xfs_alloc_vextent(args);
+ return xfs_alloc_vextent_start_ag(args, ap->blkno);
}
/*
@@ -3765,7 +3766,8 @@ xfs_btalloc_near(
args->minlen = ap->minlen;
if (ap->aeof) {
- error = xfs_btalloc_at_eof(ap, args, blen, stripe_align);
+ error = xfs_btalloc_at_eof(ap, args, blen, stripe_align,
+ true);
if (error)
return error;
if (args->fsbno != NULLFSBLOCK)
diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c
index 16899345a535..b2166dc16459 100644
--- a/fs/xfs/libxfs/xfs_bmap_btree.c
+++ b/fs/xfs/libxfs/xfs_bmap_btree.c
@@ -216,8 +216,6 @@ xfs_bmbt_alloc_block(
return -ENOSPC;
if (args.fsbno == NULLFSBLOCK) {
- args.fsbno = be64_to_cpu(start->l);
- args.type = XFS_ALLOCTYPE_START_BNO;
/*
* Make sure there is sufficient room left in the AG to
* complete a full tree split for an extent insert. If
@@ -230,7 +228,7 @@ xfs_bmbt_alloc_block(
* block allocation here and corrupt the filesystem.
*/
args.minleft = args.tp->t_blk_res;
- error = xfs_alloc_vextent(&args);
+ error = xfs_alloc_vextent_start_ag(&args, be64_to_cpu(start->l));
if (error)
goto error0;
@@ -246,8 +244,8 @@ xfs_bmbt_alloc_block(
cur->bc_tp->t_flags |= XFS_TRANS_LOWMODE;
}
} else if (cur->bc_tp->t_flags & XFS_TRANS_LOWMODE) {
- args.type = XFS_ALLOCTYPE_START_BNO;
- error = xfs_alloc_vextent(&args);
+ 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,
--
2.33.0
next prev parent reply other threads:[~2021-12-03 0:01 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-03 0:00 [RFC] [PATCH 00/36] xfs: more work towards shrinking Dave Chinner
2021-12-03 0:00 ` [PATCH 01/36] xfs: make last AG grow/shrink perag centric Dave Chinner
2021-12-03 0:00 ` [PATCH 02/36] xfs: kill xfs_ialloc_pagi_init() Dave Chinner
2021-12-03 0:00 ` [PATCH 03/36] xfs: pass perag to xfs_ialloc_read_agi() Dave Chinner
2021-12-03 0:00 ` [PATCH 04/36] xfs: kill xfs_alloc_pagf_init() Dave Chinner
2021-12-03 0:00 ` [PATCH 05/36] xfs: pass perag to xfs_alloc_read_agf() Dave Chinner
2021-12-03 5:37 ` kernel test robot
2021-12-03 5:37 ` kernel test robot
2021-12-03 7:10 ` [RFC PATCH] xfs: xfs_reflink_find_shared can be static kernel test robot
2021-12-03 7:10 ` kernel test robot
2021-12-03 7:19 ` [PATCH 05/36] xfs: pass perag to xfs_alloc_read_agf() kernel test robot
2021-12-03 7:19 ` kernel test robot
2021-12-03 7:19 ` kernel test robot
2021-12-03 7:19 ` kernel test robot
2021-12-03 0:00 ` [PATCH 06/36] xfs: pass perag to xfs_read_agi Dave Chinner
2021-12-03 0:00 ` [PATCH 07/36] xfs: pass perag to xfs_read_agf Dave Chinner
2021-12-03 0:00 ` [PATCH 08/36] xfs: pass perag to xfs_alloc_get_freelist Dave Chinner
2021-12-03 0:00 ` [PATCH 09/36] xfs: pass perag to xfs_alloc_put_freelist Dave Chinner
2021-12-03 0:00 ` [PATCH 10/36] xfs: pass perag to xfs_alloc_read_agfl Dave Chinner
2021-12-03 0:00 ` [PATCH 11/36] xfs: Pre-calculate per-AG agbno geometry Dave Chinner
2021-12-03 0:00 ` [PATCH 12/36] xfs: Pre-calculate per-AG agino geometry Dave Chinner
2021-12-03 0:00 ` [PATCH 13/36] xfs: replace xfs_ag_block_count() with perag accesses Dave Chinner
2021-12-03 0:00 ` [PATCH 14/36] xfs: make is_log_ag() a first class helper Dave Chinner
2021-12-03 0:00 ` [PATCH 15/36] xfs: active perag reference counting Dave Chinner
2021-12-03 0:00 ` [PATCH 16/36] xfs: rework the perag trace points to be perag centric Dave Chinner
2021-12-03 0:00 ` [PATCH 17/36] xfs: convert xfs_imap() to take a perag Dave Chinner
2021-12-03 0:00 ` [PATCH 18/36] xfs: use active perag references for inode allocation Dave Chinner
2021-12-03 0:00 ` [PATCH 19/36] xfs: inobt can use perags in many more places than it does Dave Chinner
2021-12-03 0:00 ` [PATCH 20/36] xfs: convert xfs_ialloc_next_ag() to an atomic Dave Chinner
2021-12-03 0:00 ` [PATCH 21/36] xfs: perags need atomic operational state Dave Chinner
2021-12-03 0:00 ` [PATCH 22/36] xfs: introduce xfs_for_each_perag_wrap() Dave Chinner
2021-12-03 0:00 ` [PATCH 23/36] xfs: rework xfs_alloc_vextent() Dave Chinner
2021-12-03 0:00 ` [PATCH 24/36] xfs: use xfs_alloc_vextent_this_ag() in _iterate_ags() Dave Chinner
2021-12-03 0:01 ` [PATCH 25/36] xfs: combine __xfs_alloc_vextent_this_ag and xfs_alloc_ag_vextent Dave Chinner
2021-12-03 0:01 ` [PATCH 26/36] xfs: use xfs_alloc_vextent_this_ag() where appropriate Dave Chinner
2021-12-03 0:01 ` [PATCH 27/36] xfs: factor xfs_bmap_btalloc() Dave Chinner
2021-12-03 0:01 ` [PATCH 28/36] xfs: use xfs_alloc_vextent_first_ag() where appropriate Dave Chinner
2021-12-03 0:01 ` Dave Chinner [this message]
2021-12-03 0:01 ` [PATCH 30/36] xfs: introduce xfs_alloc_vextent_near_bno() Dave Chinner
2021-12-03 0:01 ` [PATCH 31/36] xfs: introduce xfs_alloc_vextent_exact_bno() Dave Chinner
2021-12-03 0:01 ` [PATCH 32/36] xfs: introduce xfs_alloc_vextent_prepare() Dave Chinner
2021-12-03 0:01 ` [PATCH 33/36] xfs: move allocation accounting to xfs_alloc_vextent_set_fsbno() Dave Chinner
2021-12-03 0:01 ` [PATCH 34/36] xfs: fold xfs_alloc_ag_vextent() into callers Dave Chinner
2021-12-03 0:01 ` [PATCH 35/36] xfs: convert xfs_alloc_vextent_iterate_ags() to use perag walker Dave Chinner
2021-12-03 0:01 ` [PATCH 36/36] xfs: convert trim to use for_each_perag_range 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=20211203000111.2800982-30-david@fromorbit.com \
--to=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.