[PATCH v15 30/37] xfsprogs: Add state machine tracepoints
From: Allison Henderson <hidden>
Date: 2021-02-18 18:47:32
Subsystem:
the rest · Maintainer:
Linus Torvalds
Source kernel commit: fbc8d6bb875915e0afd8ff6cd4364b368a6f894f 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 Signed-off-by: Allison Henderson <redacted> --- include/xfs_trace.h | 7 +++++++ libxfs/xfs_attr.c | 31 ++++++++++++++++++++++++++++++- libxfs/xfs_attr_remote.c | 1 + 3 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/include/xfs_trace.h b/include/xfs_trace.h
index a100263..cc3e8b3 100644
--- a/include/xfs_trace.h
+++ b/include/xfs_trace.h@@ -314,4 +314,11 @@ #define trace_xfs_perag_get_tag(a,b,c,d) ((c) = (c)) #define trace_xfs_perag_put(a,b,c,d) ((c) = (c)) +#define trace_xfs_attr_set_fmt_return(a,b) ((void) 0) +#define trace_xfs_attr_set_iter_return(a,b) ((void) 0) +#define trace_xfs_attr_node_addname_return(a,b) ((void) 0) +#define trace_xfs_attr_node_remove_rmt_return(a,b) ((void) 0) +#define trace_xfs_attr_node_removename_iter_return(a,b) ((void) 0) +#define trace_xfs_attr_rmtval_remove_return(a,b) ((void) 0) + #endif /* __TRACE_H__ */
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index e4c6268..4aad38d 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c@@ -313,6 +313,7 @@ xfs_attr_set_fmt( * the attr fork to leaf format and will restart with the leaf * add. */ + trace_xfs_attr_set_fmt_return(XFS_DAS_UNINIT, args->dp); dac->flags |= XFS_DAC_DEFER_FINISH; return -EAGAIN; }
@@ -378,6 +379,8 @@ xfs_attr_set_iter( * handling code below */ dac->flags |= XFS_DAC_DEFER_FINISH; + trace_xfs_attr_set_iter_return( + dac->dela_state, args->dp); return -EAGAIN; } else if (error)
@@ -400,10 +403,13 @@ xfs_attr_set_iter( return error; dac->dela_state = XFS_DAS_FOUND_NBLK; + trace_xfs_attr_set_iter_return(dac->dela_state, + args->dp); return -EAGAIN; } dac->dela_state = XFS_DAS_FOUND_LBLK; + trace_xfs_attr_set_iter_return(dac->dela_state, args->dp); return -EAGAIN; case XFS_DAS_FOUND_LBLK:
@@ -433,6 +439,8 @@ xfs_attr_set_iter( if (error) return error; + trace_xfs_attr_set_iter_return(dac->dela_state, + args->dp); return -EAGAIN; }
@@ -469,6 +477,7 @@ xfs_attr_set_iter( * series. */ dac->dela_state = XFS_DAS_FLIP_LFLAG; + trace_xfs_attr_set_iter_return(dac->dela_state, args->dp); return -EAGAIN; case XFS_DAS_FLIP_LFLAG: /*
@@ -488,6 +497,9 @@ xfs_attr_set_iter( case XFS_DAS_RM_LBLK: if (args->rmtblkno) { error = __xfs_attr_rmtval_remove(dac); + if (error == -EAGAIN) + trace_xfs_attr_set_iter_return( + dac->dela_state, args->dp); if (error) return error; }
@@ -545,6 +557,8 @@ xfs_attr_set_iter( if (error) return error; + trace_xfs_attr_set_iter_return( + dac->dela_state, args->dp); return -EAGAIN; }
@@ -581,6 +595,7 @@ xfs_attr_set_iter( * series */ dac->dela_state = XFS_DAS_FLIP_NFLAG; + trace_xfs_attr_set_iter_return(dac->dela_state, args->dp); return -EAGAIN; case XFS_DAS_FLIP_NFLAG:
@@ -601,6 +616,10 @@ xfs_attr_set_iter( case XFS_DAS_RM_NBLK: if (args->rmtblkno) { error = __xfs_attr_rmtval_remove(dac); + if (error == -EAGAIN) + trace_xfs_attr_set_iter_return( + dac->dela_state, args->dp); + if (error) return error; }
@@ -1227,6 +1246,8 @@ xfs_attr_node_addname( * this point. */ dac->flags |= XFS_DAC_DEFER_FINISH; + trace_xfs_attr_node_addname_return( + dac->dela_state, args->dp); return -EAGAIN; }
@@ -1407,6 +1428,9 @@ 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_attr_node_remove_rmt_return(dac->dela_state, + dac->da_args->dp); if (error) return error;
@@ -1526,6 +1550,8 @@ xfs_attr_node_removename_iter( dac->flags |= XFS_DAC_DEFER_FINISH; dac->dela_state = XFS_DAS_RM_SHRINK; + trace_xfs_attr_node_removename_iter_return( + dac->dela_state, args->dp); return -EAGAIN; }
@@ -1544,8 +1570,11 @@ xfs_attr_node_removename_iter( goto out; } - if (error == -EAGAIN) + if (error == -EAGAIN) { + trace_xfs_attr_node_removename_iter_return( + dac->dela_state, args->dp); return error; + } out: if (state) xfs_da_state_free(state);
diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c
index 628ab42..a1c9864e 100644
--- a/libxfs/xfs_attr_remote.c
+++ b/libxfs/xfs_attr_remote.c@@ -762,6 +762,7 @@ __xfs_attr_rmtval_remove( */ if (!done) { dac->flags |= XFS_DAC_DEFER_FINISH; + trace_xfs_attr_rmtval_remove_return(dac->dela_state, args->dp); return -EAGAIN; }
--
2.7.4