]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/debug.c
Update bcachefs sources to 3704d0779c bcachefs: Improved human readable integer parsing
[bcachefs-tools-debian] / libbcachefs / debug.c
index 4215c119e0a27a9f31bc226e2c7074d721e1879d..bdc50d5ba3a29617c61e3ab340ada440bb2715cd 100644 (file)
@@ -24,6 +24,7 @@
 #include <linux/console.h>
 #include <linux/debugfs.h>
 #include <linux/module.h>
+#include <linux/pretty-printers.h>
 #include <linux/random.h>
 #include <linux/seq_file.h>
 
@@ -43,11 +44,11 @@ static bool bch2_btree_verify_replica(struct bch_fs *c, struct btree *b,
        if (!bch2_dev_get_ioref(ca, READ))
                return false;
 
-       bio = bio_alloc_bioset(GFP_NOIO,
-                       buf_pages(n_sorted, btree_bytes(c)),
-                       &c->btree_bio);
-       bio_set_dev(bio, ca->disk_sb.bdev);
-       bio->bi_opf             = REQ_OP_READ|REQ_META;
+       bio = bio_alloc_bioset(ca->disk_sb.bdev,
+                              buf_pages(n_sorted, btree_bytes(c)),
+                              REQ_OP_READ|REQ_META,
+                              GFP_NOIO,
+                              &c->btree_bio);
        bio->bi_iter.bi_sector  = pick.ptr.offset;
        bch2_bio_map(bio, n_sorted, btree_bytes(c));
 
@@ -133,7 +134,7 @@ void __bch2_btree_verify(struct bch_fs *c, struct btree *b)
        if (c->opts.nochanges)
                return;
 
-       btree_node_io_lock(b);
+       bch2_btree_node_io_lock(b);
        mutex_lock(&c->verify_lock);
 
        if (!c->verify_ondisk) {
@@ -169,14 +170,15 @@ void __bch2_btree_verify(struct bch_fs *c, struct btree *b)
                failed |= bch2_btree_verify_replica(c, b, p);
 
        if (failed) {
-               char buf[200];
+               struct printbuf buf = PRINTBUF;
 
-               bch2_bkey_val_to_text(&PBUF(buf), c, bkey_i_to_s_c(&b->key));
-               bch2_fs_fatal_error(c, "btree node verify failed for : %s\n", buf);
+               bch2_bkey_val_to_text(&buf, c, bkey_i_to_s_c(&b->key));
+               bch2_fs_fatal_error(c, "btree node verify failed for : %s\n", buf.buf);
+               printbuf_exit(&buf);
        }
 out:
        mutex_unlock(&c->verify_lock);
-       btree_node_io_unlock(b);
+       bch2_btree_node_io_unlock(b);
 }
 
 #ifdef CONFIG_DEBUG_FS
@@ -184,12 +186,12 @@ out:
 /* XXX: bch_fs refcounting */
 
 struct dump_iter {
-       struct bpos             from;
-       struct bch_fs   *c;
+       struct bch_fs           *c;
        enum btree_id           id;
+       struct bpos             from;
+       u64                     iter;
 
-       char                    buf[1 << 12];
-       size_t                  bytes;  /* what's currently in buf */
+       struct printbuf         buf;
 
        char __user             *ubuf;  /* destination user buffer */
        size_t                  size;   /* size of requested read */
@@ -198,9 +200,9 @@ struct dump_iter {
 
 static int flush_buf(struct dump_iter *i)
 {
-       if (i->bytes) {
-               size_t bytes = min(i->bytes, i->size);
-               int err = copy_to_user(i->ubuf, i->buf, bytes);
+       if (i->buf.pos) {
+               size_t bytes = min_t(size_t, i->buf.pos, i->size);
+               int err = copy_to_user(i->ubuf, i->buf.buf, bytes);
 
                if (err)
                        return err;
@@ -208,8 +210,8 @@ static int flush_buf(struct dump_iter *i)
                i->ret   += bytes;
                i->ubuf  += bytes;
                i->size  -= bytes;
-               i->bytes -= bytes;
-               memmove(i->buf, i->buf + bytes, i->bytes);
+               i->buf.pos -= bytes;
+               memmove(i->buf.buf, i->buf.buf + bytes, i->buf.pos);
        }
 
        return 0;
@@ -226,15 +228,20 @@ static int bch2_dump_open(struct inode *inode, struct file *file)
 
        file->private_data = i;
        i->from = POS_MIN;
+       i->iter = 0;
        i->c    = container_of(bd, struct bch_fs, btree_debug[bd->id]);
        i->id   = bd->id;
+       i->buf  = PRINTBUF;
 
        return 0;
 }
 
 static int bch2_dump_release(struct inode *inode, struct file *file)
 {
-       kfree(file->private_data);
+       struct dump_iter *i = file->private_data;
+
+       printbuf_exit(&i->buf);
+       kfree(i);
        return 0;
 }
 
@@ -243,7 +250,7 @@ static ssize_t bch2_read_btree(struct file *file, char __user *buf,
 {
        struct dump_iter *i = file->private_data;
        struct btree_trans trans;
-       struct btree_iter *iter;
+       struct btree_iter iter;
        struct bkey_s_c k;
        int err;
 
@@ -260,20 +267,17 @@ static ssize_t bch2_read_btree(struct file *file, char __user *buf,
 
        bch2_trans_init(&trans, i->c, 0, 0);
 
-       iter = bch2_trans_get_iter(&trans, i->id, i->from,
-                                  BTREE_ITER_PREFETCH|
-                                  BTREE_ITER_ALL_SNAPSHOTS);
-       k = bch2_btree_iter_peek(iter);
+       bch2_trans_iter_init(&trans, &iter, i->id, i->from,
+                            BTREE_ITER_PREFETCH|
+                            BTREE_ITER_ALL_SNAPSHOTS);
+       k = bch2_btree_iter_peek(&iter);
 
        while (k.k && !(err = bkey_err(k))) {
-               bch2_bkey_val_to_text(&PBUF(i->buf), i->c, k);
-               i->bytes = strlen(i->buf);
-               BUG_ON(i->bytes >= sizeof(i->buf));
-               i->buf[i->bytes] = '\n';
-               i->bytes++;
+               bch2_bkey_val_to_text(&i->buf, i->c, k);
+               prt_char(&i->buf, '\n');
 
-               k = bch2_btree_iter_next(iter);
-               i->from = iter->pos;
+               k = bch2_btree_iter_next(&iter);
+               i->from = iter.pos;
 
                err = flush_buf(i);
                if (err)
@@ -282,7 +286,7 @@ static ssize_t bch2_read_btree(struct file *file, char __user *buf,
                if (!i->size)
                        break;
        }
-       bch2_trans_iter_put(&trans, iter);
+       bch2_trans_iter_exit(&trans, &iter);
 
        bch2_trans_exit(&trans);
 
@@ -301,7 +305,7 @@ static ssize_t bch2_read_btree_formats(struct file *file, char __user *buf,
 {
        struct dump_iter *i = file->private_data;
        struct btree_trans trans;
-       struct btree_iter *iter;
+       struct btree_iter iter;
        struct btree *b;
        int err;
 
@@ -313,14 +317,13 @@ static ssize_t bch2_read_btree_formats(struct file *file, char __user *buf,
        if (err)
                return err;
 
-       if (!i->size || !bpos_cmp(POS_MAX, i->from))
+       if (!i->size || !bpos_cmp(SPOS_MAX, i->from))
                return i->ret;
 
        bch2_trans_init(&trans, i->c, 0, 0);
 
-       for_each_btree_node(&trans, iter, i->id, i->from, 0, b) {
-               bch2_btree_node_to_text(&PBUF(i->buf), i->c, b);
-               i->bytes = strlen(i->buf);
+       for_each_btree_node(&trans, iter, i->id, i->from, 0, b, err) {
+               bch2_btree_node_to_text(&i->buf, i->c, b);
                err = flush_buf(i);
                if (err)
                        break;
@@ -329,14 +332,14 @@ static ssize_t bch2_read_btree_formats(struct file *file, char __user *buf,
                 * can't easily correctly restart a btree node traversal across
                 * all nodes, meh
                 */
-               i->from = bpos_cmp(POS_MAX, b->key.k.p)
+               i->from = bpos_cmp(SPOS_MAX, b->key.k.p)
                        ? bpos_successor(b->key.k.p)
                        : b->key.k.p;
 
                if (!i->size)
                        break;
        }
-       bch2_trans_iter_put(&trans, iter);
+       bch2_trans_iter_exit(&trans, &iter);
 
        bch2_trans_exit(&trans);
 
@@ -355,7 +358,7 @@ static ssize_t bch2_read_bfloat_failed(struct file *file, char __user *buf,
 {
        struct dump_iter *i = file->private_data;
        struct btree_trans trans;
-       struct btree_iter *iter;
+       struct btree_iter iter;
        struct bkey_s_c k;
        struct btree *prev_node = NULL;
        int err;
@@ -373,31 +376,31 @@ static ssize_t bch2_read_bfloat_failed(struct file *file, char __user *buf,
 
        bch2_trans_init(&trans, i->c, 0, 0);
 
-       iter = bch2_trans_get_iter(&trans, i->id, i->from, BTREE_ITER_PREFETCH);
+       bch2_trans_iter_init(&trans, &iter, i->id, i->from,
+                            BTREE_ITER_PREFETCH|
+                            BTREE_ITER_ALL_SNAPSHOTS);
 
-       while ((k = bch2_btree_iter_peek(iter)).k &&
+       while ((k = bch2_btree_iter_peek(&iter)).k &&
               !(err = bkey_err(k))) {
-               struct btree_iter_level *l = &iter->l[0];
+               struct btree_path_level *l = &iter.path->l[0];
                struct bkey_packed *_k =
                        bch2_btree_node_iter_peek(&l->iter, l->b);
 
                if (l->b != prev_node) {
-                       bch2_btree_node_to_text(&PBUF(i->buf), i->c, l->b);
-                       i->bytes = strlen(i->buf);
+                       bch2_btree_node_to_text(&i->buf, i->c, l->b);
                        err = flush_buf(i);
                        if (err)
                                break;
                }
                prev_node = l->b;
 
-               bch2_bfloat_to_text(&PBUF(i->buf), l->b, _k);
-               i->bytes = strlen(i->buf);
+               bch2_bfloat_to_text(&i->buf, l->b, _k);
                err = flush_buf(i);
                if (err)
                        break;
 
-               bch2_btree_iter_advance(iter);
-               i->from = iter->pos;
+               bch2_btree_iter_advance(&iter);
+               i->from = iter.pos;
 
                err = flush_buf(i);
                if (err)
@@ -406,6 +409,8 @@ static ssize_t bch2_read_bfloat_failed(struct file *file, char __user *buf,
                if (!i->size)
                        break;
        }
+       bch2_trans_iter_exit(&trans, &iter);
+
        bch2_trans_exit(&trans);
 
        return err < 0 ? err : i->ret;
@@ -418,10 +423,153 @@ static const struct file_operations bfloat_failed_debug_ops = {
        .read           = bch2_read_bfloat_failed,
 };
 
+static void bch2_cached_btree_node_to_text(struct printbuf *out, struct bch_fs *c,
+                                          struct btree *b)
+{
+       out->tabstops[0] = 32;
+
+       prt_printf(out, "%px btree=%s l=%u ",
+              b,
+              bch2_btree_ids[b->c.btree_id],
+              b->c.level);
+       prt_newline(out);
+
+       printbuf_indent_add(out, 2);
+
+       bch2_bkey_val_to_text(out, c, bkey_i_to_s_c(&b->key));
+       prt_newline(out);
+
+       prt_printf(out, "flags: ");
+       prt_tab(out);
+       prt_bitflags(out, bch2_btree_node_flags, b->flags);
+       prt_newline(out);
+
+       prt_printf(out, "pcpu read locks: ");
+       prt_tab(out);
+       prt_printf(out, "%u", b->c.lock.readers != NULL);
+       prt_newline(out);
+
+       prt_printf(out, "written:");
+       prt_tab(out);
+       prt_printf(out, "%u", b->written);
+       prt_newline(out);
+
+       prt_printf(out, "writes blocked:");
+       prt_tab(out);
+       prt_printf(out, "%u", !list_empty_careful(&b->write_blocked));
+       prt_newline(out);
+
+       prt_printf(out, "will make reachable:");
+       prt_tab(out);
+       prt_printf(out, "%lx", b->will_make_reachable);
+       prt_newline(out);
+
+       prt_printf(out, "journal pin %px:", &b->writes[0].journal);
+       prt_tab(out);
+       prt_printf(out, "%llu", b->writes[0].journal.seq);
+       prt_newline(out);
+
+       prt_printf(out, "journal pin %px:", &b->writes[1].journal);
+       prt_tab(out);
+       prt_printf(out, "%llu", b->writes[1].journal.seq);
+       prt_newline(out);
+
+       printbuf_indent_sub(out, 2);
+}
+
+static ssize_t bch2_cached_btree_nodes_read(struct file *file, char __user *buf,
+                                           size_t size, loff_t *ppos)
+{
+       struct dump_iter *i = file->private_data;
+       struct bch_fs *c = i->c;
+       bool done = false;
+       int err;
+
+       i->ubuf = buf;
+       i->size = size;
+       i->ret  = 0;
+
+       do {
+               struct bucket_table *tbl;
+               struct rhash_head *pos;
+               struct btree *b;
+
+               err = flush_buf(i);
+               if (err)
+                       return err;
+
+               if (!i->size)
+                       break;
+
+               rcu_read_lock();
+               i->buf.atomic++;
+               tbl = rht_dereference_rcu(c->btree_cache.table.tbl,
+                                         &c->btree_cache.table);
+               if (i->iter < tbl->size) {
+                       rht_for_each_entry_rcu(b, pos, tbl, i->iter, hash)
+                               bch2_cached_btree_node_to_text(&i->buf, c, b);
+                       i->iter++;;
+               } else {
+                       done = true;
+               }
+               --i->buf.atomic;
+               rcu_read_unlock();
+       } while (!done);
+
+       if (i->buf.allocation_failure)
+               return -ENOMEM;
+
+       return i->ret;
+}
+
+static const struct file_operations cached_btree_nodes_ops = {
+       .owner          = THIS_MODULE,
+       .open           = bch2_dump_open,
+       .release        = bch2_dump_release,
+       .read           = bch2_cached_btree_nodes_read,
+};
+
+static ssize_t bch2_journal_pins_read(struct file *file, char __user *buf,
+                                     size_t size, loff_t *ppos)
+{
+       struct dump_iter *i = file->private_data;
+       struct bch_fs *c = i->c;
+       bool done = false;
+       int err;
+
+       i->ubuf = buf;
+       i->size = size;
+       i->ret  = 0;
+
+       do {
+               err = flush_buf(i);
+               if (err)
+                       return err;
+
+               if (!i->size)
+                       break;
+
+               done = bch2_journal_seq_pins_to_text(&i->buf, &c->journal, &i->iter);
+               i->iter++;
+       } while (!done);
+
+       if (i->buf.allocation_failure)
+               return -ENOMEM;
+
+       return i->ret;
+}
+
+static const struct file_operations journal_pins_ops = {
+       .owner          = THIS_MODULE,
+       .open           = bch2_dump_open,
+       .release        = bch2_dump_release,
+       .read           = bch2_journal_pins_read,
+};
+
 void bch2_fs_debug_exit(struct bch_fs *c)
 {
-       if (!IS_ERR_OR_NULL(c->debug))
-               debugfs_remove_recursive(c->debug);
+       if (!IS_ERR_OR_NULL(c->fs_debug_dir))
+               debugfs_remove_recursive(c->fs_debug_dir);
 }
 
 void bch2_fs_debug_init(struct bch_fs *c)
@@ -433,29 +581,39 @@ void bch2_fs_debug_init(struct bch_fs *c)
                return;
 
        snprintf(name, sizeof(name), "%pU", c->sb.user_uuid.b);
-       c->debug = debugfs_create_dir(name, bch_debug);
-       if (IS_ERR_OR_NULL(c->debug))
+       c->fs_debug_dir = debugfs_create_dir(name, bch_debug);
+       if (IS_ERR_OR_NULL(c->fs_debug_dir))
+               return;
+
+       debugfs_create_file("cached_btree_nodes", 0400, c->fs_debug_dir,
+                           c->btree_debug, &cached_btree_nodes_ops);
+
+       debugfs_create_file("journal_pins", 0400, c->fs_debug_dir,
+                           c->btree_debug, &journal_pins_ops);
+
+       c->btree_debug_dir = debugfs_create_dir("btrees", c->fs_debug_dir);
+       if (IS_ERR_OR_NULL(c->btree_debug_dir))
                return;
 
        for (bd = c->btree_debug;
             bd < c->btree_debug + ARRAY_SIZE(c->btree_debug);
             bd++) {
                bd->id = bd - c->btree_debug;
-               bd->btree = debugfs_create_file(bch2_btree_ids[bd->id],
-                                               0400, c->debug, bd,
-                                               &btree_debug_ops);
+               debugfs_create_file(bch2_btree_ids[bd->id],
+                                   0400, c->btree_debug_dir, bd,
+                                   &btree_debug_ops);
 
                snprintf(name, sizeof(name), "%s-formats",
                         bch2_btree_ids[bd->id]);
 
-               bd->btree_format = debugfs_create_file(name, 0400, c->debug, bd,
-                                                      &btree_format_debug_ops);
+               debugfs_create_file(name, 0400, c->btree_debug_dir, bd,
+                                   &btree_format_debug_ops);
 
                snprintf(name, sizeof(name), "%s-bfloat-failed",
                         bch2_btree_ids[bd->id]);
 
-               bd->failed = debugfs_create_file(name, 0400, c->debug, bd,
-                                                &bfloat_failed_debug_ops);
+               debugfs_create_file(name, 0400, c->btree_debug_dir, bd,
+                                   &bfloat_failed_debug_ops);
        }
 }