+// SPDX-License-Identifier: GPL-2.0
#ifdef CONFIG_BCACHEFS_TESTS
#include "bcachefs.h"
NULL);
BUG_ON(ret);
- ret = bch2_btree_delete_range(c, BTREE_ID_DIRENTS,
+ ret = bch2_btree_delete_range(c, BTREE_ID_XATTRS,
POS(0, 0), POS(0, U64_MAX),
NULL);
BUG_ON(ret);
/* unit tests */
-static void test_delete(struct bch_fs *c, u64 nr)
+static int test_delete(struct bch_fs *c, u64 nr)
{
struct btree_trans trans;
struct btree_iter *iter;
bkey_cookie_init(&k.k_i);
- bch2_trans_init(&trans, c);
+ bch2_trans_init(&trans, c, 0, 0);
- iter = bch2_trans_get_iter(&trans, BTREE_ID_DIRENTS, k.k.p,
+ iter = bch2_trans_get_iter(&trans, BTREE_ID_XATTRS, k.k.p,
BTREE_ITER_INTENT);
ret = bch2_btree_iter_traverse(iter);
- BUG_ON(ret);
+ if (ret) {
+ bch_err(c, "lookup error in test_delete: %i", ret);
+ goto err;
+ }
- bch2_trans_update(&trans, BTREE_INSERT_ENTRY(iter, &k.k_i));
- ret = bch2_trans_commit(&trans, NULL, NULL, 0);
- BUG_ON(ret);
+ ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+ bch2_trans_update(&trans, iter, &k.k_i, 0));
+ if (ret) {
+ bch_err(c, "update error in test_delete: %i", ret);
+ goto err;
+ }
pr_info("deleting once");
ret = bch2_btree_delete_at(&trans, iter, 0);
- BUG_ON(ret);
+ if (ret) {
+ bch_err(c, "delete error (first) in test_delete: %i", ret);
+ goto err;
+ }
pr_info("deleting twice");
ret = bch2_btree_delete_at(&trans, iter, 0);
- BUG_ON(ret);
-
+ if (ret) {
+ bch_err(c, "delete error (second) in test_delete: %i", ret);
+ goto err;
+ }
+err:
bch2_trans_exit(&trans);
+ return ret;
}
-static void test_delete_written(struct bch_fs *c, u64 nr)
+static int test_delete_written(struct bch_fs *c, u64 nr)
{
struct btree_trans trans;
struct btree_iter *iter;
bkey_cookie_init(&k.k_i);
- bch2_trans_init(&trans, c);
+ bch2_trans_init(&trans, c, 0, 0);
- iter = bch2_trans_get_iter(&trans, BTREE_ID_DIRENTS, k.k.p,
+ iter = bch2_trans_get_iter(&trans, BTREE_ID_XATTRS, k.k.p,
BTREE_ITER_INTENT);
ret = bch2_btree_iter_traverse(iter);
- BUG_ON(ret);
+ if (ret) {
+ bch_err(c, "lookup error in test_delete_written: %i", ret);
+ goto err;
+ }
- bch2_trans_update(&trans, BTREE_INSERT_ENTRY(iter, &k.k_i));
- ret = bch2_trans_commit(&trans, NULL, NULL, 0);
- BUG_ON(ret);
+ ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+ bch2_trans_update(&trans, iter, &k.k_i, 0));
+ if (ret) {
+ bch_err(c, "update error in test_delete_written: %i", ret);
+ goto err;
+ }
bch2_journal_flush_all_pins(&c->journal);
ret = bch2_btree_delete_at(&trans, iter, 0);
- BUG_ON(ret);
-
+ if (ret) {
+ bch_err(c, "delete error in test_delete_written: %i", ret);
+ goto err;
+ }
+err:
bch2_trans_exit(&trans);
+ return ret;
}
-static void test_iterate(struct bch_fs *c, u64 nr)
+static int test_iterate(struct bch_fs *c, u64 nr)
{
- struct btree_iter iter;
+ struct btree_trans trans;
+ struct btree_iter *iter;
struct bkey_s_c k;
u64 i;
- int ret;
+ int ret = 0;
+
+ bch2_trans_init(&trans, c, 0, 0);
delete_test_keys(c);
bkey_cookie_init(&k.k_i);
k.k.p.offset = i;
- ret = bch2_btree_insert(c, BTREE_ID_DIRENTS, &k.k_i,
+ ret = bch2_btree_insert(c, BTREE_ID_XATTRS, &k.k_i,
NULL, NULL, 0);
- BUG_ON(ret);
+ if (ret) {
+ bch_err(c, "insert error in test_iterate: %i", ret);
+ goto err;
+ }
}
pr_info("iterating forwards");
i = 0;
- for_each_btree_key(&iter, c, BTREE_ID_DIRENTS, POS(0, 0), 0, k)
+ for_each_btree_key(&trans, iter, BTREE_ID_XATTRS,
+ POS_MIN, 0, k, ret) {
+ if (k.k->p.inode)
+ break;
+
BUG_ON(k.k->p.offset != i++);
- bch2_btree_iter_unlock(&iter);
+ }
BUG_ON(i != nr);
pr_info("iterating backwards");
- while (!IS_ERR_OR_NULL((k = bch2_btree_iter_prev(&iter)).k))
+ while (!IS_ERR_OR_NULL((k = bch2_btree_iter_prev(iter)).k))
BUG_ON(k.k->p.offset != --i);
- bch2_btree_iter_unlock(&iter);
BUG_ON(i);
+err:
+ bch2_trans_exit(&trans);
+ return ret;
}
-static void test_iterate_extents(struct bch_fs *c, u64 nr)
+static int test_iterate_extents(struct bch_fs *c, u64 nr)
{
- struct btree_iter iter;
+ struct btree_trans trans;
+ struct btree_iter *iter;
struct bkey_s_c k;
u64 i;
- int ret;
+ int ret = 0;
+
+ bch2_trans_init(&trans, c, 0, 0);
delete_test_keys(c);
ret = bch2_btree_insert(c, BTREE_ID_EXTENTS, &k.k_i,
NULL, NULL, 0);
- BUG_ON(ret);
+ if (ret) {
+ bch_err(c, "insert error in test_iterate_extents: %i", ret);
+ goto err;
+ }
}
pr_info("iterating forwards");
i = 0;
- for_each_btree_key(&iter, c, BTREE_ID_EXTENTS, POS(0, 0), 0, k) {
+ for_each_btree_key(&trans, iter, BTREE_ID_EXTENTS,
+ POS_MIN, 0, k, ret) {
BUG_ON(bkey_start_offset(k.k) != i);
i = k.k->p.offset;
}
- bch2_btree_iter_unlock(&iter);
BUG_ON(i != nr);
pr_info("iterating backwards");
- while (!IS_ERR_OR_NULL((k = bch2_btree_iter_prev(&iter)).k)) {
+ while (!IS_ERR_OR_NULL((k = bch2_btree_iter_prev(iter)).k)) {
BUG_ON(k.k->p.offset != i);
i = bkey_start_offset(k.k);
}
- bch2_btree_iter_unlock(&iter);
BUG_ON(i);
+err:
+ bch2_trans_exit(&trans);
+ return ret;
}
-static void test_iterate_slots(struct bch_fs *c, u64 nr)
+static int test_iterate_slots(struct bch_fs *c, u64 nr)
{
- struct btree_iter iter;
+ struct btree_trans trans;
+ struct btree_iter *iter;
struct bkey_s_c k;
u64 i;
- int ret;
+ int ret = 0;
+
+ bch2_trans_init(&trans, c, 0, 0);
delete_test_keys(c);
bkey_cookie_init(&k.k_i);
k.k.p.offset = i * 2;
- ret = bch2_btree_insert(c, BTREE_ID_DIRENTS, &k.k_i,
+ ret = bch2_btree_insert(c, BTREE_ID_XATTRS, &k.k_i,
NULL, NULL, 0);
- BUG_ON(ret);
+ if (ret) {
+ bch_err(c, "insert error in test_iterate_slots: %i", ret);
+ goto err;
+ }
}
pr_info("iterating forwards");
i = 0;
- for_each_btree_key(&iter, c, BTREE_ID_DIRENTS, POS(0, 0), 0, k) {
+ for_each_btree_key(&trans, iter, BTREE_ID_XATTRS, POS_MIN,
+ 0, k, ret) {
+ if (k.k->p.inode)
+ break;
+
BUG_ON(k.k->p.offset != i);
i += 2;
}
- bch2_btree_iter_unlock(&iter);
+ bch2_trans_iter_free(&trans, iter);
BUG_ON(i != nr * 2);
i = 0;
- for_each_btree_key(&iter, c, BTREE_ID_DIRENTS, POS(0, 0),
- BTREE_ITER_SLOTS, k) {
+ for_each_btree_key(&trans, iter, BTREE_ID_XATTRS, POS_MIN,
+ BTREE_ITER_SLOTS, k, ret) {
+ BUG_ON(k.k->p.offset != i);
BUG_ON(bkey_deleted(k.k) != (i & 1));
- BUG_ON(k.k->p.offset != i++);
+ i++;
if (i == nr * 2)
break;
}
- bch2_btree_iter_unlock(&iter);
+err:
+ bch2_trans_exit(&trans);
+ return ret;
}
-static void test_iterate_slots_extents(struct bch_fs *c, u64 nr)
+static int test_iterate_slots_extents(struct bch_fs *c, u64 nr)
{
- struct btree_iter iter;
+ struct btree_trans trans;
+ struct btree_iter *iter;
struct bkey_s_c k;
u64 i;
- int ret;
+ int ret = 0;
+
+ bch2_trans_init(&trans, c, 0, 0);
delete_test_keys(c);
ret = bch2_btree_insert(c, BTREE_ID_EXTENTS, &k.k_i,
NULL, NULL, 0);
- BUG_ON(ret);
+ if (ret) {
+ bch_err(c, "insert error in test_iterate_slots_extents: %i", ret);
+ goto err;
+ }
}
pr_info("iterating forwards");
i = 0;
- for_each_btree_key(&iter, c, BTREE_ID_EXTENTS, POS(0, 0), 0, k) {
+ for_each_btree_key(&trans, iter, BTREE_ID_EXTENTS, POS_MIN,
+ 0, k, ret) {
BUG_ON(bkey_start_offset(k.k) != i + 8);
BUG_ON(k.k->size != 8);
i += 16;
}
- bch2_btree_iter_unlock(&iter);
+ bch2_trans_iter_free(&trans, iter);
BUG_ON(i != nr);
i = 0;
- for_each_btree_key(&iter, c, BTREE_ID_EXTENTS, POS(0, 0),
- BTREE_ITER_SLOTS, k) {
+ for_each_btree_key(&trans, iter, BTREE_ID_EXTENTS, POS_MIN,
+ BTREE_ITER_SLOTS, k, ret) {
BUG_ON(bkey_deleted(k.k) != !(i % 16));
BUG_ON(bkey_start_offset(k.k) != i);
if (i == nr)
break;
}
- bch2_btree_iter_unlock(&iter);
+err:
+ bch2_trans_exit(&trans);
+ return 0;
}
/*
* XXX: we really want to make sure we've got a btree with depth > 0 for these
* tests
*/
-static void test_peek_end(struct bch_fs *c, u64 nr)
+static int test_peek_end(struct bch_fs *c, u64 nr)
{
- struct btree_iter iter;
+ struct btree_trans trans;
+ struct btree_iter *iter;
struct bkey_s_c k;
- bch2_btree_iter_init(&iter, c, BTREE_ID_DIRENTS, POS_MIN, 0);
+ bch2_trans_init(&trans, c, 0, 0);
- k = bch2_btree_iter_peek(&iter);
+ iter = bch2_trans_get_iter(&trans, BTREE_ID_XATTRS, POS_MIN, 0);
+
+ k = bch2_btree_iter_peek(iter);
BUG_ON(k.k);
- k = bch2_btree_iter_peek(&iter);
+ k = bch2_btree_iter_peek(iter);
BUG_ON(k.k);
- bch2_btree_iter_unlock(&iter);
+ bch2_trans_exit(&trans);
+ return 0;
}
-static void test_peek_end_extents(struct bch_fs *c, u64 nr)
+static int test_peek_end_extents(struct bch_fs *c, u64 nr)
{
- struct btree_iter iter;
+ struct btree_trans trans;
+ struct btree_iter *iter;
struct bkey_s_c k;
- bch2_btree_iter_init(&iter, c, BTREE_ID_EXTENTS, POS_MIN, 0);
+ bch2_trans_init(&trans, c, 0, 0);
+
+ iter = bch2_trans_get_iter(&trans, BTREE_ID_EXTENTS, POS_MIN, 0);
- k = bch2_btree_iter_peek(&iter);
+ k = bch2_btree_iter_peek(iter);
BUG_ON(k.k);
- k = bch2_btree_iter_peek(&iter);
+ k = bch2_btree_iter_peek(iter);
BUG_ON(k.k);
- bch2_btree_iter_unlock(&iter);
+ bch2_trans_exit(&trans);
+ return 0;
}
/* extent unit tests */
u64 test_version;
-static void insert_test_extent(struct bch_fs *c,
- u64 start, u64 end)
+static int insert_test_extent(struct bch_fs *c,
+ u64 start, u64 end)
{
struct bkey_i_cookie k;
int ret;
ret = bch2_btree_insert(c, BTREE_ID_EXTENTS, &k.k_i,
NULL, NULL, 0);
- BUG_ON(ret);
+ if (ret)
+ bch_err(c, "insert error in insert_test_extent: %i", ret);
+ return ret;
}
-static void __test_extent_overwrite(struct bch_fs *c,
+static int __test_extent_overwrite(struct bch_fs *c,
u64 e1_start, u64 e1_end,
u64 e2_start, u64 e2_end)
{
- insert_test_extent(c, e1_start, e1_end);
- insert_test_extent(c, e2_start, e2_end);
+ int ret;
+
+ ret = insert_test_extent(c, e1_start, e1_end) ?:
+ insert_test_extent(c, e2_start, e2_end);
delete_test_keys(c);
+ return ret;
}
-static void test_extent_overwrite_front(struct bch_fs *c, u64 nr)
+static int test_extent_overwrite_front(struct bch_fs *c, u64 nr)
{
- __test_extent_overwrite(c, 0, 64, 0, 32);
- __test_extent_overwrite(c, 8, 64, 0, 32);
+ return __test_extent_overwrite(c, 0, 64, 0, 32) ?:
+ __test_extent_overwrite(c, 8, 64, 0, 32);
}
-static void test_extent_overwrite_back(struct bch_fs *c, u64 nr)
+static int test_extent_overwrite_back(struct bch_fs *c, u64 nr)
{
- __test_extent_overwrite(c, 0, 64, 32, 64);
- __test_extent_overwrite(c, 0, 64, 32, 72);
+ return __test_extent_overwrite(c, 0, 64, 32, 64) ?:
+ __test_extent_overwrite(c, 0, 64, 32, 72);
}
-static void test_extent_overwrite_middle(struct bch_fs *c, u64 nr)
+static int test_extent_overwrite_middle(struct bch_fs *c, u64 nr)
{
- __test_extent_overwrite(c, 0, 64, 32, 40);
+ return __test_extent_overwrite(c, 0, 64, 32, 40);
}
-static void test_extent_overwrite_all(struct bch_fs *c, u64 nr)
+static int test_extent_overwrite_all(struct bch_fs *c, u64 nr)
{
- __test_extent_overwrite(c, 32, 64, 0, 64);
- __test_extent_overwrite(c, 32, 64, 0, 128);
- __test_extent_overwrite(c, 32, 64, 32, 64);
- __test_extent_overwrite(c, 32, 64, 32, 128);
+ return __test_extent_overwrite(c, 32, 64, 0, 64) ?:
+ __test_extent_overwrite(c, 32, 64, 0, 128) ?:
+ __test_extent_overwrite(c, 32, 64, 32, 64) ?:
+ __test_extent_overwrite(c, 32, 64, 32, 128);
}
/* perf tests */
return v;
}
-static void rand_insert(struct bch_fs *c, u64 nr)
+static int rand_insert(struct bch_fs *c, u64 nr)
{
+ struct btree_trans trans;
struct bkey_i_cookie k;
- int ret;
+ int ret = 0;
u64 i;
+ bch2_trans_init(&trans, c, 0, 0);
+
for (i = 0; i < nr; i++) {
bkey_cookie_init(&k.k_i);
k.k.p.offset = test_rand();
- ret = bch2_btree_insert(c, BTREE_ID_DIRENTS, &k.k_i,
- NULL, NULL, 0);
- BUG_ON(ret);
+ ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+ __bch2_btree_insert(&trans, BTREE_ID_XATTRS, &k.k_i));
+ if (ret) {
+ bch_err(c, "error in rand_insert: %i", ret);
+ break;
+ }
}
+
+ bch2_trans_exit(&trans);
+ return ret;
}
-static void rand_lookup(struct bch_fs *c, u64 nr)
+static int rand_lookup(struct bch_fs *c, u64 nr)
{
+ struct btree_trans trans;
+ struct btree_iter *iter;
+ struct bkey_s_c k;
+ int ret = 0;
u64 i;
- for (i = 0; i < nr; i++) {
- struct btree_iter iter;
- struct bkey_s_c k;
+ bch2_trans_init(&trans, c, 0, 0);
+ iter = bch2_trans_get_iter(&trans, BTREE_ID_XATTRS, POS_MIN, 0);
- bch2_btree_iter_init(&iter, c, BTREE_ID_DIRENTS,
- POS(0, test_rand()), 0);
+ for (i = 0; i < nr; i++) {
+ bch2_btree_iter_set_pos(iter, POS(0, test_rand()));
- k = bch2_btree_iter_peek(&iter);
- bch2_btree_iter_unlock(&iter);
+ k = bch2_btree_iter_peek(iter);
+ ret = bkey_err(k);
+ if (ret) {
+ bch_err(c, "error in rand_lookup: %i", ret);
+ break;
+ }
}
+
+ bch2_trans_iter_free(&trans, iter);
+ bch2_trans_exit(&trans);
+ return ret;
}
-static void rand_mixed(struct bch_fs *c, u64 nr)
+static int rand_mixed(struct bch_fs *c, u64 nr)
{
- int ret;
+ struct btree_trans trans;
+ struct btree_iter *iter;
+ struct bkey_s_c k;
+ int ret = 0;
u64 i;
- for (i = 0; i < nr; i++) {
- struct btree_trans trans;
- struct btree_iter *iter;
- struct bkey_s_c k;
+ bch2_trans_init(&trans, c, 0, 0);
+ iter = bch2_trans_get_iter(&trans, BTREE_ID_XATTRS, POS_MIN, 0);
- bch2_trans_init(&trans, c);
-
- iter = bch2_trans_get_iter(&trans, BTREE_ID_DIRENTS,
- POS(0, test_rand()), 0);
+ for (i = 0; i < nr; i++) {
+ bch2_btree_iter_set_pos(iter, POS(0, test_rand()));
k = bch2_btree_iter_peek(iter);
+ ret = bkey_err(k);
+ if (ret) {
+ bch_err(c, "lookup error in rand_mixed: %i", ret);
+ break;
+ }
if (!(i & 3) && k.k) {
struct bkey_i_cookie k;
bkey_cookie_init(&k.k_i);
k.k.p = iter->pos;
- bch2_trans_update(&trans, BTREE_INSERT_ENTRY(iter, &k.k_i));
- ret = bch2_trans_commit(&trans, NULL, NULL, 0);
- BUG_ON(ret);
+ ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+ bch2_trans_update(&trans, iter, &k.k_i, 0));
+ if (ret) {
+ bch_err(c, "update error in rand_mixed: %i", ret);
+ break;
+ }
}
-
- bch2_trans_exit(&trans);
}
+ bch2_trans_iter_free(&trans, iter);
+ bch2_trans_exit(&trans);
+ return ret;
}
-static void rand_delete(struct bch_fs *c, u64 nr)
+static int __do_delete(struct btree_trans *trans, struct bpos pos)
{
- struct bkey_i k;
- int ret;
+ struct btree_iter *iter;
+ struct bkey_i delete;
+ struct bkey_s_c k;
+ int ret = 0;
+
+ iter = bch2_trans_get_iter(trans, BTREE_ID_XATTRS, pos,
+ BTREE_ITER_INTENT);
+ ret = PTR_ERR_OR_ZERO(iter);
+ if (ret)
+ goto err;
+
+ k = bch2_btree_iter_peek(iter);
+ ret = bkey_err(k);
+ if (ret)
+ goto err;
+
+ bkey_init(&delete.k);
+ delete.k.p = k.k->p;
+
+ bch2_trans_update(trans, iter, &delete, 0);
+err:
+ bch2_trans_iter_put(trans, iter);
+ return ret;
+}
+
+static int rand_delete(struct bch_fs *c, u64 nr)
+{
+ struct btree_trans trans;
+ int ret = 0;
u64 i;
+ bch2_trans_init(&trans, c, 0, 0);
+
for (i = 0; i < nr; i++) {
- bkey_init(&k.k);
- k.k.p.offset = test_rand();
+ struct bpos pos = POS(0, test_rand());
- ret = bch2_btree_insert(c, BTREE_ID_DIRENTS, &k,
- NULL, NULL, 0);
- BUG_ON(ret);
+ ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+ __do_delete(&trans, pos));
+ if (ret) {
+ bch_err(c, "error in rand_delete: %i", ret);
+ break;
+ }
}
+
+ bch2_trans_exit(&trans);
+ return ret;
}
-static void seq_insert(struct bch_fs *c, u64 nr)
+static int seq_insert(struct bch_fs *c, u64 nr)
{
struct btree_trans trans;
struct btree_iter *iter;
struct bkey_s_c k;
struct bkey_i_cookie insert;
- int ret;
+ int ret = 0;
u64 i = 0;
bkey_cookie_init(&insert.k_i);
- bch2_trans_init(&trans, c);
-
- iter = bch2_trans_get_iter(&trans, BTREE_ID_DIRENTS, POS_MIN,
- BTREE_ITER_SLOTS|BTREE_ITER_INTENT);
+ bch2_trans_init(&trans, c, 0, 0);
- for_each_btree_key_continue(iter, BTREE_ITER_SLOTS, k) {
+ for_each_btree_key(&trans, iter, BTREE_ID_XATTRS, POS_MIN,
+ BTREE_ITER_SLOTS|BTREE_ITER_INTENT, k, ret) {
insert.k.p = iter->pos;
- bch2_trans_update(&trans, BTREE_INSERT_ENTRY(iter, &insert.k_i));
- ret = bch2_trans_commit(&trans, NULL, NULL, 0);
- BUG_ON(ret);
+ ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+ bch2_trans_update(&trans, iter, &insert.k_i, 0));
+ if (ret) {
+ bch_err(c, "error in seq_insert: %i", ret);
+ break;
+ }
if (++i == nr)
break;
}
bch2_trans_exit(&trans);
+ return ret;
}
-static void seq_lookup(struct bch_fs *c, u64 nr)
+static int seq_lookup(struct bch_fs *c, u64 nr)
{
- struct btree_iter iter;
+ struct btree_trans trans;
+ struct btree_iter *iter;
struct bkey_s_c k;
+ int ret = 0;
- for_each_btree_key(&iter, c, BTREE_ID_DIRENTS, POS_MIN, 0, k)
+ bch2_trans_init(&trans, c, 0, 0);
+
+ for_each_btree_key(&trans, iter, BTREE_ID_XATTRS, POS_MIN, 0, k, ret)
;
- bch2_btree_iter_unlock(&iter);
+ bch2_trans_exit(&trans);
+ return ret;
}
-static void seq_overwrite(struct bch_fs *c, u64 nr)
+static int seq_overwrite(struct bch_fs *c, u64 nr)
{
struct btree_trans trans;
struct btree_iter *iter;
struct bkey_s_c k;
- int ret;
-
- bch2_trans_init(&trans, c);
+ int ret = 0;
- iter = bch2_trans_get_iter(&trans, BTREE_ID_DIRENTS, POS_MIN,
- BTREE_ITER_INTENT);
+ bch2_trans_init(&trans, c, 0, 0);
- for_each_btree_key_continue(iter, 0, k) {
+ for_each_btree_key(&trans, iter, BTREE_ID_XATTRS, POS_MIN,
+ BTREE_ITER_INTENT, k, ret) {
struct bkey_i_cookie u;
bkey_reassemble(&u.k_i, k);
- bch2_trans_update(&trans, BTREE_INSERT_ENTRY(iter, &u.k_i));
- ret = bch2_trans_commit(&trans, NULL, NULL, 0);
- BUG_ON(ret);
+ ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+ bch2_trans_update(&trans, iter, &u.k_i, 0));
+ if (ret) {
+ bch_err(c, "error in seq_overwrite: %i", ret);
+ break;
+ }
}
bch2_trans_exit(&trans);
+ return ret;
}
-static void seq_delete(struct bch_fs *c, u64 nr)
+static int seq_delete(struct bch_fs *c, u64 nr)
{
int ret;
- ret = bch2_btree_delete_range(c, BTREE_ID_DIRENTS,
+ ret = bch2_btree_delete_range(c, BTREE_ID_XATTRS,
POS(0, 0), POS(0, U64_MAX),
NULL);
- BUG_ON(ret);
+ if (ret)
+ bch_err(c, "error in seq_delete: %i", ret);
+ return ret;
}
-typedef void (*perf_test_fn)(struct bch_fs *, u64);
+typedef int (*perf_test_fn)(struct bch_fs *, u64);
struct test_job {
struct bch_fs *c;
u64 start;
u64 finish;
+ int ret;
};
static int btree_perf_test_thread(void *data)
{
struct test_job *j = data;
+ int ret;
if (atomic_dec_and_test(&j->ready)) {
wake_up(&j->ready_wait);
wait_event(j->ready_wait, !atomic_read(&j->ready));
}
- j->fn(j->c, j->nr / j->nr_threads);
+ ret = j->fn(j->c, j->nr / j->nr_threads);
+ if (ret)
+ j->ret = ret;
if (atomic_dec_and_test(&j->done)) {
j->finish = sched_clock();
return 0;
}
-void bch2_btree_perf_test(struct bch_fs *c, const char *testname,
- u64 nr, unsigned nr_threads)
+int bch2_btree_perf_test(struct bch_fs *c, const char *testname,
+ u64 nr, unsigned nr_threads)
{
struct test_job j = { .c = c, .nr = nr, .nr_threads = nr_threads };
char name_buf[20], nr_buf[20], per_sec_buf[20];
if (!j.fn) {
pr_err("unknown test %s", testname);
- return;
+ return -EINVAL;
}
//pr_info("running test %s:", testname);
time / NSEC_PER_SEC,
time * nr_threads / nr,
per_sec_buf);
+ return j.ret;
}
#endif /* CONFIG_BCACHEFS_TESTS */
projects / bcachefs-tools-debian / blobdiff