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

bcachefs: helpers for printing data types 



We need bounds checking since new versions may introduce new data types.

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

fs/bcachefs/alloc_background.c

+3 −6
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ int bch2_alloc_v4_invalid(struct bch_fs *c, struct bkey_s_c k, 
		bkey_fsck_err_on(!bch2_bucket_sectors_dirty(*a.v),

				 c, err, alloc_key_dirty_sectors_0,

				 "data_type %s but dirty_sectors==0",

				 bch2_data_types[a.v->data_type]);

				 bch2_data_type_str(a.v->data_type));

		break;

	case BCH_DATA_cached:

		bkey_fsck_err_on(!a.v->cached_sectors ||
@@ -325,11 +325,8 @@ void bch2_alloc_to_text(struct printbuf *out, struct bch_fs *c, struct bkey_s_c 
	prt_newline(out);

	printbuf_indent_add(out, 2);



	prt_printf(out, "gen %u oldest_gen %u data_type %s",

	       a->gen, a->oldest_gen,

	       a->data_type < BCH_DATA_NR

	       ? bch2_data_types[a->data_type]

	       : "(invalid data type)");

	prt_printf(out, "gen %u oldest_gen %u data_type ", a->gen, a->oldest_gen);

	bch2_prt_data_type(out, a->data_type);

	prt_newline(out);

	prt_printf(out, "journal_seq       %llu",	a->journal_seq);

	prt_newline(out);

fs/bcachefs/alloc_foreground.c

+4 −3
Original line number Diff line number Diff line
@@ -1525,10 +1525,11 @@ static void bch2_open_bucket_to_text(struct printbuf *out, struct bch_fs *c, str 
	unsigned data_type = ob->data_type;

	barrier(); /* READ_ONCE() doesn't work on bitfields */



	prt_printf(out, "%zu ref %u %s %u:%llu gen %u allocated %u/%u",

	prt_printf(out, "%zu ref %u ",

		   ob - c->open_buckets,

		   atomic_read(&ob->pin),

		   data_type < BCH_DATA_NR ? bch2_data_types[data_type] : "invalid data type",

		   atomic_read(&ob->pin));

	bch2_prt_data_type(out, data_type);

	prt_printf(out, " %u:%llu gen %u allocated %u/%u",

		   ob->dev, ob->bucket, ob->gen,

		   ca->mi.bucket_size - ob->sectors_free, ca->mi.bucket_size);

	if (ob->ec)

fs/bcachefs/btree_gc.c

+12 −12
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static int bch2_check_fix_ptrs(struct btree_trans *trans, enum btree_id btree_id 
			      "bucket %u:%zu data type %s ptr gen %u missing in alloc btree\n"

			      "while marking %s",

			      p.ptr.dev, PTR_BUCKET_NR(ca, &p.ptr),

			      bch2_data_types[ptr_data_type(k->k, &p.ptr)],

			      bch2_data_type_str(ptr_data_type(k->k, &p.ptr)),

			      p.ptr.gen,

			      (printbuf_reset(&buf),

			       bch2_bkey_val_to_text(&buf, c, *k), buf.buf)))) {
@@ -615,7 +615,7 @@ static int bch2_check_fix_ptrs(struct btree_trans *trans, enum btree_id btree_id 
			      "bucket %u:%zu data type %s ptr gen in the future: %u > %u\n"

			      "while marking %s",

			      p.ptr.dev, PTR_BUCKET_NR(ca, &p.ptr),

			      bch2_data_types[ptr_data_type(k->k, &p.ptr)],

			      bch2_data_type_str(ptr_data_type(k->k, &p.ptr)),

			      p.ptr.gen, g->gen,

			      (printbuf_reset(&buf),

			       bch2_bkey_val_to_text(&buf, c, *k), buf.buf)))) {
@@ -637,7 +637,7 @@ static int bch2_check_fix_ptrs(struct btree_trans *trans, enum btree_id btree_id 
			      "bucket %u:%zu gen %u data type %s: ptr gen %u too stale\n"

			      "while marking %s",

			      p.ptr.dev, PTR_BUCKET_NR(ca, &p.ptr), g->gen,

			      bch2_data_types[ptr_data_type(k->k, &p.ptr)],

			      bch2_data_type_str(ptr_data_type(k->k, &p.ptr)),

			      p.ptr.gen,

			      (printbuf_reset(&buf),

			       bch2_bkey_val_to_text(&buf, c, *k), buf.buf))))
