iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Re-add move_extent_write tracepoint

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

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-01-15 15:04:40 -05:00
parent d92b83f592
commit fa3185af43
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/bcachefs/move.c
View File

@ -111,6 +111,15 @@ static void move_write(struct moving_io *io)
return; 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); closure_get(&io->write.ctxt->cl);
atomic_add(io->write_sectors, &io->write.ctxt->write_sectors); atomic_add(io->write_sectors, &io->write.ctxt->write_sectors);
atomic_inc(&io->write.ctxt->write_ios); atomic_inc(&io->write.ctxt->write_ios);

34
fs/bcachefs/trace.h
View File

@ -827,40 +827,28 @@ TRACE_EVENT(bucket_evacuate,
); );
DEFINE_EVENT(fs_str, move_extent, DEFINE_EVENT(fs_str, move_extent,
TP_PROTO(struct bch_fs *c, const char *k), TP_PROTO(struct bch_fs *c, const char *str),
TP_ARGS(c, k) TP_ARGS(c, str)
); );
DEFINE_EVENT(fs_str, move_extent_read, DEFINE_EVENT(fs_str, move_extent_read,
TP_PROTO(struct bch_fs *c, const char *k), TP_PROTO(struct bch_fs *c, const char *str),
TP_ARGS(c, k) TP_ARGS(c, str)
); );
DEFINE_EVENT(fs_str, move_extent_write, DEFINE_EVENT(fs_str, move_extent_write,
TP_PROTO(struct bch_fs *c, const char *k), TP_PROTO(struct bch_fs *c, const char *str),
TP_ARGS(c, k) TP_ARGS(c, str)
); );
DEFINE_EVENT(fs_str, move_extent_finish, DEFINE_EVENT(fs_str, move_extent_finish,
TP_PROTO(struct bch_fs *c, const char *k), TP_PROTO(struct bch_fs *c, const char *str),
TP_ARGS(c, k) TP_ARGS(c, str)
); );
TRACE_EVENT(move_extent_fail, DEFINE_EVENT(fs_str, move_extent_fail,
TP_PROTO(struct bch_fs *c, const char *msg), TP_PROTO(struct bch_fs *c, const char *str),
TP_ARGS(c, msg), TP_ARGS(c, str)
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_start_fail, DEFINE_EVENT(fs_str, move_extent_start_fail,