Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

bcache: bch_(btree|extent)_ptr_invalid() 



Trying to treat btree pointers and leaf node pointers the same way was a
mistake - going to start being more explicit about the type of
key/pointer we're dealing with. This is the first part of that
refactoring; this patch shouldn't change any actual behaviour.

Signed-off-by: default avatarKent Overstreet <kmo@daterainc.com>
parent 3a3b6a4e

drivers/md/bcache/bset.c

+36 −13
Original line number Diff line number Diff line
@@ -73,19 +73,9 @@ void bch_keylist_pop_front(struct keylist *l) 


/* Pointer validation */



bool __bch_ptr_invalid(struct cache_set *c, int level, const struct bkey *k)

static bool __ptr_invalid(struct cache_set *c, const struct bkey *k)

{

	unsigned i;

	char buf[80];



	if (level && (!KEY_PTRS(k) || !KEY_SIZE(k) || KEY_DIRTY(k)))

		goto bad;



	if (!level && KEY_SIZE(k) > KEY_OFFSET(k))

		goto bad;



	if (!KEY_SIZE(k))

		return true;



	for (i = 0; i < KEY_PTRS(k); i++)

		if (ptr_available(c, k, i)) {
@@ -96,13 +86,46 @@ bool __bch_ptr_invalid(struct cache_set *c, int level, const struct bkey *k) 
			if (KEY_SIZE(k) + r > c->sb.bucket_size ||

			    bucket <  ca->sb.first_bucket ||

			    bucket >= ca->sb.nbuckets)

				return true;

		}



	return false;

}



bool bch_btree_ptr_invalid(struct cache_set *c, const struct bkey *k)

{

	char buf[80];



	if (!KEY_PTRS(k) || !KEY_SIZE(k) || KEY_DIRTY(k))

		goto bad;



	if (__ptr_invalid(c, k))

		goto bad;



	return false;

bad:

	bch_bkey_to_text(buf, sizeof(buf), k);

	cache_bug(c, "spotted btree ptr %s: %s", buf, bch_ptr_status(c, k));

	return true;

}



bool bch_extent_ptr_invalid(struct cache_set *c, const struct bkey *k)

{

	char buf[80];



	if (!KEY_SIZE(k))

		return true;



	if (KEY_SIZE(k) > KEY_OFFSET(k))

		goto bad;



	if (__ptr_invalid(c, k))

		goto bad;



	return false;

bad:

	bch_bkey_to_text(buf, sizeof(buf), k);

	cache_bug(c, "spotted bad key %s: %s", buf, bch_ptr_status(c, k));

	cache_bug(c, "spotted extent %s: %s", buf, bch_ptr_status(c, k));

	return true;

}

drivers/md/bcache/bset.h

+3 −1
Original line number Diff line number Diff line
@@ -277,7 +277,9 @@ static inline bool bch_cut_back(const struct bkey *where, struct bkey *k) 
}



const char *bch_ptr_status(struct cache_set *, const struct bkey *);

bool __bch_ptr_invalid(struct cache_set *, int level, const struct bkey *);

bool bch_btree_ptr_invalid(struct cache_set *, const struct bkey *);

bool bch_extent_ptr_invalid(struct cache_set *, const struct bkey *);



bool bch_ptr_bad(struct btree *, const struct bkey *);



static inline uint8_t gen_after(uint8_t a, uint8_t b)

drivers/md/bcache/btree.h

+8 −5
Original line number Diff line number Diff line
@@ -204,11 +204,6 @@ static inline void set_gc_sectors(struct cache_set *c) 
	atomic_set(&c->sectors_to_gc, c->sb.bucket_size * c->nbuckets / 8);

}



static inline bool bch_ptr_invalid(struct btree *b, const struct bkey *k)

{

	return __bch_ptr_invalid(b->c, b->level, k);

}



static inline struct bkey *bch_btree_iter_init(struct btree *b,

					       struct btree_iter *iter,

					       struct bkey *search)
@@ -216,6 +211,14 @@ static inline struct bkey *bch_btree_iter_init(struct btree *b, 
	return __bch_btree_iter_init(b, iter, search, b->sets);

}



static inline bool bch_ptr_invalid(struct btree *b, const struct bkey *k)

{

	if (b->level)

		return bch_btree_ptr_invalid(b->c, k);

	else

		return bch_extent_ptr_invalid(b->c, k);

}



void bkey_put(struct cache_set *c, struct bkey *k);



/* Looping macros */

drivers/md/bcache/super.c

+2 −2
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static char *uuid_read(struct cache_set *c, struct jset *j, struct closure *cl) 
{

	struct bkey *k = &j->uuid_bucket;



	if (__bch_ptr_invalid(c, 1, k))

	if (bch_btree_ptr_invalid(c, k))

		return "bad uuid pointer";



	bkey_copy(&c->uuid_bucket, k);
@@ -1522,7 +1522,7 @@ static void run_cache_set(struct cache_set *c) 
		k = &j->btree_root;



		err = "bad btree root";

		if (__bch_ptr_invalid(c, j->btree_level + 1, k))

		if (bch_btree_ptr_invalid(c, k))

			goto err;



		err = "error reading btree root";