@@ -649,7 +649,7 @@ static int bch2_check_fix_ptrs(struct btree_trans *trans, enum btree_id btree_id 
			      "bucket %u:%zu data type %s stale dirty ptr: %u < %u\n"

			      "while marking %s",

			      p.ptr.dev, PTR_BUCKET_NR(ca, &p.ptr),

			      bch2_data_types[ptr_data_type(k->k, &p.ptr)],

			      bch2_data_type_str(ptr_data_type(k->k, &p.ptr)),

			      p.ptr.gen, g->gen,

			      (printbuf_reset(&buf),

			       bch2_bkey_val_to_text(&buf, c, *k), buf.buf))))
@@ -664,8 +664,8 @@ static int bch2_check_fix_ptrs(struct btree_trans *trans, enum btree_id btree_id 
				"bucket %u:%zu different types of data in same bucket: %s, %s\n"

				"while marking %s",

				p.ptr.dev, PTR_BUCKET_NR(ca, &p.ptr),

				bch2_data_types[g->data_type],

				bch2_data_types[data_type],

				bch2_data_type_str(g->data_type),

				bch2_data_type_str(data_type),

				(printbuf_reset(&buf),

				 bch2_bkey_val_to_text(&buf, c, *k), buf.buf))) {

			if (data_type == BCH_DATA_btree) {
@@ -1238,11 +1238,11 @@ static int bch2_gc_done(struct bch_fs *c, 


		for (i = 0; i < BCH_DATA_NR; i++) {

			copy_dev_field(dev_usage_buckets_wrong,

				       d[i].buckets,	"%s buckets", bch2_data_types[i]);

				       d[i].buckets,	"%s buckets", bch2_data_type_str(i));

			copy_dev_field(dev_usage_sectors_wrong,

				       d[i].sectors,	"%s sectors", bch2_data_types[i]);

				       d[i].sectors,	"%s sectors", bch2_data_type_str(i));

			copy_dev_field(dev_usage_fragmented_wrong,

				       d[i].fragmented,	"%s fragmented", bch2_data_types[i]);

				       d[i].fragmented,	"%s fragmented", bch2_data_type_str(i));

		}

	}
@@ -1417,8 +1417,8 @@ static int bch2_alloc_write_key(struct btree_trans *trans, 
			": got %s, should be %s",

			iter->pos.inode, iter->pos.offset,

			gc.gen,

			bch2_data_types[new.data_type],

			bch2_data_types[gc.data_type]))

			bch2_data_type_str(new.data_type),

			bch2_data_type_str(gc.data_type)))

		new.data_type = gc.data_type;



#define copy_bucket_field(_errtype, _f)					\
@@ -1428,7 +1428,7 @@ static int bch2_alloc_write_key(struct btree_trans *trans, 
			": got %u, should be %u",			\

			iter->pos.inode, iter->pos.offset,		\

			gc.gen,						\

			bch2_data_types[gc.data_type],			\

			bch2_data_type_str(gc.data_type),		\

			new._f, gc._f))					\

		new._f = gc._f;						\

fs/bcachefs/buckets.c

