Commit fa3185af authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Re-add move_extent_write tracepoint 



It appears this was accidentally deleted at some point - also, do a bit
of cleanup.

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent d92b83f5

fs/bcachefs/move.c

+9 −0
Original line number Diff line number Diff line
@@ -111,6 +111,15 @@ static void move_write(struct moving_io *io) 
		return;

	}



	if (trace_move_extent_write_enabled()) {

		struct bch_fs *c = io->write.op.c;

		struct printbuf buf = PRINTBUF;



		bch2_bkey_val_to_text(&buf, c, bkey_i_to_s_c(io->write.k.k));

		trace_move_extent_write(c, buf.buf);

		printbuf_exit(&buf);

	}



	closure_get(&io->write.ctxt->cl);

	atomic_add(io->write_sectors, &io->write.ctxt->write_sectors);

	atomic_inc(&io->write.ctxt->write_ios);

fs/bcachefs/trace.h

+11 −23
Original line number Diff line number Diff line
@@ -827,40 +827,28 @@ TRACE_EVENT(bucket_evacuate, 
);



DEFINE_EVENT(fs_str, move_extent,

	TP_PROTO(struct bch_fs *c, const char *k),

	TP_ARGS(c, k)

	TP_PROTO(struct bch_fs *c, const char *str),

	TP_ARGS(c, str)

);



DEFINE_EVENT(fs_str, move_extent_read,

	TP_PROTO(struct bch_fs *c, const char *k),

	TP_ARGS(c, k)

	TP_PROTO(struct bch_fs *c, const char *str),

	TP_ARGS(c, str)

);



DEFINE_EVENT(fs_str, move_extent_write,

	TP_PROTO(struct bch_fs *c, const char *k),

	TP_ARGS(c, k)

	TP_PROTO(struct bch_fs *c, const char *str),

	TP_ARGS(c, str)

);



DEFINE_EVENT(fs_str, move_extent_finish,

	TP_PROTO(struct bch_fs *c, const char *k),

	TP_ARGS(c, k)

	TP_PROTO(struct bch_fs *c, const char *str),

	TP_ARGS(c, str)

);



TRACE_EVENT(move_extent_fail,

	TP_PROTO(struct bch_fs *c, const char *msg),

	TP_ARGS(c, msg),



	TP_STRUCT__entry(

		__field(dev_t,		dev			)

		__string(msg,		msg			)

	),



	TP_fast_assign(

		__entry->dev		= c->dev;

		__assign_str(msg, msg);

	),



	TP_printk("%d:%d %s", MAJOR(__entry->dev), MINOR(__entry->dev), __get_str(msg))

DEFINE_EVENT(fs_str, move_extent_fail,

	TP_PROTO(struct bch_fs *c, const char *str),

	TP_ARGS(c, str)

);



DEFINE_EVENT(fs_str, move_extent_start_fail,