From: "Darrick J. Wong" <djwong@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 06/18] xfs: kill XFS_DAC_LEAF_ADDNAME_INIT
Date: Tue, 10 May 2022 16:15:41 -0700 [thread overview]
Message-ID: <20220510231541.GJ27195@magnolia> (raw)
In-Reply-To: <20220509004138.762556-7-david@fromorbit.com>
On Mon, May 09, 2022 at 10:41:26AM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> We re-enter the XFS_DAS_FOUND_LBLK state when we have to allocate
> multiple extents for a remote xattr. We currently have a flag
> called XFS_DAC_LEAF_ADDNAME_INIT to avoid running the remote attr
> hole finding code more than once.
>
> However, for the node format tree, we have a separate state for this
> so we never reenter the state machine at XFS_DAS_FOUND_NBLK and so
> it does not need a special flag to skip over the remote attr hold
> finding code.
>
> Convert the leaf block code to use the same state machine as the
> node blocks and kill the XFS_DAC_LEAF_ADDNAME_INIT flag.
>
> This further points out that this "ALLOC" state is only traversed
> if we have remote xattrs or we are doing a rename operation. Rename
> both the leaf and node alloc states to _ALLOC_RMT to indicate they
> are iterating to do allocation of remote xattr blocks.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> Reviewed-by: Allison Henderson<allison.henderson@oracle.com>
I agree this is a good idea to have rmtval allocation as separate
states in the machine.
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/xfs/libxfs/xfs_attr.c | 45 ++++++++++++++++++++--------------------
> fs/xfs/libxfs/xfs_attr.h | 6 ++++--
> fs/xfs/xfs_trace.h | 3 ++-
> 3 files changed, 29 insertions(+), 25 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index edc31075fde4..ab8a884af512 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -406,40 +406,41 @@ xfs_attr_set_iter(
> return xfs_attr_node_addname(attr);
>
> case XFS_DAS_FOUND_LBLK:
> + /*
> + * Find space for remote blocks and fall into the allocation
> + * state.
> + */
> + if (args->rmtblkno > 0) {
> + error = xfs_attr_rmtval_find_space(attr);
> + if (error)
> + return error;
> + }
> + attr->xattri_dela_state = XFS_DAS_LEAF_ALLOC_RMT;
> + fallthrough;
> + case XFS_DAS_LEAF_ALLOC_RMT:
> +
> /*
> * If there was an out-of-line value, allocate the blocks we
> * identified for its storage and copy the value. This is done
> * after we create the attribute so that we don't overflow the
> * maximum size of a transaction and/or hit a deadlock.
> */
> -
> - /* Open coded xfs_attr_rmtval_set without trans handling */
> - if ((attr->xattri_flags & XFS_DAC_LEAF_ADDNAME_INIT) == 0) {
> - attr->xattri_flags |= XFS_DAC_LEAF_ADDNAME_INIT;
> - if (args->rmtblkno > 0) {
> - error = xfs_attr_rmtval_find_space(attr);
> + if (args->rmtblkno > 0) {
> + if (attr->xattri_blkcnt > 0) {
> + error = xfs_attr_rmtval_set_blk(attr);
> if (error)
> return error;
> + trace_xfs_attr_set_iter_return(
> + attr->xattri_dela_state,
> + args->dp);
> + return -EAGAIN;
> }
> - }
>
> - /*
> - * Repeat allocating remote blocks for the attr value until
> - * blkcnt drops to zero.
> - */
> - if (attr->xattri_blkcnt > 0) {
> - error = xfs_attr_rmtval_set_blk(attr);
> + error = xfs_attr_rmtval_set_value(args);
> if (error)
> return error;
> - trace_xfs_attr_set_iter_return(attr->xattri_dela_state,
> - args->dp);
> - return -EAGAIN;
> }
>
> - error = xfs_attr_rmtval_set_value(args);
> - if (error)
> - return error;
> -
> /*
> * If this is not a rename, clear the incomplete flag and we're
> * done.
> @@ -534,15 +535,15 @@ xfs_attr_set_iter(
> return error;
> }
>
> + attr->xattri_dela_state = XFS_DAS_NODE_ALLOC_RMT;
> fallthrough;
> - case XFS_DAS_ALLOC_NODE:
> + case XFS_DAS_NODE_ALLOC_RMT:
> /*
> * If there was an out-of-line value, allocate the blocks we
> * identified for its storage and copy the value. This is done
> * after we create the attribute so that we don't overflow the
> * maximum size of a transaction and/or hit a deadlock.
> */
> - attr->xattri_dela_state = XFS_DAS_ALLOC_NODE;
> if (args->rmtblkno > 0) {
> if (attr->xattri_blkcnt > 0) {
> error = xfs_attr_rmtval_set_blk(attr);
> diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
> index ad52b5dc59e4..d016af4dbf81 100644
> --- a/fs/xfs/libxfs/xfs_attr.h
> +++ b/fs/xfs/libxfs/xfs_attr.h
> @@ -451,11 +451,12 @@ enum xfs_delattr_state {
> XFS_DAS_RM_NAME, /* Remove attr name */
> XFS_DAS_RM_SHRINK, /* We are shrinking the tree */
> XFS_DAS_FOUND_LBLK, /* We found leaf blk for attr */
> + XFS_DAS_LEAF_ALLOC_RMT, /* We are allocating remote blocks */
> XFS_DAS_FOUND_NBLK, /* We found node blk for attr */
> + XFS_DAS_NODE_ALLOC_RMT, /* We are allocating remote blocks */
> XFS_DAS_FLIP_LFLAG, /* Flipped leaf INCOMPLETE attr flag */
> XFS_DAS_RM_LBLK, /* A rename is removing leaf blocks */
> XFS_DAS_RD_LEAF, /* Read in the new leaf */
> - XFS_DAS_ALLOC_NODE, /* We are allocating node blocks */
> XFS_DAS_FLIP_NFLAG, /* Flipped node INCOMPLETE attr flag */
> XFS_DAS_RM_NBLK, /* A rename is removing node blocks */
> XFS_DAS_CLR_FLAG, /* Clear incomplete flag */
> @@ -471,11 +472,12 @@ enum xfs_delattr_state {
> { XFS_DAS_RM_NAME, "XFS_DAS_RM_NAME" }, \
> { XFS_DAS_RM_SHRINK, "XFS_DAS_RM_SHRINK" }, \
> { XFS_DAS_FOUND_LBLK, "XFS_DAS_FOUND_LBLK" }, \
> + { XFS_DAS_LEAF_ALLOC_RMT, "XFS_DAS_LEAF_ALLOC_RMT" }, \
> { XFS_DAS_FOUND_NBLK, "XFS_DAS_FOUND_NBLK" }, \
> + { XFS_DAS_NODE_ALLOC_RMT, "XFS_DAS_NODE_ALLOC_RMT" }, \
> { XFS_DAS_FLIP_LFLAG, "XFS_DAS_FLIP_LFLAG" }, \
> { XFS_DAS_RM_LBLK, "XFS_DAS_RM_LBLK" }, \
> { XFS_DAS_RD_LEAF, "XFS_DAS_RD_LEAF" }, \
> - { XFS_DAS_ALLOC_NODE, "XFS_DAS_ALLOC_NODE" }, \
> { XFS_DAS_FLIP_NFLAG, "XFS_DAS_FLIP_NFLAG" }, \
> { XFS_DAS_RM_NBLK, "XFS_DAS_RM_NBLK" }, \
> { XFS_DAS_CLR_FLAG, "XFS_DAS_CLR_FLAG" }, \
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index 8f722be25c29..067ab31d7a20 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -4137,11 +4137,12 @@ TRACE_DEFINE_ENUM(XFS_DAS_RMTBLK);
> TRACE_DEFINE_ENUM(XFS_DAS_RM_NAME);
> TRACE_DEFINE_ENUM(XFS_DAS_RM_SHRINK);
> TRACE_DEFINE_ENUM(XFS_DAS_FOUND_LBLK);
> +TRACE_DEFINE_ENUM(XFS_DAS_LEAF_ALLOC_RMT);
> TRACE_DEFINE_ENUM(XFS_DAS_FOUND_NBLK);
> +TRACE_DEFINE_ENUM(XFS_DAS_NODE_ALLOC_RMT);
> TRACE_DEFINE_ENUM(XFS_DAS_FLIP_LFLAG);
> TRACE_DEFINE_ENUM(XFS_DAS_RM_LBLK);
> TRACE_DEFINE_ENUM(XFS_DAS_RD_LEAF);
> -TRACE_DEFINE_ENUM(XFS_DAS_ALLOC_NODE);
> TRACE_DEFINE_ENUM(XFS_DAS_FLIP_NFLAG);
> TRACE_DEFINE_ENUM(XFS_DAS_RM_NBLK);
> TRACE_DEFINE_ENUM(XFS_DAS_CLR_FLAG);
> --
> 2.35.1
>
next prev parent reply other threads:[~2022-05-10 23:15 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 0:41 [PATCH 00/18 V4] XFS: LARP state machine and recovery rework Dave Chinner
2022-05-09 0:41 ` [PATCH 01/18] xfs: avoid empty xattr transaction when attrs are inline Dave Chinner
2022-05-09 16:43 ` Darrick J. Wong
2022-05-09 0:41 ` [PATCH 02/18] xfs: initialise attrd item to zero Dave Chinner
2022-05-09 16:43 ` Darrick J. Wong
2022-05-09 0:41 ` [PATCH 03/18] xfs: make xattri_leaf_bp more useful Dave Chinner
2022-05-10 22:58 ` Darrick J. Wong
2022-05-09 0:41 ` [PATCH 04/18] xfs: rework deferred attribute operation setup Dave Chinner
2022-05-10 23:04 ` Darrick J. Wong
2022-05-11 0:57 ` Dave Chinner
2022-05-09 0:41 ` [PATCH 05/18] xfs: separate out initial attr_set states Dave Chinner
2022-05-10 23:12 ` Darrick J. Wong
2022-05-11 1:06 ` Dave Chinner
2022-05-11 1:08 ` Darrick J. Wong
2022-05-11 1:38 ` Dave Chinner
2022-05-11 8:35 ` Dave Chinner
2022-05-11 15:39 ` Darrick J. Wong
2022-05-12 0:57 ` Dave Chinner
2022-05-09 0:41 ` [PATCH 06/18] xfs: kill XFS_DAC_LEAF_ADDNAME_INIT Dave Chinner
2022-05-10 23:15 ` Darrick J. Wong [this message]
2022-05-09 0:41 ` [PATCH 07/18] xfs: consolidate leaf/node states in xfs_attr_set_iter Dave Chinner
2022-05-10 23:20 ` Darrick J. Wong
2022-05-11 1:09 ` Dave Chinner
2022-05-09 0:41 ` [PATCH 08/18] xfs: split remote attr setting out from replace path Dave Chinner
2022-05-10 23:22 ` Darrick J. Wong
2022-05-09 0:41 ` [PATCH 09/18] xfs: XFS_DAS_LEAF_REPLACE state only needed if !LARP Dave Chinner
2022-05-10 23:24 ` Darrick J. Wong
2022-05-09 0:41 ` [PATCH 10/18] xfs: remote xattr removal in xfs_attr_set_iter() is conditional Dave Chinner
2022-05-10 23:26 ` Darrick J. Wong
2022-05-09 0:41 ` [PATCH 11/18] xfs: clean up final attr removal in xfs_attr_set_iter Dave Chinner
2022-05-10 23:29 ` Darrick J. Wong
2022-05-09 0:41 ` [PATCH 12/18] xfs: xfs_attr_set_iter() does not need to return EAGAIN Dave Chinner
2022-05-10 23:30 ` Darrick J. Wong
2022-05-09 0:41 ` [PATCH 13/18] xfs: introduce attr remove initial states into xfs_attr_set_iter Dave Chinner
2022-05-10 23:37 ` Darrick J. Wong
2022-05-10 23:40 ` Darrick J. Wong
2022-05-09 0:41 ` [PATCH 14/18] xfs: switch attr remove to xfs_attri_set_iter Dave Chinner
2022-05-10 23:40 ` Darrick J. Wong
2022-05-09 0:41 ` [PATCH 15/18] xfs: remove xfs_attri_remove_iter Dave Chinner
2022-05-10 23:42 ` Darrick J. Wong
2022-05-09 0:41 ` [PATCH 16/18] xfs: use XFS_DA_OP flags in deferred attr ops Dave Chinner
2022-05-10 22:20 ` [PATCH 16/18 v2] " Dave Chinner
2022-05-10 23:47 ` Darrick J. Wong
2022-05-10 23:49 ` Alli
2022-05-09 0:41 ` [PATCH 17/18] xfs: ATTR_REPLACE algorithm with LARP enabled needs rework Dave Chinner
2022-05-10 22:31 ` Alli
2022-05-10 23:53 ` Darrick J. Wong
2022-05-11 1:14 ` Dave Chinner
2022-05-09 0:41 ` [PATCH 18/18] xfs: detect empty attr leaf blocks in xfs_attr3_leaf_verify Dave Chinner
2022-05-10 22:31 ` Alli
2022-05-10 23:54 ` Darrick J. Wong
2022-05-10 22:27 ` [PATCH 19/18] xfs: can't use kmem_zalloc() for attribute buffers Dave Chinner
2022-05-10 23:59 ` Darrick J. Wong
2022-05-11 0:54 ` Dave Chinner
2022-05-11 1:10 ` Darrick J. Wong
2022-05-11 0:54 ` Alli
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=20220510231541.GJ27195@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