On Tue, Aug 17, 2021 at 04:43:18PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@xxxxxxxxxx>
>
> Emit whichfork values as text strings in the ftrace output.
>
> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> ---
Reviewed-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
> fs/xfs/libxfs/xfs_types.h | 5 +++++
> fs/xfs/scrub/trace.h | 16 ++++++++--------
> fs/xfs/xfs_trace.h | 6 +++---
> 3 files changed, 16 insertions(+), 11 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_types.h b/fs/xfs/libxfs/xfs_types.h
> index 0870ef6f933d..b6da06b40989 100644
> --- a/fs/xfs/libxfs/xfs_types.h
> +++ b/fs/xfs/libxfs/xfs_types.h
> @@ -87,6 +87,11 @@ typedef void * xfs_failaddr_t;
> #define XFS_ATTR_FORK 1
> #define XFS_COW_FORK 2
>
> +#define XFS_WHICHFORK_STRINGS \
> + { XFS_DATA_FORK, "data" }, \
> + { XFS_ATTR_FORK, "attr" }, \
> + { XFS_COW_FORK, "cow" }
> +
> /*
> * Min numbers of data/attr fork btree root pointers.
> */
> diff --git a/fs/xfs/scrub/trace.h b/fs/xfs/scrub/trace.h
> index cb5a74028b63..36f86b1497f4 100644
> --- a/fs/xfs/scrub/trace.h
> +++ b/fs/xfs/scrub/trace.h
> @@ -176,10 +176,10 @@ TRACE_EVENT(xchk_file_op_error,
> __entry->error = error;
> __entry->ret_ip = ret_ip;
> ),
> - TP_printk("dev %d:%d ino 0x%llx fork %d type %s fileoff 0x%llx error %d ret_ip %pS",
> + TP_printk("dev %d:%d ino 0x%llx fork %s type %s fileoff 0x%llx error %d ret_ip %pS",
> MAJOR(__entry->dev), MINOR(__entry->dev),
> __entry->ino,
> - __entry->whichfork,
> + __print_symbolic(__entry->whichfork, XFS_WHICHFORK_STRINGS),
> __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS),
> __entry->offset,
> __entry->error,
> @@ -273,10 +273,10 @@ DECLARE_EVENT_CLASS(xchk_fblock_error_class,
> __entry->offset = offset;
> __entry->ret_ip = ret_ip;
> ),
> - TP_printk("dev %d:%d ino 0x%llx fork %d type %s fileoff 0x%llx ret_ip %pS",
> + TP_printk("dev %d:%d ino 0x%llx fork %s type %s fileoff 0x%llx ret_ip %pS",
> MAJOR(__entry->dev), MINOR(__entry->dev),
> __entry->ino,
> - __entry->whichfork,
> + __print_symbolic(__entry->whichfork, XFS_WHICHFORK_STRINGS),
> __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS),
> __entry->offset,
> __entry->ret_ip)
> @@ -381,10 +381,10 @@ TRACE_EVENT(xchk_ifork_btree_op_error,
> __entry->error = error;
> __entry->ret_ip = ret_ip;
> ),
> - TP_printk("dev %d:%d ino 0x%llx fork %d type %s btree %s level %d ptr %d agno 0x%x agbno 0x%x error %d ret_ip %pS",
> + TP_printk("dev %d:%d ino 0x%llx fork %s type %s btree %s level %d ptr %d agno 0x%x agbno 0x%x error %d ret_ip %pS",
> MAJOR(__entry->dev), MINOR(__entry->dev),
> __entry->ino,
> - __entry->whichfork,
> + __print_symbolic(__entry->whichfork, XFS_WHICHFORK_STRINGS),
> __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS),
> __print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS),
> __entry->level,
> @@ -460,10 +460,10 @@ TRACE_EVENT(xchk_ifork_btree_error,
> __entry->ptr = cur->bc_ptrs[level];
> __entry->ret_ip = ret_ip;
> ),
> - TP_printk("dev %d:%d ino 0x%llx fork %d type %s btree %s level %d ptr %d agno 0x%x agbno 0x%x ret_ip %pS",
> + TP_printk("dev %d:%d ino 0x%llx fork %s type %s btree %s level %d ptr %d agno 0x%x agbno 0x%x ret_ip %pS",
> MAJOR(__entry->dev), MINOR(__entry->dev),
> __entry->ino,
> - __entry->whichfork,
> + __print_symbolic(__entry->whichfork, XFS_WHICHFORK_STRINGS),
> __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS),
> __print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS),
> __entry->level,
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index 29bf5fbfa71b..474fdaffdccf 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -1440,7 +1440,7 @@ DECLARE_EVENT_CLASS(xfs_imap_class,
> __entry->size,
> __entry->offset,
> __entry->count,
> - __entry->whichfork == XFS_COW_FORK ? "cow" : "data",
> + __print_symbolic(__entry->whichfork, XFS_WHICHFORK_STRINGS),
> __entry->startoff,
> (int64_t)__entry->startblock,
> __entry->blockcount)
> @@ -2604,7 +2604,7 @@ DECLARE_EVENT_CLASS(xfs_map_extent_deferred_class,
> __entry->agno,
> __entry->agbno,
> __entry->ino,
> - __entry->whichfork == XFS_ATTR_FORK ? "attr" : "data",
> + __print_symbolic(__entry->whichfork, XFS_WHICHFORK_STRINGS),
> __entry->l_loff,
> __entry->l_len,
> __entry->l_state)
> @@ -3851,7 +3851,7 @@ TRACE_EVENT(xfs_btree_commit_ifakeroot,
> __print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS),
> __entry->agno,
> __entry->agino,
> - __entry->whichfork == XFS_ATTR_FORK ? "attr" : "data",
> + __print_symbolic(__entry->whichfork, XFS_WHICHFORK_STRINGS),
> __entry->levels,
> __entry->blocks)
> )
>
--
Carlos
