btrfs: tracepoints: fix extent type symbolic name print (0840dd28) · Commits · 戴 / test

extent's type is an enum and this requires that the enum values be exported to user space so that user space tools can correctly map raw binary data to the symbolic name. Currently tracepoints using btrfs__file_extent_item_regular or btrfs__file_extent_item_inline result in the following output: fio-443 [002] 586.609450: btrfs_get_extent_show_fi_regular: f0c3bf8e-0174-4bcc-92aa-6c2d62430420:i root=5(FS_TREE) inode=258 size=2136457216 disk_isize=0 file extent range=[2126946304 2136457216] (num_bytes=9510912 ram_bytes=9510912 disk_bytenr=0 disk_num_bytes=0 extent_offset=0 type=0x1 compression=0 E.g type is 0x1 . With this patch applie the output is: <ommitted for brevity> disk_bytenr=141348864 disk_num_bytes=4096 extent_offset=0 type=REG compression=0 Signed-off-by:

Nikolay Borisov <nborisov@suse.com> Reviewed-by:

David Sterba <dsterba@suse.com> Signed-off-by:

David Sterba <dsterba@suse.com>

include/trace/events/btrfs.h

+18 −7

Original line number	Diff line number	Diff line
		@@ -67,11 +67,22 @@ TRACE_DEFINE_ENUM(COMMIT_TRANS);
		(obj >= BTRFS_ROOT_TREE_OBJECTID && \
		obj <= BTRFS_QUOTA_TREE_OBJECTID)) ? __show_root_type(obj) : "-"

		#define show_fi_type(type) \
		__print_symbolic(type, \
		{ BTRFS_FILE_EXTENT_INLINE, "INLINE" }, \
		{ BTRFS_FILE_EXTENT_REG, "REG" }, \
		{ BTRFS_FILE_EXTENT_PREALLOC, "PREALLOC"})
		#define FI_TYPES \
		EM( BTRFS_FILE_EXTENT_INLINE, "INLINE") \
		EM( BTRFS_FILE_EXTENT_REG, "REG") \
		EMe(BTRFS_FILE_EXTENT_PREALLOC, "PREALLOC")

		#undef EM
		#undef EMe
		#define EM(a, b) TRACE_DEFINE_ENUM(a);
		#define EMe(a, b) TRACE_DEFINE_ENUM(a);

		FI_TYPES

		#undef EM
		#undef EMe
		#define EM(a, b) {a, b},
		#define EMe(a, b) {a, b}

		#define show_qgroup_rsv_type(type) \
		__print_symbolic(type, \
		@@ -380,7 +391,7 @@ DECLARE_EVENT_CLASS(btrfs__file_extent_item_regular,
		__entry->disk_isize, __entry->extent_start,
		__entry->extent_end, __entry->num_bytes, __entry->ram_bytes,
		__entry->disk_bytenr, __entry->disk_num_bytes,
		__entry->extent_offset, show_fi_type(__entry->extent_type),
		__entry->extent_offset, __print_symbolic(__entry->extent_type, FI_TYPES),
		__entry->compression)
		);

		@@ -421,7 +432,7 @@ DECLARE_EVENT_CLASS(
		"extent_type=%s compression=%u",
		show_root_type(__entry->root_obj), __entry->ino, __entry->isize,
		__entry->disk_isize, __entry->extent_start,
		__entry->extent_end, show_fi_type(__entry->extent_type),
		__entry->extent_end, __print_symbolic(__entry->extent_type, FI_TYPES),
		__entry->compression)
		);

Admin message