Commit 50a38ca1 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Fix btree_node_type enum 



More forwards compatibility fixups: having BKEY_TYPE_btree at the end of
the enum conflicts with unnkown btree IDs, this shifts BKEY_TYPE_btree
to slot 0 and fixes things up accordingly.

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

fs/bcachefs/bkey_methods.c

+16 −6
Original line number Diff line number Diff line
@@ -143,15 +143,20 @@ int bch2_bkey_val_invalid(struct bch_fs *c, struct bkey_s_c k, 
}



static u64 bch2_key_types_allowed[] = {

#define x(name, nr, flags, keys)	[BKEY_TYPE_##name] = BIT_ULL(KEY_TYPE_deleted)|keys,

	BCH_BTREE_IDS()

#undef x

	[BKEY_TYPE_btree] =

		BIT_ULL(KEY_TYPE_deleted)|

		BIT_ULL(KEY_TYPE_btree_ptr)|

		BIT_ULL(KEY_TYPE_btree_ptr_v2),

#define x(name, nr, flags, keys)	[BKEY_TYPE_##name] = BIT_ULL(KEY_TYPE_deleted)|keys,

	BCH_BTREE_IDS()

#undef x

};



const char *bch2_btree_node_type_str(enum btree_node_type type)

{

	return type == BKEY_TYPE_btree ? "internal btree node" : bch2_btree_id_str(type - 1);

}



int __bch2_bkey_invalid(struct bch_fs *c, struct bkey_s_c k,

			enum btree_node_type type,

			enum bkey_invalid_flags flags,
@@ -162,10 +167,13 @@ int __bch2_bkey_invalid(struct bch_fs *c, struct bkey_s_c k, 
		return -BCH_ERR_invalid_bkey;

	}



	if (type >= BKEY_TYPE_NR)

		return 0;



	if (flags & BKEY_INVALID_COMMIT	 &&

	    !(bch2_key_types_allowed[type] & BIT_ULL(k.k->type))) {

		prt_printf(err, "invalid key type for btree %s (%s)",

			   bch2_btree_id_str(type), bch2_bkey_types[k.k->type]);

			   bch2_btree_node_type_str(type), bch2_bkey_types[k.k->type]);

		return -BCH_ERR_invalid_bkey;

	}
