bcache: Add btree_insert_node()

The flow of control in the old btree insertion code was rather -
backwards; we'd recurse down the btree (in btree_insert_recurse()), and
then if we needed to split the keys to be inserted into the parent node
would be effectively returned up to btree_insert_recurse(), which would
notice there was more work to do and finish the insertion.

The main problem with this was that the full logic for btree insertion
could only be used by calling btree_insert_recurse; if you'd gotten to a
btree leaf some other way and had a key to insert, if it turned out that
node needed to be split you were SOL.

This inverts the flow of control so btree_insert_node() does _full_
btree insertion, including splitting - and takes a (leaf) btree node to
insert into as a parameter.

This means we can now _correctly_ handle cache misses - for cache
misses, we need to insert a fake "check" key into the btree when we
discover we have a cache miss - while we still have the btree locked.
Previously, if the btree node was full inserting a cache miss would just
fail.

Signed-off-by: Kent Overstreet <kmo@daterainc.com>

diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c
index 97f6a0a2053c601526ec607f9b275c29be9cade0..75f9a2f9b391026eb42c21e68de86241306f4eee 100644 (file)
--- a/drivers/md/bcache/bset.c
+++ b/drivers/md/bcache/bset.c
@@ -73,6 +73,18 @@ struct bkey *bch_keylist_pop(struct keylist *l)
        return l->top = k;
 }
 
+void bch_keylist_pop_front(struct keylist *l)
+{
+       struct bkey *next = bkey_next(l->bottom);
+       size_t bytes = ((void *) l->top) - ((void *) next);
+
+       memmove(l->bottom,
+               next,
+               bytes);
+
+       l->top = ((void *) l->bottom) + bytes;
+}
+
 /* Pointer validation */
 
 bool __bch_ptr_invalid(struct cache_set *c, int level, const struct bkey *k)

diff --git a/drivers/md/bcache/bset.h b/drivers/md/bcache/bset.h
index ae115a253d7312f81422a4b162e2ca4952556a44..a3627d0cd88b63596133ccc151d6014acc4a70f3 100644 (file)
--- a/drivers/md/bcache/bset.h
+++ b/drivers/md/bcache/bset.h
@@ -267,6 +267,7 @@ static inline void bch_keylist_free(struct keylist *l)
 
 void bch_keylist_copy(struct keylist *, struct keylist *);
 struct bkey *bch_keylist_pop(struct keylist *);
+void bch_keylist_pop_front(struct keylist *);
 int bch_keylist_realloc(struct keylist *, int, struct cache_set *);
 
 void bch_bkey_copy_single_ptr(struct bkey *, const struct bkey *,

diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index d31055f431bed29dff8ccf671002c5dac46b1da3..b094c1d89ed61f0cf3da1f5e3a80972e5c890a6a 100644 (file)
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -1837,15 +1837,43 @@ merged:
        return true;
 }
 