+13 −13
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ void bch2_dev_usage_to_text(struct printbuf *out, struct bch_dev_usage *usage) 
	prt_newline(out);



	for (unsigned i = 0; i < BCH_DATA_NR; i++) {

		prt_str(out, bch2_data_types[i]);

		bch2_prt_data_type(out, i);

		prt_tab(out);

		prt_u64(out, usage->d[i].buckets);

		prt_tab_rjust(out);
@@ -523,8 +523,8 @@ int bch2_mark_metadata_bucket(struct bch_fs *c, struct bch_dev *ca, 
	if (bch2_fs_inconsistent_on(g->data_type &&

			g->data_type != data_type, c,

			"different types of data in same bucket: %s, %s",

			bch2_data_types[g->data_type],

			bch2_data_types[data_type])) {

			bch2_data_type_str(g->data_type),

			bch2_data_type_str(data_type))) {

		ret = -EIO;

		goto err;

	}
@@ -532,7 +532,7 @@ int bch2_mark_metadata_bucket(struct bch_fs *c, struct bch_dev *ca, 
	if (bch2_fs_inconsistent_on((u64) g->dirty_sectors + sectors > ca->mi.bucket_size, c,

			"bucket %u:%zu gen %u data type %s sector count overflow: %u + %u > bucket size",

			ca->dev_idx, b, g->gen,

			bch2_data_types[g->data_type ?: data_type],

			bch2_data_type_str(g->data_type ?: data_type),

			g->dirty_sectors, sectors)) {

		ret = -EIO;

		goto err;
@@ -575,7 +575,7 @@ int bch2_check_bucket_ref(struct btree_trans *trans, 
			"bucket %u:%zu gen %u data type %s: ptr gen %u newer than bucket gen\n"

			"while marking %s",

			ptr->dev, bucket_nr, b_gen,

			bch2_data_types[bucket_data_type ?: ptr_data_type],

			bch2_data_type_str(bucket_data_type ?: ptr_data_type),

			ptr->gen,

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

		ret = -EIO;
@@ -588,7 +588,7 @@ int bch2_check_bucket_ref(struct btree_trans *trans, 
			"bucket %u:%zu gen %u data type %s: ptr gen %u too stale\n"

			"while marking %s",

			ptr->dev, bucket_nr, b_gen,

			bch2_data_types[bucket_data_type ?: ptr_data_type],

			bch2_data_type_str(bucket_data_type ?: ptr_data_type),

			ptr->gen,

			(printbuf_reset(&buf),

			 bch2_bkey_val_to_text(&buf, c, k), buf.buf));
@@ -603,7 +603,7 @@ int bch2_check_bucket_ref(struct btree_trans *trans, 
			"while marking %s",

			ptr->dev, bucket_nr, b_gen,

			*bucket_gen(ca, bucket_nr),

			bch2_data_types[bucket_data_type ?: ptr_data_type],

			bch2_data_type_str(bucket_data_type ?: ptr_data_type),

			ptr->gen,

			(printbuf_reset(&buf),

			 bch2_bkey_val_to_text(&buf, c, k), buf.buf));
@@ -624,8 +624,8 @@ int bch2_check_bucket_ref(struct btree_trans *trans, 
			"bucket %u:%zu gen %u different types of data in same bucket: %s, %s\n"

			"while marking %s",

			ptr->dev, bucket_nr, b_gen,

			bch2_data_types[bucket_data_type],

			bch2_data_types[ptr_data_type],

			bch2_data_type_str(bucket_data_type),

			bch2_data_type_str(ptr_data_type),

			(printbuf_reset(&buf),

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

		ret = -EIO;
@@ -638,7 +638,7 @@ int bch2_check_bucket_ref(struct btree_trans *trans, 
			"bucket %u:%zu gen %u data type %s sector count overflow: %u + %lli > U32_MAX\n"

			"while marking %s",

			ptr->dev, bucket_nr, b_gen,

			bch2_data_types[bucket_data_type ?: ptr_data_type],

			bch2_data_type_str(bucket_data_type ?: ptr_data_type),

			bucket_sectors, sectors,

			(printbuf_reset(&buf),

			 bch2_bkey_val_to_text(&buf, c, k), buf.buf));
@@ -1130,9 +1130,9 @@ static int __bch2_trans_mark_metadata_bucket(struct btree_trans *trans, 
			"bucket %llu:%llu gen %u different types of data in same bucket: %s, %s\n"

			"while marking %s",

			iter.pos.inode, iter.pos.offset, a->v.gen,

			bch2_data_types[a->v.data_type],

			bch2_data_types[type],

			bch2_data_types[type]);

			bch2_data_type_str(a->v.data_type),

			bch2_data_type_str(type),

			bch2_data_type_str(type));

		ret = -EIO;

		goto err;

	}

fs/bcachefs/buckets.h

+15 −0
Original line number Diff line number Diff line
@@ -385,6 +385,21 @@ static inline bool is_superblock_bucket(struct bch_dev *ca, u64 b) 
	return false;

}



static inline const char *bch2_data_type_str(enum bch_data_type type)

{

	return type < BCH_DATA_NR

		? __bch2_data_types[type]

		: "(invalid data type)";

}



static inline void bch2_prt_data_type(struct printbuf *out, enum bch_data_type type)

{

	if (type < BCH_DATA_NR)

		prt_str(out, __bch2_data_types[type]);

	else

		prt_printf(out, "(invalid data type %u)", type);

}



/* disk reservations: */



static inline void bch2_disk_reservation_put(struct bch_fs *c,