Skip to content

L
linux
Commit ae2f17d5 authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet
Browse files
Options

bcachefs: Kill btree_node_iter_large 

Long overdue cleanup - this converts btree_node_iter_large uses to
sort_iter.
Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 8f82280e
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 209 deletions
fs/bcachefs/bkey_sort.c
View file @ ae2f17d5
...@@ -5,90 +5,15 @@ ...@@ -5,90 +5,15 @@
#include "bset.h" #include "bset.h"
#include "extents.h" #include "extents.h"
/* too many iterators, need to clean this up */ typedef int (*sort_cmp_fn)(struct btree *,
struct bkey_packed *,
/* btree_node_iter_large: */ struct bkey_packed *);
#define btree_node_iter_cmp_heap(h, _l, _r) btree_node_iter_cmp(b, _l, _r)
static inline bool static inline bool sort_iter_end(struct sort_iter *iter)
bch2_btree_node_iter_large_end(struct btree_node_iter_large *iter)
{ {
return !iter->used; return !iter->used;
} }
static inline struct bkey_packed *
bch2_btree_node_iter_large_peek_all(struct btree_node_iter_large *iter,
struct btree *b)
{
return bch2_btree_node_iter_large_end(iter)
? NULL
: __btree_node_offset_to_key(b, iter->data->k);
}
static void
bch2_btree_node_iter_large_advance(struct btree_node_iter_large *iter,
struct btree *b)
{
iter->data->k += __btree_node_offset_to_key(b, iter->data->k)->u64s;
EBUG_ON(!iter->used);
EBUG_ON(iter->data->k > iter->data->end);
if (iter->data->k == iter->data->end)
heap_del(iter, 0, btree_node_iter_cmp_heap, NULL);
else
heap_sift_down(iter, 0, btree_node_iter_cmp_heap, NULL);
}
static inline struct bkey_packed *
bch2_btree_node_iter_large_next_all(struct btree_node_iter_large *iter,
struct btree *b)
{
struct bkey_packed *ret = bch2_btree_node_iter_large_peek_all(iter, b);
if (ret)
bch2_btree_node_iter_large_advance(iter, b);
return ret;
}
void bch2_btree_node_iter_large_push(struct btree_node_iter_large *iter,
struct btree *b,
const struct bkey_packed *k,
const struct bkey_packed *end)
{
if (k != end) {
struct btree_node_iter_set n =
((struct btree_node_iter_set) {
__btree_node_key_to_offset(b, k),
__btree_node_key_to_offset(b, end)
});
__heap_add(iter, n, btree_node_iter_cmp_heap, NULL);
}
}
static void sort_key_next(struct btree_node_iter_large *iter,
struct btree *b,
struct btree_node_iter_set *i)
{
i->k += __btree_node_offset_to_key(b, i->k)->u64s;
while (i->k != i->end &&
!__btree_node_offset_to_key(b, i->k)->u64s)
i->k++;
if (i->k == i->end)
*i = iter->data[--iter->used];
}
/* regular sort_iters */
typedef int (*sort_cmp_fn)(struct btree *,
struct bkey_packed *,
struct bkey_packed *);
static inline void __sort_iter_sift(struct sort_iter *iter, static inline void __sort_iter_sift(struct sort_iter *iter,
unsigned from, unsigned from,
sort_cmp_fn cmp) sort_cmp_fn cmp)
...@@ -118,19 +43,29 @@ static inline void sort_iter_sort(struct sort_iter *iter, sort_cmp_fn cmp) ...@@ -118,19 +43,29 @@ static inline void sort_iter_sort(struct sort_iter *iter, sort_cmp_fn cmp)
static inline struct bkey_packed *sort_iter_peek(struct sort_iter *iter) static inline struct bkey_packed *sort_iter_peek(struct sort_iter *iter)
{ {
return iter->used ? iter->data->k : NULL; return !sort_iter_end(iter) ? iter->data->k : NULL;
} }
static inline void sort_iter_advance(struct sort_iter *iter, sort_cmp_fn cmp) static inline void __sort_iter_advance(struct sort_iter *iter,
unsigned idx, sort_cmp_fn cmp)
{ {
iter->data->k = bkey_next_skip_noops(iter->data->k, iter->data->end); struct sort_iter_set *i = iter->data + idx;
BUG_ON(idx >= iter->used);
i->k = bkey_next_skip_noops(i->k, i->end);
BUG_ON(iter->data->k > iter->data->end); BUG_ON(i->k > i->end);
if (iter->data->k == iter->data->end) if (i->k == i->end)
array_remove_item(iter->data, iter->used, 0); array_remove_item(iter->data, iter->used, idx);
else else
sort_iter_sift(iter, cmp); __sort_iter_sift(iter, idx, cmp);
}
static inline void sort_iter_advance(struct sort_iter *iter, sort_cmp_fn cmp)
{
__sort_iter_advance(iter, 0, cmp);
} }
static inline struct bkey_packed *sort_iter_next(struct sort_iter *iter, static inline struct bkey_packed *sort_iter_next(struct sort_iter *iter,
...@@ -145,70 +80,50 @@ static inline struct bkey_packed *sort_iter_next(struct sort_iter *iter, ...@@ -145,70 +80,50 @@ static inline struct bkey_packed *sort_iter_next(struct sort_iter *iter,
} }
/* /*
* Returns true if l > r - unless l == r, in which case returns true if l is * If keys compare equal, compare by pointer order:
* older than r.
*
* Necessary for btree_sort_fixup() - if there are multiple keys that compare
* equal in different sets, we have to process them newest to oldest.
*/ */
#define key_sort_cmp(h, l, r) \ static inline int key_sort_fix_overlapping_cmp(struct btree *b,
({ \ struct bkey_packed *l,
bkey_cmp_packed(b, \ struct bkey_packed *r)
__btree_node_offset_to_key(b, (l).k), \
__btree_node_offset_to_key(b, (r).k)) \
\
?: (l).k - (r).k; \
})
static inline bool should_drop_next_key(struct btree_node_iter_large *iter,
struct btree *b)
{ {
struct btree_node_iter_set *l = iter->data, *r = iter->data + 1; return bkey_cmp_packed(b, l, r) ?:
struct bkey_packed *k = __btree_node_offset_to_key(b, l->k); cmp_int((unsigned long) l, (unsigned long) r);
}
if (bkey_whiteout(k))
return true;
if (iter->used < 2)
return false;
if (iter->used > 2 &&
key_sort_cmp(iter, r[0], r[1]) >= 0)
r++;
static inline bool should_drop_next_key(struct sort_iter *iter)
{
/* /*
* key_sort_cmp() ensures that when keys compare equal the older key * key_sort_cmp() ensures that when keys compare equal the older key
* comes first; so if l->k compares equal to r->k then l->k is older and * comes first; so if l->k compares equal to r->k then l->k is older
* should be dropped. * and should be dropped.
*/ */
return !bkey_cmp_packed(b, return iter->used >= 2 &&
__btree_node_offset_to_key(b, l->k), !bkey_cmp_packed(iter->b,
__btree_node_offset_to_key(b, r->k)); iter->data[0].k,
iter->data[1].k);
} }
struct btree_nr_keys bch2_key_sort_fix_overlapping(struct bset *dst, struct btree_nr_keys
struct btree *b, bch2_key_sort_fix_overlapping(struct bch_fs *c, struct bset *dst,
struct btree_node_iter_large *iter) struct sort_iter *iter)
{ {
struct bkey_packed *out = dst->start; struct bkey_packed *out = dst->start;
struct bkey_packed *k;
struct btree_nr_keys nr; struct btree_nr_keys nr;
memset(&nr, 0, sizeof(nr)); memset(&nr, 0, sizeof(nr));
heap_resort(iter, key_sort_cmp, NULL); sort_iter_sort(iter, key_sort_fix_overlapping_cmp);
while (!bch2_btree_node_iter_large_end(iter)) {
if (!should_drop_next_key(iter, b)) {
struct bkey_packed *k =
__btree_node_offset_to_key(b, iter->data->k);
while ((k = sort_iter_peek(iter))) {
if (!bkey_whiteout(k) &&
!should_drop_next_key(iter)) {
bkey_copy(out, k); bkey_copy(out, k);
btree_keys_account_key_add(&nr, 0, out); btree_keys_account_key_add(&nr, 0, out);
out = bkey_next(out); out = bkey_next(out);
} }
sort_key_next(iter, b, iter->data); sort_iter_advance(iter, key_sort_fix_overlapping_cmp);
heap_sift_down(iter, 0, key_sort_cmp, NULL);
} }
dst->u64s = cpu_to_le16((u64 *) out - dst->_data); dst->u64s = cpu_to_le16((u64 *) out - dst->_data);
...@@ -221,29 +136,16 @@ struct btree_nr_keys bch2_key_sort_fix_overlapping(struct bset *dst, ...@@ -221,29 +136,16 @@ struct btree_nr_keys bch2_key_sort_fix_overlapping(struct bset *dst,
* Necessary for sort_fix_overlapping() - if there are multiple keys that * Necessary for sort_fix_overlapping() - if there are multiple keys that
* compare equal in different sets, we have to process them newest to oldest. * compare equal in different sets, we have to process them newest to oldest.
*/ */
#define extent_sort_cmp(h, l, r) \ static inline int extent_sort_fix_overlapping_cmp(struct btree *b,
({ \ struct bkey_packed *l,
struct bkey _ul = bkey_unpack_key(b, \ struct bkey_packed *r)
__btree_node_offset_to_key(b, (l).k)); \
struct bkey _ur = bkey_unpack_key(b, \
__btree_node_offset_to_key(b, (r).k)); \
\
bkey_cmp(bkey_start_pos(&_ul), \
bkey_start_pos(&_ur)) ?: (r).k - (l).k; \
})
static inline void extent_sort_sift(struct btree_node_iter_large *iter,
struct btree *b, size_t i)
{ {
heap_sift_down(iter, i, extent_sort_cmp, NULL); struct bkey ul = bkey_unpack_key(b, l);
} struct bkey ur = bkey_unpack_key(b, r);
static inline void extent_sort_next(struct btree_node_iter_large *iter, return bkey_cmp(bkey_start_pos(&ul),
struct btree *b, bkey_start_pos(&ur)) ?:
struct btree_node_iter_set *i) cmp_int((unsigned long) r, (unsigned long) l);
{
sort_key_next(iter, b, i);
heap_sift_down(iter, i - iter->data, extent_sort_cmp, NULL);
} }
static void extent_sort_advance_prev(struct bkey_format *f, static void extent_sort_advance_prev(struct bkey_format *f,
...@@ -286,14 +188,14 @@ static void extent_sort_append(struct bch_fs *c, ...@@ -286,14 +188,14 @@ static void extent_sort_append(struct bch_fs *c,
bkey_reassemble((void *) *prev, k.s_c); bkey_reassemble((void *) *prev, k.s_c);
} }
struct btree_nr_keys bch2_extent_sort_fix_overlapping(struct bch_fs *c, struct btree_nr_keys
struct bset *dst, bch2_extent_sort_fix_overlapping(struct bch_fs *c, struct bset *dst,
struct btree *b, struct sort_iter *iter)
struct btree_node_iter_large *iter)
{ {
struct btree *b = iter->b;
struct bkey_format *f = &b->format; struct bkey_format *f = &b->format;
struct btree_node_iter_set *_l = iter->data, *_r; struct sort_iter_set *_l = iter->data, *_r = iter->data + 1;
struct bkey_packed *prev = NULL, *lk, *rk; struct bkey_packed *prev = NULL;
struct bkey l_unpacked, r_unpacked; struct bkey l_unpacked, r_unpacked;
struct bkey_s l, r; struct bkey_s l, r;
struct btree_nr_keys nr; struct btree_nr_keys nr;
...@@ -302,36 +204,32 @@ struct btree_nr_keys bch2_extent_sort_fix_overlapping(struct bch_fs *c, ...@@ -302,36 +204,32 @@ struct btree_nr_keys bch2_extent_sort_fix_overlapping(struct bch_fs *c,
memset(&nr, 0, sizeof(nr)); memset(&nr, 0, sizeof(nr));
bkey_on_stack_init(&split); bkey_on_stack_init(&split);
heap_resort(iter, extent_sort_cmp, NULL); sort_iter_sort(iter, extent_sort_fix_overlapping_cmp);
while (!bch2_btree_node_iter_large_end(iter)) { while (!sort_iter_end(iter)) {
lk = __btree_node_offset_to_key(b, _l->k); l = __bkey_disassemble(b, _l->k, &l_unpacked);
l = __bkey_disassemble(b, lk, &l_unpacked);
if (iter->used == 1) { if (iter->used == 1) {
extent_sort_append(c, f, &nr, dst->start, &prev, l); extent_sort_append(c, f, &nr, dst->start, &prev, l);
extent_sort_next(iter, b, _l); sort_iter_advance(iter,
extent_sort_fix_overlapping_cmp);
continue; continue;
} }
_r = iter->data + 1; r = __bkey_disassemble(b, _r->k, &r_unpacked);
if (iter->used > 2 &&
extent_sort_cmp(iter, _r[0], _r[1]) >= 0)
_r++;
rk = __btree_node_offset_to_key(b, _r->k);
r = __bkey_disassemble(b, rk, &r_unpacked);
/* If current key and next key don't overlap, just append */ /* If current key and next key don't overlap, just append */
if (bkey_cmp(l.k->p, bkey_start_pos(r.k)) <= 0) { if (bkey_cmp(l.k->p, bkey_start_pos(r.k)) <= 0) {
extent_sort_append(c, f, &nr, dst->start, &prev, l); extent_sort_append(c, f, &nr, dst->start, &prev, l);
extent_sort_next(iter, b, _l); sort_iter_advance(iter,
extent_sort_fix_overlapping_cmp);
continue; continue;
} }
/* Skip 0 size keys */ /* Skip 0 size keys */
if (!r.k->size) { if (!r.k->size) {
extent_sort_next(iter, b, _r); __sort_iter_advance(iter, 1,
extent_sort_fix_overlapping_cmp);
continue; continue;
} }
...@@ -348,13 +246,14 @@ struct btree_nr_keys bch2_extent_sort_fix_overlapping(struct bch_fs *c, ...@@ -348,13 +246,14 @@ struct btree_nr_keys bch2_extent_sort_fix_overlapping(struct bch_fs *c,
if (_l->k > _r->k) { if (_l->k > _r->k) {
/* l wins, trim r */ /* l wins, trim r */
if (bkey_cmp(l.k->p, r.k->p) >= 0) { if (bkey_cmp(l.k->p, r.k->p) >= 0) {
sort_key_next(iter, b, _r); __sort_iter_advance(iter, 1,
extent_sort_fix_overlapping_cmp);
} else { } else {
bch2_cut_front_s(l.k->p, r); bch2_cut_front_s(l.k->p, r);
extent_save(b, rk, r.k); extent_save(b, _r->k, r.k);
__sort_iter_sift(iter, 1,
extent_sort_fix_overlapping_cmp);
} }
extent_sort_sift(iter, b, _r - iter->data);
} else if (bkey_cmp(l.k->p, r.k->p) > 0) { } else if (bkey_cmp(l.k->p, r.k->p) > 0) {
/* /*
...@@ -364,15 +263,16 @@ struct btree_nr_keys bch2_extent_sort_fix_overlapping(struct bch_fs *c, ...@@ -364,15 +263,16 @@ struct btree_nr_keys bch2_extent_sort_fix_overlapping(struct bch_fs *c,
bch2_cut_back(bkey_start_pos(r.k), split.k); bch2_cut_back(bkey_start_pos(r.k), split.k);
bch2_cut_front_s(r.k->p, l); bch2_cut_front_s(r.k->p, l);
extent_save(b, lk, l.k); extent_save(b, _l->k, l.k);
extent_sort_sift(iter, b, 0); __sort_iter_sift(iter, 0,
extent_sort_fix_overlapping_cmp);
extent_sort_append(c, f, &nr, dst->start, extent_sort_append(c, f, &nr, dst->start,
&prev, bkey_i_to_s(split.k)); &prev, bkey_i_to_s(split.k));
} else { } else {
bch2_cut_back_s(bkey_start_pos(r.k), l); bch2_cut_back_s(bkey_start_pos(r.k), l);
extent_save(b, lk, l.k); extent_save(b, _l->k, l.k);
} }
} }
......
fs/bcachefs/bkey_sort.h
View file @ ae2f17d5
...@@ -2,20 +2,10 @@ ...@@ -2,20 +2,10 @@
#ifndef _BCACHEFS_BKEY_SORT_H #ifndef _BCACHEFS_BKEY_SORT_H
#define _BCACHEFS_BKEY_SORT_H #define _BCACHEFS_BKEY_SORT_H
struct btree_node_iter_large {
u16 used;
struct btree_node_iter_set data[MAX_BSETS];
};
void bch2_btree_node_iter_large_push(struct btree_node_iter_large *,
struct btree *,
const struct bkey_packed *,
const struct bkey_packed *);
struct sort_iter { struct sort_iter {
struct btree *b; struct btree *b;
unsigned used; unsigned used;
unsigned size;
struct sort_iter_set { struct sort_iter_set {
struct bkey_packed *k, *end; struct bkey_packed *k, *end;
...@@ -24,27 +14,27 @@ struct sort_iter { ...@@ -24,27 +14,27 @@ struct sort_iter {
static inline void sort_iter_init(struct sort_iter *iter, struct btree *b) static inline void sort_iter_init(struct sort_iter *iter, struct btree *b)
{ {
memset(iter, 0, sizeof(*iter));
iter->b = b; iter->b = b;
iter->used = 0;
iter->size = ARRAY_SIZE(iter->data);
} }
static inline void sort_iter_add(struct sort_iter *iter, static inline void sort_iter_add(struct sort_iter *iter,
struct bkey_packed *k, struct bkey_packed *k,
struct bkey_packed *end) struct bkey_packed *end)
{ {
BUG_ON(iter->used >= ARRAY_SIZE(iter->data)); BUG_ON(iter->used >= iter->size);
if (k != end) if (k != end)
iter->data[iter->used++] = (struct sort_iter_set) { k, end }; iter->data[iter->used++] = (struct sort_iter_set) { k, end };
} }
struct btree_nr_keys struct btree_nr_keys
bch2_key_sort_fix_overlapping(struct bset *, struct btree *, bch2_key_sort_fix_overlapping(struct bch_fs *, struct bset *,
struct btree_node_iter_large *); struct sort_iter *);
struct btree_nr_keys struct btree_nr_keys
bch2_extent_sort_fix_overlapping(struct bch_fs *, struct bset *, bch2_extent_sort_fix_overlapping(struct bch_fs *, struct bset *,
struct btree *, struct sort_iter *);
struct btree_node_iter_large *);
struct btree_nr_keys struct btree_nr_keys
bch2_sort_repack(struct bset *, struct btree *, bch2_sort_repack(struct bset *, struct btree *,
......
fs/bcachefs/btree_io.c
View file @ ae2f17d5
...@@ -862,7 +862,7 @@ static int validate_bset(struct bch_fs *c, struct btree *b, ...@@ -862,7 +862,7 @@ static int validate_bset(struct bch_fs *c, struct btree *b,
int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry) int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry)
{ {
struct btree_node_entry *bne; struct btree_node_entry *bne;
struct btree_node_iter_large *iter; struct sort_iter *iter;
struct btree_node *sorted; struct btree_node *sorted;
struct bkey_packed *k; struct bkey_packed *k;
struct bset *i; struct bset *i;
...@@ -871,7 +871,8 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry ...@@ -871,7 +871,8 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry
int ret, retry_read = 0, write = READ; int ret, retry_read = 0, write = READ;
iter = mempool_alloc(&c->fill_iter, GFP_NOIO); iter = mempool_alloc(&c->fill_iter, GFP_NOIO);
iter->used = 0; sort_iter_init(iter, b);
iter->size = (btree_blocks(c) + 1) * 2;
if (bch2_meta_read_fault("btree")) if (bch2_meta_read_fault("btree"))
btree_err(BTREE_ERR_MUST_RETRY, c, b, NULL, btree_err(BTREE_ERR_MUST_RETRY, c, b, NULL,
...@@ -950,13 +951,12 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry ...@@ -950,13 +951,12 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry
if (blacklisted && !first) if (blacklisted && !first)
continue; continue;
bch2_btree_node_iter_large_push(iter, b, sort_iter_add(iter, i->start,
i->start, vstruct_idx(i, whiteout_u64s));
vstruct_idx(i, whiteout_u64s));
bch2_btree_node_iter_large_push(iter, b, sort_iter_add(iter,
vstruct_idx(i, whiteout_u64s), vstruct_idx(i, whiteout_u64s),
vstruct_last(i)); vstruct_last(i));
} }
for (bne = write_block(b); for (bne = write_block(b);
...@@ -971,9 +971,9 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry ...@@ -971,9 +971,9 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry
set_btree_bset(b, b->set, &b->data->keys); set_btree_bset(b, b->set, &b->data->keys);
b->nr = btree_node_is_extents(b) b->nr = (btree_node_is_extents(b)
? bch2_extent_sort_fix_overlapping(c, &sorted->keys, b, iter) ? bch2_extent_sort_fix_overlapping
: bch2_key_sort_fix_overlapping(&sorted->keys, b, iter); : bch2_key_sort_fix_overlapping)(c, &sorted->keys, iter);
u64s = le16_to_cpu(sorted->keys.u64s); u64s = le16_to_cpu(sorted->keys.u64s);
*sorted = *b->data; *sorted = *b->data;
......
fs/bcachefs/super.c
View file @ ae2f17d5
...@@ -705,9 +705,9 @@ static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts opts) ...@@ -705,9 +705,9 @@ static struct bch_fs *bch2_fs_alloc(struct bch_sb *sb, struct bch_opts opts)
if (bch2_fs_init_fault("fs_alloc")) if (bch2_fs_init_fault("fs_alloc"))
goto err; goto err;
iter_size = sizeof(struct btree_node_iter_large) + iter_size = sizeof(struct sort_iter) +
(btree_blocks(c) + 1) * 2 * (btree_blocks(c) + 1) * 2 *
sizeof(struct btree_node_iter_set); sizeof(struct sort_iter_set);
if (!(c->wq = alloc_workqueue("bcachefs", if (!(c->wq = alloc_workqueue("bcachefs",
WQ_FREEZABLE|WQ_MEM_RECLAIM|WQ_HIGHPRI, 1)) || WQ_FREEZABLE|WQ_MEM_RECLAIM|WQ_HIGHPRI, 1)) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7