-static bool bch_btree_insert_keys(struct btree *b, struct btree_op *op)
+static bool bch_btree_insert_keys(struct btree *b, struct btree_op *op,
+                                 struct keylist *insert_keys)
 {
        bool ret = false;
-       struct bkey *k;
        unsigned oldsize = bch_count_data(b);
 
-       while ((k = bch_keylist_pop(&op->keys))) {
-               bkey_put(b->c, k, b->level);
-               ret |= btree_insert_key(b, op, k);
+       BUG_ON(!insert_lock(op, b));
+
+       while (!bch_keylist_empty(insert_keys)) {
+               struct bkey *k = insert_keys->bottom;
+
+               if (b->level ||
+                   bkey_cmp(k, &b->key) <= 0) {
+                       bkey_put(b->c, k, b->level);
+
+                       ret |= btree_insert_key(b, op, k);
+                       bch_keylist_pop_front(insert_keys);
+               } else if (bkey_cmp(&START_KEY(k), &b->key) < 0) {
+#if 0
+                       if (op->type == BTREE_REPLACE) {
+                               bkey_put(b->c, k, b->level);
+                               bch_keylist_pop_front(insert_keys);
+                               op->insert_collision = true;
+                               break;
+                       }
+#endif
+                       BKEY_PADDED(key) temp;
+                       bkey_copy(&temp.key, insert_keys->bottom);
+
+                       bch_cut_back(&b->key, &temp.key);
+                       bch_cut_front(&b->key, insert_keys->bottom);
+
+                       ret |= btree_insert_key(b, op, &temp.key);
+                       break;
+               } else {
+                       break;
+               }
        }
 
        BUG_ON(bch_count_data(b) < oldsize);
@@ -1885,7 +1913,9 @@ out:
        return ret;
 }
 
-static int btree_split(struct btree *b, struct btree_op *op)
+static int btree_split(struct btree *b, struct btree_op *op,
+                      struct keylist *insert_keys,
+                      struct keylist *parent_keys)
 {
        bool split;
        struct btree *n1, *n2 = NULL, *n3 = NULL;
@@ -1915,7 +1945,7 @@ static int btree_split(struct btree *b, struct btree_op *op)
                                goto err_free2;
                }
 
-               bch_btree_insert_keys(n1, op);
+               bch_btree_insert_keys(n1, op, insert_keys);
 
                /*
                 * Has to be a linear search because we don't have an auxiliary
@@ -1937,23 +1967,23 @@ static int btree_split(struct btree *b, struct btree_op *op)
 
                bkey_copy_key(&n2->key, &b->key);
 
-               bch_keylist_add(&op->keys, &n2->key);
+               bch_keylist_add(parent_keys, &n2->key);
                bch_btree_node_write(n2, &op->cl);
                rw_unlock(true, n2);
        } else {
                trace_bcache_btree_node_compact(b, n1->sets[0].data->keys);
 
-               bch_btree_insert_keys(n1, op);
+               bch_btree_insert_keys(n1, op, insert_keys);
        }
 
-       bch_keylist_add(&op->keys, &n1->key);
+       bch_keylist_add(parent_keys, &n1->key);
        bch_btree_node_write(n1, &op->cl);
 
        if (n3) {
                /* Depth increases, make a new root */
 
                bkey_copy_key(&n3->key, &MAX_KEY);
-               bch_btree_insert_keys(n3, op);
+               bch_btree_insert_keys(n3, op, parent_keys);
                bch_btree_node_write(n3, &op->cl);
 
                closure_sync(&op->cl);
@@ -1962,22 +1992,22 @@ static int btree_split(struct btree *b, struct btree_op *op)
        } else if (!b->parent) {
                /* Root filled up but didn't need to be split */
 
-               op->keys.top = op->keys.bottom;
+               parent_keys->top = parent_keys->bottom;
                closure_sync(&op->cl);
                bch_btree_set_root(n1);
        } else {
                unsigned i;
 
-               bkey_copy(op->keys.top, &b->key);
-               bkey_copy_key(op->keys.top, &ZERO_KEY);
+               bkey_copy(parent_keys->top, &b->key);
+               bkey_copy_key(parent_keys->top, &ZERO_KEY);
 
                for (i = 0; i < KEY_PTRS(&b->key); i++) {
                        uint8_t g = PTR_BUCKET(b->c, &b->key, i)->gen + 1;
 
-                       SET_PTR_GEN(op->keys.top, i, g);
+                       SET_PTR_GEN(parent_keys->top, i, g);
                }
 
-               bch_keylist_push(&op->keys);
+               bch_keylist_push(parent_keys);
                closure_sync(&op->cl);
                atomic_inc(&b->c->prio_blocked);
        }
@@ -2006,69 +2036,65 @@ err:
        return -ENOMEM;
 }
 
