Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ext4: fix symbolic enum printing in trace output

Trace's macro __print_flags() produce raw event's decraration w/o knowing actual
flags value

cat /sys/kernel/debug/tracing/events/ext4/ext4_ext_map_blocks_exit/format
..
__print_flags(REC->mflags, "", { (1 << BH_New),

For that reason we have to explicitly define it via special macro TRACE_DEFINE_ENUM()
Also add missed EXTENT_STATUS_REFERENCED flag.

#Before patch
ext4:ext4_ext_map_blocks_exit: dev 253,0 ino 2 flags lblk 0 pblk 4177 len 1 mflags 0x20 ret 1
ext4:ext4_ext_map_blocks_exit: dev 253,0 ino 12 flags CREATE lblk 0 pblk 34304 len 1 mflags 0x60 ret 1

#With patch
ext4:ext4_ext_map_blocks_exit: dev 253,0 ino 2 flags lblk 0 pblk 4177 len 1 mflags M ret 1
ext4:ext4_ext_map_blocks_exit: dev 253,0 ino 12 flags CREATE lblk 0 pblk 34816 len 1 mflags NM ret 1

Signed-off-by: Dmitry Monakhov <dmonakhov@gmail.com>
Link: https://lore.kernel.org/r/20191114200147.1073-1-dmonakhov@gmail.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

authored by

Dmitry Monakhov and committed by
Theodore Ts'o
459c8074 57c32ea4

+18 -1
+18 -1
include/trace/events/ext4.h
··· 48 48 { EXT4_GET_BLOCKS_KEEP_SIZE, "KEEP_SIZE" }, \ 49 49 { EXT4_GET_BLOCKS_ZERO, "ZERO" }) 50 50 51 + /* 52 + * __print_flags() requires that all enum values be wrapped in the 53 + * TRACE_DEFINE_ENUM macro so that the enum value can be encoded in the ftrace 54 + * ring buffer. 55 + */ 56 + TRACE_DEFINE_ENUM(BH_New); 57 + TRACE_DEFINE_ENUM(BH_Mapped); 58 + TRACE_DEFINE_ENUM(BH_Unwritten); 59 + TRACE_DEFINE_ENUM(BH_Boundary); 60 + 51 61 #define show_mflags(flags) __print_flags(flags, "", \ 52 62 { EXT4_MAP_NEW, "N" }, \ 53 63 { EXT4_MAP_MAPPED, "M" }, \ ··· 72 62 { EXT4_FREE_BLOCKS_NOFREE_FIRST_CLUSTER,"1ST_CLUSTER" },\ 73 63 { EXT4_FREE_BLOCKS_NOFREE_LAST_CLUSTER, "LAST_CLUSTER" }) 74 64 65 + TRACE_DEFINE_ENUM(ES_WRITTEN_B); 66 + TRACE_DEFINE_ENUM(ES_UNWRITTEN_B); 67 + TRACE_DEFINE_ENUM(ES_DELAYED_B); 68 + TRACE_DEFINE_ENUM(ES_HOLE_B); 69 + TRACE_DEFINE_ENUM(ES_REFERENCED_B); 70 + 75 71 #define show_extent_status(status) __print_flags(status, "", \ 76 72 { EXTENT_STATUS_WRITTEN, "W" }, \ 77 73 { EXTENT_STATUS_UNWRITTEN, "U" }, \ 78 74 { EXTENT_STATUS_DELAYED, "D" }, \ 79 - { EXTENT_STATUS_HOLE, "H" }) 75 + { EXTENT_STATUS_HOLE, "H" }, \ 76 + { EXTENT_STATUS_REFERENCED, "R" }) 80 77 81 78 #define show_falloc_mode(mode) __print_flags(mode, "|", \ 82 79 { FALLOC_FL_KEEP_SIZE, "KEEP_SIZE"}, \