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

bcachefs: trace_move_extent_start_fail() now includes errcode 



Renamed from trace_move_extent_alloc_mem_fail, because there are other
reasons we colud fail (disk space allocation failure).

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

fs/bcachefs/bcachefs_format.h

+1 −1
Original line number Diff line number Diff line
@@ -1532,7 +1532,7 @@ struct bch_sb_field_disk_groups { 
	x(move_extent_write,				36)	\

	x(move_extent_finish,				37)	\

	x(move_extent_fail,				38)	\

	x(move_extent_alloc_mem_fail,			39)	\

	x(move_extent_start_fail,			39)	\

	x(copygc,					40)	\

	x(copygc_wait,					41)	\

	x(gc_gens_end,					42)	\

fs/bcachefs/move.c

+10 −13
Original line number Diff line number Diff line
@@ -49,17 +49,6 @@ static void trace_move_extent_read2(struct bch_fs *c, struct bkey_s_c k) 
	}

}



static void trace_move_extent_alloc_mem_fail2(struct bch_fs *c, struct bkey_s_c k)

{

	if (trace_move_extent_alloc_mem_fail_enabled()) {

		struct printbuf buf = PRINTBUF;



		bch2_bkey_val_to_text(&buf, c, k);

		trace_move_extent_alloc_mem_fail(c, buf.buf);

		printbuf_exit(&buf);

	}

}



struct moving_io {

	struct list_head		read_list;

	struct list_head		io_list;
@@ -349,8 +338,16 @@ int bch2_move_extent(struct moving_context *ctxt, 
	if (ret == -BCH_ERR_data_update_done)

		return 0;



	this_cpu_inc(c->counters[BCH_COUNTER_move_extent_alloc_mem_fail]);

	trace_move_extent_alloc_mem_fail2(c, k);

	this_cpu_inc(c->counters[BCH_COUNTER_move_extent_start_fail]);

	if (trace_move_extent_start_fail_enabled()) {

		struct printbuf buf = PRINTBUF;



		bch2_bkey_val_to_text(&buf, c, k);

		prt_str(&buf, ": ");

		prt_str(&buf, bch2_err_str(ret));

		trace_move_extent_start_fail(c, buf.buf);

		printbuf_exit(&buf);

	}

	return ret;

}

fs/bcachefs/trace.h

+3 −3
Original line number Diff line number Diff line
@@ -754,9 +754,9 @@ TRACE_EVENT(move_extent_fail, 
	TP_printk("%d:%d %s", MAJOR(__entry->dev), MINOR(__entry->dev), __get_str(msg))

);



DEFINE_EVENT(bkey, move_extent_alloc_mem_fail,

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

	TP_ARGS(c, k)

DEFINE_EVENT(bkey, move_extent_start_fail,

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

	TP_ARGS(c, str)

);



TRACE_EVENT(move_data,