@@ -188,13 +196,15 @@ int __bch2_bkey_invalid(struct bch_fs *c, struct bkey_s_c k, 
	}



	if (type != BKEY_TYPE_btree) {

		if (!btree_type_has_snapshots((enum btree_id) type) &&

		enum btree_id btree = type - 1;



		if (!btree_type_has_snapshots(btree) &&

		    k.k->p.snapshot) {

			prt_printf(err, "nonzero snapshot");

			return -BCH_ERR_invalid_bkey;

		}



		if (btree_type_has_snapshots((enum btree_id) type) &&

		if (btree_type_has_snapshots(btree) &&

		    !k.k->p.snapshot) {

			prt_printf(err, "snapshot == 0");

			return -BCH_ERR_invalid_bkey;

fs/bcachefs/btree_iter.h

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static inline unsigned __bch2_btree_iter_flags(struct btree_trans *trans, 
		flags |= BTREE_ITER_ALL_SNAPSHOTS|__BTREE_ITER_ALL_SNAPSHOTS;



	if (!(flags & (BTREE_ITER_ALL_SNAPSHOTS|BTREE_ITER_NOT_EXTENTS)) &&

	    btree_node_type_is_extents(btree_id))

	    btree_id_is_extents(btree_id))

		flags |= BTREE_ITER_IS_EXTENTS;



	if (!(flags & __BTREE_ITER_ALL_SNAPSHOTS) &&

fs/bcachefs/btree_trans_commit.c

+5 −6
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static int run_one_mem_trigger(struct btree_trans *trans, 
	if (unlikely(flags & BTREE_TRIGGER_NORUN))

		return 0;



	if (!btree_node_type_needs_gc((enum btree_node_type) i->btree_id))

	if (!btree_node_type_needs_gc(__btree_node_type(i->level, i->btree_id)))

		return 0;



	if (old_ops->atomic_trigger == new_ops->atomic_trigger &&
@@ -776,12 +776,12 @@ static noinline void bch2_drop_overwrites_from_journal(struct btree_trans *trans 
		bch2_journal_key_overwritten(trans->c, wb->btree, 0, wb->k.k.p);

}



static noinline int bch2_trans_commit_bkey_invalid(struct btree_trans *trans, unsigned flags,

static noinline int bch2_trans_commit_bkey_invalid(struct btree_trans *trans,

						   enum bkey_invalid_flags flags,

						   struct btree_insert_entry *i,

						   struct printbuf *err)

{

	struct bch_fs *c = trans->c;

	int rw = (flags & BTREE_INSERT_JOURNAL_REPLAY) ? READ : WRITE;



	printbuf_reset(err);

	prt_printf(err, "invalid bkey on insert from %s -> %ps",
@@ -792,8 +792,7 @@ static noinline int bch2_trans_commit_bkey_invalid(struct btree_trans *trans, un 
	bch2_bkey_val_to_text(err, c, bkey_i_to_s_c(i->k));

	prt_newline(err);



	bch2_bkey_invalid(c, bkey_i_to_s_c(i->k),

			  i->bkey_type, rw, err);

	bch2_bkey_invalid(c, bkey_i_to_s_c(i->k), i->bkey_type, flags, err);

	bch2_print_string_as_lines(KERN_ERR, err->buf);



	bch2_inconsistent_error(c);
@@ -1034,7 +1033,7 @@ int __bch2_trans_commit(struct btree_trans *trans, unsigned flags) 


		if (unlikely(bch2_bkey_invalid(c, bkey_i_to_s_c(i->k),

					       i->bkey_type, invalid_flags, &buf)))

			ret = bch2_trans_commit_bkey_invalid(trans, flags, i, &buf);

			ret = bch2_trans_commit_bkey_invalid(trans, invalid_flags, i, &buf);

		btree_insert_entry_checks(trans, i);

		printbuf_exit(&buf);

fs/bcachefs/btree_types.h

+19 −16
Original line number Diff line number Diff line
@@ -636,16 +636,17 @@ static inline unsigned bset_byte_offset(struct btree *b, void *i) 
}



enum btree_node_type {

#define x(kwd, val, ...) BKEY_TYPE_##kwd = val,

	BKEY_TYPE_btree,

#define x(kwd, val, ...) BKEY_TYPE_##kwd = val + 1,

	BCH_BTREE_IDS()

#undef x

	BKEY_TYPE_btree,

	BKEY_TYPE_NR

};



/* Type of a key in btree @id at level @level: */

static inline enum btree_node_type __btree_node_type(unsigned level, enum btree_id id)

{

	return level ? BKEY_TYPE_btree : (enum btree_node_type) id;

	return level ? BKEY_TYPE_btree : (unsigned) id + 1;

}



/* Type of keys @b contains: */
@@ -654,19 +655,21 @@ static inline enum btree_node_type btree_node_type(struct btree *b) 
	return __btree_node_type(b->c.level, b->c.btree_id);

}



const char *bch2_btree_node_type_str(enum btree_node_type);



#define BTREE_NODE_TYPE_HAS_TRANS_TRIGGERS		\

	(BIT(BKEY_TYPE_extents)|			\

	 BIT(BKEY_TYPE_alloc)|				\

	 BIT(BKEY_TYPE_inodes)|				\

	 BIT(BKEY_TYPE_stripes)|			\

	 BIT(BKEY_TYPE_reflink)|			\

	 BIT(BKEY_TYPE_btree))

	(BIT_ULL(BKEY_TYPE_extents)|			\

	 BIT_ULL(BKEY_TYPE_alloc)|			\

	 BIT_ULL(BKEY_TYPE_inodes)|			\

	 BIT_ULL(BKEY_TYPE_stripes)|			\

	 BIT_ULL(BKEY_TYPE_reflink)|			\

	 BIT_ULL(BKEY_TYPE_btree))



#define BTREE_NODE_TYPE_HAS_MEM_TRIGGERS		\

	(BIT(BKEY_TYPE_alloc)|				\

	 BIT(BKEY_TYPE_inodes)|				\

	 BIT(BKEY_TYPE_stripes)|			\

	 BIT(BKEY_TYPE_snapshots))

	(BIT_ULL(BKEY_TYPE_alloc)|			\

	 BIT_ULL(BKEY_TYPE_inodes)|			\

	 BIT_ULL(BKEY_TYPE_stripes)|			\

	 BIT_ULL(BKEY_TYPE_snapshots))



#define BTREE_NODE_TYPE_HAS_TRIGGERS			\

	(BTREE_NODE_TYPE_HAS_TRANS_TRIGGERS|		\
@@ -674,13 +677,13 @@ static inline enum btree_node_type btree_node_type(struct btree *b) 


static inline bool btree_node_type_needs_gc(enum btree_node_type type)

{

	return BTREE_NODE_TYPE_HAS_TRIGGERS & (1U << type);

	return BTREE_NODE_TYPE_HAS_TRIGGERS & BIT_ULL(type);

}



static inline bool btree_node_type_is_extents(enum btree_node_type type)

{

	const unsigned mask = 0

#define x(name, nr, flags, ...)	|((!!((flags) & BTREE_ID_EXTENTS)) << nr)

#define x(name, nr, flags, ...)	|((!!((flags) & BTREE_ID_EXTENTS)) << (nr + 1))

	BCH_BTREE_IDS()

#undef x

	;
@@ -690,7 +693,7 @@ static inline bool btree_node_type_is_extents(enum btree_node_type type) 


static inline bool btree_id_is_extents(enum btree_id btree)

{

	return btree_node_type_is_extents((enum btree_node_type) btree);

	return btree_node_type_is_extents(__btree_node_type(0, btree));

}



static inline bool btree_type_has_snapshots(enum btree_id id)