Commit 6d77ce4a authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Better printing of inconsistency errors 



Build up and emit the error message for an inconsistency error all at
once, instead of spread over multiple printk calls, so they're not
jumbled in the dmesg log.

Also, add better indenting.

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

fs/bcachefs/backpointers.c

+7 −8
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ static noinline int backpointer_mod_err(struct btree_trans *trans, 
{

	struct bch_fs *c = trans->c;

	struct printbuf buf = PRINTBUF;

	int ret = 0;



	if (insert) {

		prt_printf(&buf, "existing backpointer found when inserting ");
@@ -125,17 +126,15 @@ static noinline int backpointer_mod_err(struct btree_trans *trans, 


		prt_printf(&buf, "for ");

		bch2_bkey_val_to_text(&buf, c, orig_k);



		bch_err(c, "%s", buf.buf);

	}



	printbuf_exit(&buf);

	if (c->curr_recovery_pass > BCH_RECOVERY_PASS_check_extents_to_backpointers &&

	    __bch2_inconsistent_error(c, &buf))

		ret = -BCH_ERR_erofs_unfixed_errors;



	if (c->curr_recovery_pass > BCH_RECOVERY_PASS_check_extents_to_backpointers) {

		return bch2_inconsistent_error(c) ? BCH_ERR_erofs_unfixed_errors : 0;

	} else {

		return 0;

	}

	bch_err(c, "%s", buf.buf);

	printbuf_exit(&buf);

	return ret;

}



int bch2_bucket_backpointer_mod_nowritebuffer(struct btree_trans *trans,

fs/bcachefs/btree_io.c

+31 −28
Original line number Diff line number Diff line
@@ -548,32 +548,39 @@ static int __btree_err(int ret, 
		       enum bch_sb_error_id err_type,

		       const char *fmt, ...)

{

	struct printbuf out = PRINTBUF;

	bool silent = c->curr_recovery_pass == BCH_RECOVERY_PASS_scan_for_btree_nodes;

	va_list args;



	if (!have_retry && ret == -BCH_ERR_btree_node_read_err_want_retry)

		ret = -BCH_ERR_btree_node_read_err_fixable;

	if (!have_retry && ret == -BCH_ERR_btree_node_read_err_must_retry)

		ret = -BCH_ERR_btree_node_read_err_bad_node;



	if (!silent && ret != -BCH_ERR_btree_node_read_err_fixable)

		bch2_sb_error_count(c, err_type);



	struct printbuf out = PRINTBUF;

	if (write != WRITE && ret != -BCH_ERR_btree_node_read_err_fixable) {

		printbuf_indent_add_nextline(&out, 2);

#ifdef BCACHEFS_LOG_PREFIX

		prt_printf(&out, bch2_log_msg(c, ""));

#endif

	}



	btree_err_msg(&out, c, ca, b, i, k, b->written, write);



	va_list args;

	va_start(args, fmt);

	prt_vprintf(&out, fmt, args);

	va_end(args);



	if (write == WRITE) {

		bch2_print_string_as_lines(KERN_ERR, out.buf);

		ret = c->opts.errors == BCH_ON_ERROR_continue

			? 0

			: -BCH_ERR_fsck_errors_not_fixed;

		goto out;

		prt_str(&out, ", ");

		ret = __bch2_inconsistent_error(c, &out)

			? -BCH_ERR_fsck_errors_not_fixed

			: 0;

		silent = false;

	}



	if (!have_retry && ret == -BCH_ERR_btree_node_read_err_want_retry)

		ret = -BCH_ERR_btree_node_read_err_fixable;

	if (!have_retry && ret == -BCH_ERR_btree_node_read_err_must_retry)

		ret = -BCH_ERR_btree_node_read_err_bad_node;



	if (!silent && ret != -BCH_ERR_btree_node_read_err_fixable)

		bch2_sb_error_count(c, err_type);



	switch (ret) {

	case -BCH_ERR_btree_node_read_err_fixable:

		ret = !silent
@@ -583,25 +590,21 @@ static int __btree_err(int ret, 
		    ret != -BCH_ERR_fsck_ignore)

			goto fsck_err;

		ret = -BCH_ERR_fsck_fix;

		break;

	case -BCH_ERR_btree_node_read_err_want_retry:

	case -BCH_ERR_btree_node_read_err_must_retry:

		if (!silent)

			bch2_print_string_as_lines(KERN_ERR, out.buf);

		break;

		goto out;

	case -BCH_ERR_btree_node_read_err_bad_node:

		if (!silent)

			bch2_print_string_as_lines(KERN_ERR, out.buf);

		ret = bch2_topology_error(c);

		prt_str(&out, ", ");

		ret = __bch2_topology_error(c, &out);

		if (ret)

			silent = false;

		break;

	case -BCH_ERR_btree_node_read_err_incompatible:

		if (!silent)

			bch2_print_string_as_lines(KERN_ERR, out.buf);

		ret = -BCH_ERR_fsck_errors_not_fixed;

		silent = false;

		break;

	default:

		BUG();

	}



	if (!silent)

		bch2_print_string_as_lines(KERN_ERR, out.buf);

out:

fsck_err:

	printbuf_exit(&out);

fs/bcachefs/btree_iter.c

+0 −10
Original line number Diff line number Diff line
@@ -1495,16 +1495,6 @@ void bch2_trans_updates_to_text(struct printbuf *buf, struct btree_trans *trans) 
	printbuf_indent_sub(buf, 2);

}



noinline __cold

void bch2_dump_trans_updates(struct btree_trans *trans)

{

	struct printbuf buf = PRINTBUF;



	bch2_trans_updates_to_text(&buf, trans);

	bch2_print_str(trans->c, buf.buf);

	printbuf_exit(&buf);

}



static void bch2_btree_path_to_text_short(struct printbuf *out, struct btree_trans *trans, btree_path_idx_t path_idx)

{

	struct btree_path *path = trans->paths + path_idx;

fs/bcachefs/btree_iter.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
void bch2_trans_updates_to_text(struct printbuf *, struct btree_trans *);

void bch2_btree_path_to_text(struct printbuf *, struct btree_trans *, btree_path_idx_t);

void bch2_trans_paths_to_text(struct printbuf *, struct btree_trans *);

void bch2_dump_trans_updates(struct btree_trans *);

void bch2_dump_trans_paths_updates(struct btree_trans *);



static inline int __bkey_err(const struct bkey *k)

fs/bcachefs/btree_node_scan.c

+6 −4
Original line number Diff line number Diff line
@@ -579,10 +579,12 @@ int bch2_get_scanned_nodes(struct bch_fs *c, enum btree_id btree, 


		found_btree_node_to_key(&tmp.k, &n);



		if (c->opts.verbose) {

			struct printbuf buf = PRINTBUF;

			bch2_bkey_val_to_text(&buf, c, bkey_i_to_s_c(&tmp.k));

			bch_verbose(c, "%s(): recovering %s", __func__, buf.buf);

			printbuf_exit(&buf);

		}



		BUG_ON(bch2_bkey_validate(c, bkey_i_to_s_c(&tmp.k),

					  (struct bkey_validate_context) {