Commit 554b5125 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: add submit_bio tracepoint 



This patch adds final submit_bio() tracepoint.

Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent d621e6b3

fs/f2fs/data.c

+8 −4
Original line number Diff line number Diff line
@@ -175,6 +175,10 @@ static inline void __submit_bio(struct f2fs_sb_info *sbi, 
			current->plug && (type == DATA || type == NODE))

			blk_finish_plug(current->plug);

	}

	if (is_read_io(bio_op(bio)))

		trace_f2fs_submit_read_bio(sbi->sb, type, bio);

	else

		trace_f2fs_submit_write_bio(sbi->sb, type, bio);

	submit_bio(bio);

}
@@ -185,12 +189,12 @@ static void __submit_merged_bio(struct f2fs_bio_info *io) 
	if (!io->bio)

		return;



	bio_set_op_attrs(io->bio, fio->op, fio->op_flags);



	if (is_read_io(fio->op))

		trace_f2fs_submit_read_bio(io->sbi->sb, fio, io->bio);

		trace_f2fs_prepare_read_bio(io->sbi->sb, fio->type, io->bio);

	else

		trace_f2fs_submit_write_bio(io->sbi->sb, fio, io->bio);



	bio_set_op_attrs(io->bio, fio->op, fio->op_flags);

		trace_f2fs_prepare_write_bio(io->sbi->sb, fio->type, io->bio);



	__submit_bio(io->sbi, io->bio, fio->type);

	io->bio = NULL;

include/trace/events/f2fs.h

+30 −15
Original line number Diff line number Diff line
@@ -784,12 +784,11 @@ DEFINE_EVENT_CONDITION(f2fs__submit_page_bio, f2fs_submit_page_mbio, 
	TP_CONDITION(page->mapping)

);



DECLARE_EVENT_CLASS(f2fs__submit_bio,

DECLARE_EVENT_CLASS(f2fs__bio,



	TP_PROTO(struct super_block *sb, struct f2fs_io_info *fio,

						struct bio *bio),

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



	TP_ARGS(sb, fio, bio),

	TP_ARGS(sb, type, bio),



	TP_STRUCT__entry(

		__field(dev_t,	dev)
@@ -802,9 +801,9 @@ DECLARE_EVENT_CLASS(f2fs__submit_bio, 


	TP_fast_assign(

		__entry->dev		= sb->s_dev;

		__entry->op		= fio->op;

		__entry->op_flags	= fio->op_flags;

		__entry->type		= fio->type;

		__entry->op		= bio_op(bio);

		__entry->op_flags	= bio->bi_opf;

		__entry->type		= type;

		__entry->sector		= bio->bi_iter.bi_sector;

		__entry->size		= bio->bi_iter.bi_size;

	),
@@ -817,22 +816,38 @@ DECLARE_EVENT_CLASS(f2fs__submit_bio, 
		__entry->size)

);



DEFINE_EVENT_CONDITION(f2fs__submit_bio, f2fs_submit_write_bio,

DEFINE_EVENT_CONDITION(f2fs__bio, f2fs_prepare_write_bio,



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



	TP_ARGS(sb, type, bio),



	TP_CONDITION(bio)

);



DEFINE_EVENT_CONDITION(f2fs__bio, f2fs_prepare_read_bio,



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



	TP_ARGS(sb, type, bio),



	TP_CONDITION(bio)

);



DEFINE_EVENT_CONDITION(f2fs__bio, f2fs_submit_read_bio,



	TP_PROTO(struct super_block *sb, struct f2fs_io_info *fio,

							struct bio *bio),

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



	TP_ARGS(sb, fio, bio),

	TP_ARGS(sb, type, bio),



	TP_CONDITION(bio)

);



DEFINE_EVENT_CONDITION(f2fs__submit_bio, f2fs_submit_read_bio,

DEFINE_EVENT_CONDITION(f2fs__bio, f2fs_submit_write_bio,



	TP_PROTO(struct super_block *sb, struct f2fs_io_info *fio,

							struct bio *bio),

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



	TP_ARGS(sb, fio, bio),

	TP_ARGS(sb, type, bio),



	TP_CONDITION(bio)

);