On Thu, Jun 16, 2016 at 06:21:36PM -0700, Darrick J. Wong wrote:
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/xfs_trace.h | 81
> +++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 79 insertions(+), 2 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index 28bd991..6daafaf 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -2415,8 +2415,6 @@ DEFINE_DEFER_PENDING_EVENT(xfs_defer_pending_cancel);
> DEFINE_DEFER_PENDING_EVENT(xfs_defer_pending_finish);
> DEFINE_DEFER_PENDING_EVENT(xfs_defer_pending_abort);
>
> -DEFINE_MAP_EXTENT_DEFERRED_EVENT(xfs_defer_map_extent);
> -
> #define DEFINE_BMAP_FREE_DEFERRED_EVENT DEFINE_PHYS_EXTENT_DEFERRED_EVENT
> DEFINE_BMAP_FREE_DEFERRED_EVENT(xfs_bmap_free_defer);
> DEFINE_BMAP_FREE_DEFERRED_EVENT(xfs_bmap_free_deferred);
> @@ -2463,6 +2461,36 @@ DEFINE_EVENT(xfs_rmap_class, name, \
> struct xfs_owner_info *oinfo), \
> TP_ARGS(mp, agno, agbno, len, unwritten, oinfo))
>
> +/* simple AG-based error/%ip tracepoint class */
> +DECLARE_EVENT_CLASS(xfs_ag_error_class,
> + TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, int error,
> + unsigned long caller_ip),
> + TP_ARGS(mp, agno, error, caller_ip),
> + TP_STRUCT__entry(
> + __field(dev_t, dev)
> + __field(xfs_agnumber_t, agno)
> + __field(int, error)
> + __field(unsigned long, caller_ip)
> + ),
> + TP_fast_assign(
> + __entry->dev = mp->m_super->s_dev;
> + __entry->agno = agno;
> + __entry->error = error;
> + __entry->caller_ip = caller_ip;
> + ),
> + TP_printk("dev %d:%d agno %u error %d caller %ps",
> + MAJOR(__entry->dev), MINOR(__entry->dev),
> + __entry->agno,
> + __entry->error,
> + (char *)__entry->caller_ip)
> +);
> +
> +#define DEFINE_AG_ERROR_EVENT(name) \
> +DEFINE_EVENT(xfs_ag_error_class, name, \
> + TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, int error, \
> + unsigned long caller_ip), \
> + TP_ARGS(mp, agno, error, caller_ip))
> +
> DEFINE_RMAP_EVENT(xfs_rmap_free_extent);
> DEFINE_RMAP_EVENT(xfs_rmap_free_extent_done);
> DEFINE_RMAP_EVENT(xfs_rmap_free_extent_error);
> @@ -2470,8 +2498,57 @@ DEFINE_RMAP_EVENT(xfs_rmap_alloc_extent);
> DEFINE_RMAP_EVENT(xfs_rmap_alloc_extent_done);
> DEFINE_RMAP_EVENT(xfs_rmap_alloc_extent_error);
>
> +DECLARE_EVENT_CLASS(xfs_rmapbt_class,
> + TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno,
> + xfs_agblock_t agbno, xfs_extlen_t len,
> + uint64_t owner, uint64_t offset, unsigned int flags),
> + TP_ARGS(mp, agno, agbno, len, owner, offset, flags),
> + TP_STRUCT__entry(
> + __field(dev_t, dev)
> + __field(xfs_agnumber_t, agno)
> + __field(xfs_agblock_t, agbno)
> + __field(xfs_extlen_t, len)
> + __field(uint64_t, owner)
> + __field(uint64_t, offset)
> + __field(unsigned int, flags)
> + ),
> + TP_fast_assign(
> + __entry->dev = mp->m_super->s_dev;
> + __entry->agno = agno;
> + __entry->agbno = agbno;
> + __entry->len = len;
> + __entry->owner = owner;
> + __entry->offset = offset;
> + __entry->flags = flags;
> + ),
> + TP_printk("dev %d:%d agno %u agbno %u len %u owner %lld offset %llu
> flags 0x%x",
> + MAJOR(__entry->dev), MINOR(__entry->dev),
> + __entry->agno,
> + __entry->agbno,
> + __entry->len,
> + __entry->owner,
> + __entry->offset,
> + __entry->flags)
> +);
> +#define DEFINE_RMAPBT_EVENT(name) \
> +DEFINE_EVENT(xfs_rmapbt_class, name, \
> + TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno, \
> + xfs_agblock_t agbno, xfs_extlen_t len, \
> + uint64_t owner, uint64_t offset, unsigned int flags), \
> + TP_ARGS(mp, agno, agbno, len, owner, offset, flags))
> +
> +#define DEFINE_RMAP_DEFERRED_EVENT DEFINE_MAP_EXTENT_DEFERRED_EVENT
> +DEFINE_RMAP_DEFERRED_EVENT(xfs_rmap_defer);
> +DEFINE_RMAP_DEFERRED_EVENT(xfs_rmap_deferred);
> +
> DEFINE_BUSY_EVENT(xfs_rmapbt_alloc_block);
> DEFINE_BUSY_EVENT(xfs_rmapbt_free_block);
> +DEFINE_RMAPBT_EVENT(xfs_rmapbt_update);
> +DEFINE_RMAPBT_EVENT(xfs_rmapbt_insert);
> +DEFINE_RMAPBT_EVENT(xfs_rmapbt_delete);
> +DEFINE_AG_ERROR_EVENT(xfs_rmapbt_insert_error);
> +DEFINE_AG_ERROR_EVENT(xfs_rmapbt_delete_error);
> +DEFINE_AG_ERROR_EVENT(xfs_rmapbt_update_error);
>
> #endif /* _TRACE_XFS_H */
>
>
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
|