From: Chandan Babu R <chandanrlinux@gmail.com>
To: Allison Henderson <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v14 06/15] xfs: Add state machine tracepoints
Date: Tue, 05 Jan 2021 10:20:57 +0530 [thread overview]
Message-ID: <4353133.qTs6tMSDRZ@garuda> (raw)
In-Reply-To: <20201218072917.16805-7-allison.henderson@oracle.com>
On Fri, 18 Dec 2020 00:29:08 -0700, Allison Henderson wrote:
> This is a quick patch to add a new tracepoint: xfs_das_state_return. We
> use this to track when ever a new state is set or -EAGAIN is returned
>
Looks good to me.
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
> ---
> fs/xfs/libxfs/xfs_attr.c | 22 +++++++++++++++++++++-
> fs/xfs/libxfs/xfs_attr_remote.c | 1 +
> fs/xfs/xfs_trace.h | 20 ++++++++++++++++++++
> 3 files changed, 42 insertions(+), 1 deletion(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index cd72512..8ed00bc 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -263,6 +263,7 @@ xfs_attr_set_shortform(
> * We're still in XFS_DAS_UNINIT state here. We've converted the attr
> * fork to leaf format and will restart with the leaf add.
> */
> + trace_xfs_das_state_return(XFS_DAS_UNINIT);
> return -EAGAIN;
> }
>
> @@ -409,9 +410,11 @@ xfs_attr_set_iter(
> * down into the node handling code below
> */
> dac->flags |= XFS_DAC_DEFER_FINISH;
> + trace_xfs_das_state_return(dac->dela_state);
> return -EAGAIN;
> case 0:
> dac->dela_state = XFS_DAS_FOUND_LBLK;
> + trace_xfs_das_state_return(dac->dela_state);
> return -EAGAIN;
> }
> return error;
> @@ -841,6 +844,7 @@ xfs_attr_leaf_addname(
> return error;
>
> dac->flags |= XFS_DAC_DEFER_FINISH;
> + trace_xfs_das_state_return(dac->dela_state);
> return -EAGAIN;
> }
>
> @@ -874,6 +878,7 @@ xfs_attr_leaf_addname(
> * Commit the flag value change and start the next trans in series.
> */
> dac->dela_state = XFS_DAS_FLIP_LFLAG;
> + trace_xfs_das_state_return(dac->dela_state);
> return -EAGAIN;
> das_flip_flag:
> /*
> @@ -891,6 +896,8 @@ xfs_attr_leaf_addname(
> das_rm_lblk:
> if (args->rmtblkno) {
> error = __xfs_attr_rmtval_remove(dac);
> + if (error == -EAGAIN)
> + trace_xfs_das_state_return(dac->dela_state);
> if (error)
> return error;
> }
> @@ -1142,6 +1149,7 @@ xfs_attr_node_addname(
> * this point.
> */
> dac->flags |= XFS_DAC_DEFER_FINISH;
> + trace_xfs_das_state_return(dac->dela_state);
> return -EAGAIN;
> }
>
> @@ -1175,6 +1183,7 @@ xfs_attr_node_addname(
> state = NULL;
>
> dac->dela_state = XFS_DAS_FOUND_NBLK;
> + trace_xfs_das_state_return(dac->dela_state);
> return -EAGAIN;
> das_found_nblk:
>
> @@ -1202,6 +1211,7 @@ xfs_attr_node_addname(
> return error;
>
> dac->flags |= XFS_DAC_DEFER_FINISH;
> + trace_xfs_das_state_return(dac->dela_state);
> return -EAGAIN;
> }
>
> @@ -1236,6 +1246,7 @@ xfs_attr_node_addname(
> * Commit the flag value change and start the next trans in series
> */
> dac->dela_state = XFS_DAS_FLIP_NFLAG;
> + trace_xfs_das_state_return(dac->dela_state);
> return -EAGAIN;
> das_flip_flag:
> /*
> @@ -1253,6 +1264,10 @@ xfs_attr_node_addname(
> das_rm_nblk:
> if (args->rmtblkno) {
> error = __xfs_attr_rmtval_remove(dac);
> +
> + if (error == -EAGAIN)
> + trace_xfs_das_state_return(dac->dela_state);
> +
> if (error)
> return error;
> }
> @@ -1396,6 +1411,8 @@ xfs_attr_node_remove_rmt (
> * May return -EAGAIN to request that the caller recall this function
> */
> error = __xfs_attr_rmtval_remove(dac);
> + if (error == -EAGAIN)
> + trace_xfs_das_state_return(dac->dela_state);
> if (error)
> return error;
>
> @@ -1514,6 +1531,7 @@ xfs_attr_node_removename_iter(
>
> dac->flags |= XFS_DAC_DEFER_FINISH;
> dac->dela_state = XFS_DAS_RM_SHRINK;
> + trace_xfs_das_state_return(dac->dela_state);
> return -EAGAIN;
> }
>
> @@ -1532,8 +1550,10 @@ xfs_attr_node_removename_iter(
> goto out;
> }
>
> - if (error == -EAGAIN)
> + if (error == -EAGAIN) {
> + trace_xfs_das_state_return(dac->dela_state);
> return error;
> + }
> out:
> if (state)
> xfs_da_state_free(state);
> diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
> index 6af86bf..4840de9 100644
> --- a/fs/xfs/libxfs/xfs_attr_remote.c
> +++ b/fs/xfs/libxfs/xfs_attr_remote.c
> @@ -763,6 +763,7 @@ __xfs_attr_rmtval_remove(
> */
> if (!done) {
> dac->flags |= XFS_DAC_DEFER_FINISH;
> + trace_xfs_das_state_return(dac->dela_state);
> return -EAGAIN;
> }
>
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index 9074b8b..4f6939b4 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -3887,6 +3887,26 @@ DEFINE_EVENT(xfs_timestamp_range_class, name, \
> DEFINE_TIMESTAMP_RANGE_EVENT(xfs_inode_timestamp_range);
> DEFINE_TIMESTAMP_RANGE_EVENT(xfs_quota_expiry_range);
>
> +
> +DECLARE_EVENT_CLASS(xfs_das_state_class,
> + TP_PROTO(int das),
> + TP_ARGS(das),
> + TP_STRUCT__entry(
> + __field(int, das)
> + ),
> + TP_fast_assign(
> + __entry->das = das;
> + ),
> + TP_printk("state change %d",
> + __entry->das)
> +)
> +
> +#define DEFINE_DAS_STATE_EVENT(name) \
> +DEFINE_EVENT(xfs_das_state_class, name, \
> + TP_PROTO(int das), \
> + TP_ARGS(das))
> +DEFINE_DAS_STATE_EVENT(xfs_das_state_return);
> +
> #endif /* _TRACE_XFS_H */
>
> #undef TRACE_INCLUDE_PATH
>
--
chandan
next prev parent reply other threads:[~2021-01-05 4:51 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-18 7:29 [PATCH v14 00/15] xfs: Delayed Attributes Allison Henderson
2020-12-18 7:29 ` [PATCH v14 01/15] xfs: Add helper xfs_attr_node_remove_step Allison Henderson
2020-12-21 6:45 ` Chandan Babu R
2020-12-21 23:48 ` Allison Henderson
2020-12-22 16:50 ` Brian Foster
2020-12-18 7:29 ` [PATCH v14 02/15] xfs: Add xfs_attr_node_remove_cleanup Allison Henderson
2020-12-21 6:45 ` Chandan Babu R
2020-12-21 23:47 ` Allison Henderson
2020-12-22 16:50 ` Brian Foster
2020-12-18 7:29 ` [PATCH v14 03/15] xfs: Hoist transaction handling in xfs_attr_node_remove_step Allison Henderson
2020-12-21 6:45 ` Chandan Babu R
2020-12-21 21:51 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 04/15] xfs: Add delay ready attr remove routines Allison Henderson
2020-12-22 7:22 ` Chandan Babu R
2020-12-22 15:41 ` Allison Henderson
2020-12-23 4:05 ` Chandan Babu R
2020-12-22 17:11 ` Brian Foster
2020-12-22 17:20 ` Brian Foster
2020-12-22 18:44 ` Brian Foster
2020-12-23 5:20 ` Allison Henderson
2020-12-23 14:16 ` Brian Foster
2020-12-24 8:23 ` Allison Henderson
2021-01-04 17:52 ` Brian Foster
2021-01-05 18:10 ` Allison Henderson
2021-01-06 14:25 ` Brian Foster
2020-12-18 7:29 ` [PATCH v14 05/15] xfs: Add delay ready attr set routines Allison Henderson
2020-12-23 8:00 ` Chandan Babu R
2020-12-23 16:31 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 06/15] xfs: Add state machine tracepoints Allison Henderson
2021-01-05 4:50 ` Chandan Babu R [this message]
2021-01-05 21:06 ` Allison Henderson
2021-01-05 5:28 ` Darrick J. Wong
2021-01-05 21:07 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 07/15] xfs: Rename __xfs_attr_rmtval_remove Allison Henderson
2020-12-18 7:29 ` [PATCH v14 08/15] xfs: Handle krealloc errors in xlog_recover_add_to_cont_trans Allison Henderson
2021-01-05 5:38 ` Darrick J. Wong
2021-01-05 20:15 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 09/15] xfs: Set up infastructure for deferred attribute operations Allison Henderson
2020-12-18 7:29 ` [PATCH v14 10/15] xfs: Skip flip flags for delayed attrs Allison Henderson
2020-12-18 7:29 ` [PATCH v14 11/15] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2020-12-18 7:29 ` [PATCH v14 12/15] xfs: Remove unused xfs_attr_*_args Allison Henderson
2020-12-18 7:29 ` [PATCH v14 13/15] xfs: Add delayed attributes error tag Allison Henderson
2020-12-18 7:29 ` [PATCH v14 14/15] xfs: Add delattr mount option Allison Henderson
2021-01-05 5:46 ` Darrick J. Wong
2021-01-05 21:49 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 15/15] xfs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
2021-01-05 5:47 ` Darrick J. Wong
2021-01-05 21:07 ` Allison Henderson
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=4353133.qTs6tMSDRZ@garuda \
--to=chandanrlinux@gmail.com \
--cc=allison.henderson@oracle.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