Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4d288bc authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: adds a tracepoint for f2fs_submit_read_bio 



This patch adds a tracepoint for f2fs_submit_read_bio.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
[Jaegeuk Kim: integrate tracepoints of f2fs_submit_read(_write)_bio]
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent 87b8872d

fs/f2fs/data.c

+2 −0
Original line number Diff line number Diff line
@@ -421,6 +421,8 @@ void f2fs_submit_read_bio(struct f2fs_sb_info *sbi, int rw) 
	if (!io->bio)

		return;



	trace_f2fs_submit_read_bio(sbi->sb, rw, META, io->bio);



	mutex_lock(&io->io_mutex);

	if (io->bio) {

		submit_bio(rw, io->bio);

fs/f2fs/segment.c

+3 −2
Original line number Diff line number Diff line
@@ -844,6 +844,9 @@ static void do_submit_bio(struct f2fs_sb_info *sbi, 


	if (type >= META_FLUSH)

		rw = WRITE_FLUSH_FUA;



	trace_f2fs_submit_write_bio(sbi->sb, rw, btype, io->bio);



	if (btype == META)

		rw |= REQ_META;
@@ -851,8 +854,6 @@ static void do_submit_bio(struct f2fs_sb_info *sbi, 
	p->sbi = sbi;

	io->bio->bi_end_io = f2fs_end_io_write;



	trace_f2fs_do_submit_bio(sbi->sb, btype, sync, io->bio);



	if (type == META_FLUSH) {

		DECLARE_COMPLETION_ONSTACK(wait);

		p->is_sync = true;

include/trace/events/f2fs.h

+32 −17
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
		{ WRITE, 		"WRITE" },			\

		{ WRITE_SYNC, 		"WRITE_SYNC" },			\

		{ WRITE_FLUSH,		"WRITE_FLUSH" },		\

		{ WRITE_FUA, 	"WRITE_FUA" })

		{ WRITE_FUA, 		"WRITE_FUA" },			\

		{ WRITE_FLUSH_FUA,	"WRITE_FLUSH_FUA" })



#define show_data_type(type)						\

	__print_symbolic(type,						\
@@ -598,36 +599,50 @@ TRACE_EVENT(f2fs_reserve_new_block, 
		__entry->ofs_in_node)

);



TRACE_EVENT(f2fs_do_submit_bio,

DECLARE_EVENT_CLASS(f2fs__submit_bio,



	TP_PROTO(struct super_block *sb, int btype, bool sync, struct bio *bio),

	TP_PROTO(struct super_block *sb, int rw, int type, struct bio *bio),



	TP_ARGS(sb, btype, sync, bio),

	TP_ARGS(sb, rw, type, bio),



	TP_STRUCT__entry(

		__field(dev_t,	dev)

		__field(int,	btype)

		__field(bool,	sync)

		__field(int,	rw)

		__field(int,	type)

		__field(sector_t,	sector)

		__field(unsigned int,	size)

	),



	TP_fast_assign(

		__entry->dev		= sb->s_dev;

		__entry->btype		= btype;

		__entry->sync		= sync;

		__entry->rw		= rw;

		__entry->type		= type;

		__entry->sector		= bio->bi_sector;

		__entry->size		= bio->bi_size;

	),



	TP_printk("dev = (%d,%d), type = %s, io = %s, sector = %lld, size = %u",

	TP_printk("dev = (%d,%d), %s, %s, sector = %lld, size = %u",

		show_dev(__entry),

		show_block_type(__entry->btype),

		__entry->sync ? "sync" : "no sync",

		show_bio_type(__entry->rw),

		show_block_type(__entry->type),

		(unsigned long long)__entry->sector,

		__entry->size)

);



DEFINE_EVENT(f2fs__submit_bio, f2fs_submit_write_bio,



	TP_PROTO(struct super_block *sb, int rw, int type, struct bio *bio),



	TP_ARGS(sb, rw, type, bio)

);



DEFINE_EVENT(f2fs__submit_bio, f2fs_submit_read_bio,



	TP_PROTO(struct super_block *sb, int rw, int type, struct bio *bio),



	TP_ARGS(sb, rw, type, bio)

);



DECLARE_EVENT_CLASS(f2fs__page,



	TP_PROTO(struct page *page, int type),