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

f2fs: clean up bio cache trace

Trace info related to bio cache operation is out of format, clean up it.

Before:
<...>-28308 [002] .... 4781.052703: f2fs_submit_write_bio: dev = (251,1), WRITEWRITE_SYNC ^H, DATA, sector = 271424, size = 126976
<...>-28308 [002] .... 4781.052820: f2fs_submit_page_mbio: dev = (251,1), ino = 103, page_index = 0x1f, oldaddr = 0xffffffff, newaddr = 0x84a7 rw = WRITEWRITE_SYNCi ^H, type = DATA
kworker/u8:2-29988 [001] .... 5549.293877: f2fs_submit_page_mbio: dev = (251,1), ino = 91, page_index = 0xd, oldaddr = 0xffffffff, newaddr = 0x782f rw = WRITE0x0i ^H type = DATA

After:
kworker/u8:2-8678 [000] .... 7945.124459: f2fs_submit_write_bio: dev = (251,1), rw = WRITE_SYNC, DATA, sector = 74080, size = 53248
kworker/u8:2-8678 [000] .... 7945.124551: f2fs_submit_page_mbio: dev = (251,1), ino = 11, page_index = 0xec, oldaddr = 0xffffffff, newaddr = 0x243a, rw = WRITE, type = DATA

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

authored by

Chao Yu and committed by
Jaegeuk Kim
44819a76 3e025740

+7 -11
+7 -11
include/trace/events/f2fs.h
··· 58 58 #define F2FS_BIO_FLAG_MASK(t) (t & (REQ_RAHEAD | WRITE_FLUSH_FUA)) 59 59 #define F2FS_BIO_EXTRA_MASK(t) (t & (REQ_META | REQ_PRIO)) 60 60 61 - #define show_bio_type(op, op_flags) show_bio_op(op), \ 62 - show_bio_op_flags(op_flags), show_bio_extra(op_flags) 63 - 64 - #define show_bio_op(op) \ 65 - __print_symbolic(op, \ 66 - { READ, "READ" }, \ 67 - { WRITE, "WRITE" }) 61 + #define show_bio_type(op_flags) show_bio_op_flags(op_flags), \ 62 + show_bio_extra(op_flags) 68 63 69 64 #define show_bio_op_flags(flags) \ 70 65 __print_symbolic(F2FS_BIO_FLAG_MASK(flags), \ 66 + { 0, "WRITE" }, \ 71 67 { REQ_RAHEAD, "READAHEAD" }, \ 72 68 { READ_SYNC, "READ_SYNC" }, \ 73 69 { WRITE_SYNC, "WRITE_SYNC" }, \ ··· 750 754 ), 751 755 752 756 TP_printk("dev = (%d,%d), ino = %lu, page_index = 0x%lx, " 753 - "oldaddr = 0x%llx, newaddr = 0x%llx rw = %s%si%s, type = %s", 757 + "oldaddr = 0x%llx, newaddr = 0x%llx, rw = %s%s, type = %s", 754 758 show_dev_ino(__entry), 755 759 (unsigned long)__entry->index, 756 760 (unsigned long long)__entry->old_blkaddr, 757 761 (unsigned long long)__entry->new_blkaddr, 758 - show_bio_type(__entry->op, __entry->op_flags), 762 + show_bio_type(__entry->op_flags), 759 763 show_block_type(__entry->type)) 760 764 ); 761 765 ··· 802 806 __entry->size = bio->bi_iter.bi_size; 803 807 ), 804 808 805 - TP_printk("dev = (%d,%d), %s%s%s, %s, sector = %lld, size = %u", 809 + TP_printk("dev = (%d,%d), rw = %s%s, %s, sector = %lld, size = %u", 806 810 show_dev(__entry), 807 - show_bio_type(__entry->op, __entry->op_flags), 811 + show_bio_type(__entry->op_flags), 808 812 show_block_type(__entry->type), 809 813 (unsigned long long)__entry->sector, 810 814 __entry->size)