-static int bch_btree_insert_recurse(struct btree *b, struct btree_op *op,
-                                   struct keylist *stack_keys)
+static int bch_btree_insert_node(struct btree *b, struct btree_op *op,
+                                struct keylist *insert_keys)
 {
-       if (b->level) {
-               int ret;
-               struct bkey *insert = op->keys.bottom;
-               struct bkey *k = bch_next_recurse_key(b, &START_KEY(insert));
+       int ret = 0;
+       struct keylist split_keys;
 
-               if (!k) {
-                       btree_bug(b, "no key to recurse on at level %i/%i",
-                                 b->level, b->c->root->level);
+       bch_keylist_init(&split_keys);
 
-                       op->keys.top = op->keys.bottom;
-                       return -EIO;
-               }
+       BUG_ON(b->level);
 
-               if (bkey_cmp(insert, k) > 0) {
-                       unsigned i;
+       do {
+               if (should_split(b)) {
+                       if (current->bio_list) {
+                               op->lock = b->c->root->level + 1;
+                               ret = -EAGAIN;
+                       } else if (op->lock <= b->c->root->level) {
+                               op->lock = b->c->root->level + 1;
+                               ret = -EINTR;
+                       } else {
+                               struct btree *parent = b->parent;
 
-                       if (op->type == BTREE_REPLACE) {
-                               __bkey_put(b->c, insert);
-                               op->keys.top = op->keys.bottom;
-                               op->insert_collision = true;
-                               return 0;
+                               ret = btree_split(b, op, insert_keys,
+                                                 &split_keys);
+                               insert_keys = &split_keys;
+                               b = parent;
                        }
+               } else {
+                       BUG_ON(write_block(b) != b->sets[b->nsets].data);
 
-                       for (i = 0; i < KEY_PTRS(insert); i++)
-                               atomic_inc(&PTR_BUCKET(b->c, insert, i)->pin);
-
-                       bkey_copy(stack_keys->top, insert);
-
-                       bch_cut_back(k, insert);
-                       bch_cut_front(k, stack_keys->top);
-
-                       bch_keylist_push(stack_keys);
+                       if (bch_btree_insert_keys(b, op, insert_keys)) {
+                               if (!b->level)
+                                       bch_btree_leaf_dirty(b, op);
+                               else
+                                       bch_btree_node_write(b, &op->cl);
+                       }
                }
+       } while (!bch_keylist_empty(&split_keys));
 
-               ret = btree(insert_recurse, k, b, op, stack_keys);
-               if (ret)
-                       return ret;
-       }
+       return ret;
+}
 
-       if (!bch_keylist_empty(&op->keys)) {
-               if (should_split(b)) {
-                       if (op->lock <= b->c->root->level) {
-                               BUG_ON(b->level);
-                               op->lock = b->c->root->level + 1;
-                               return -EINTR;
-                       }
-                       return btree_split(b, op);
-               }
+static int bch_btree_insert_recurse(struct btree *b, struct btree_op *op)
+{
+       if (b->level) {
+               struct bkey *insert = op->keys.bottom;
+               struct bkey *k = bch_next_recurse_key(b, &START_KEY(insert));
 
-               BUG_ON(write_block(b) != b->sets[b->nsets].data);
+               if (!k) {
+                       btree_bug(b, "no key to recurse on at level %i/%i",
+                                 b->level, b->c->root->level);
 
-               if (bch_btree_insert_keys(b, op)) {
-                       if (!b->level)
-                               bch_btree_leaf_dirty(b, op);
-                       else
-                               bch_btree_node_write(b, &op->cl);
+                       op->keys.top = op->keys.bottom;
+                       return -EIO;
                }
-       }
 
-       return 0;
+               return btree(insert_recurse, k, b, op);
+       } else {
+               return bch_btree_insert_node(b, op, &op->keys);
+       }
 }
 
 int bch_btree_insert(struct btree_op *op, struct cache_set *c)
@@ -2094,7 +2120,7 @@ int bch_btree_insert(struct btree_op *op, struct cache_set *c)
                        op->lock = 0;
                }
 
-               ret = btree_root(insert_recurse, c, op, &stack_keys);
+               ret = btree_root(insert_recurse, c, op);
 
                if (ret == -EAGAIN) {
                        ret = 0;