]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - cmd_list.c
New upstream release
[bcachefs-tools-debian] / cmd_list.c
similarity index 57%
rename from cmd_debug.c
rename to cmd_list.c
index 6ff58a96642bc2cabaee6f5ed2224b3a2db19616..382153da9d43b39fef1221450715c32e1756ccc1 100644 (file)
 #include "tools-util.h"
 
 #include "libbcachefs/bcachefs.h"
-#include "libbcachefs/bset.h"
 #include "libbcachefs/btree_cache.h"
 #include "libbcachefs/btree_io.h"
 #include "libbcachefs/btree_iter.h"
-#include "libbcachefs/buckets.h"
 #include "libbcachefs/checksum.h"
 #include "libbcachefs/error.h"
-#include "libbcachefs/journal.h"
-#include "libbcachefs/journal_io.h"
+#include "libbcachefs/extents.h"
 #include "libbcachefs/super.h"
 
-static void dump_usage(void)
-{
-       puts("bcachefs dump - dump filesystem metadata\n"
-            "Usage: bcachefs dump [OPTION]... <devices>\n"
-            "\n"
-            "Options:\n"
-            "  -o output     Output qcow2 image(s)\n"
-            "  -f            Force; overwrite when needed\n"
-            "  -h            Display this help and exit\n"
-            "Report bugs to <linux-bcache@vger.kernel.org>");
-}
-
-static void dump_one_device(struct bch_fs *c, struct bch_dev *ca, int fd)
-{
-       struct bch_sb *sb = ca->disk_sb.sb;
-       ranges data;
-       unsigned i;
-       int ret;
-
-       darray_init(data);
-
-       /* Superblock: */
-       range_add(&data, BCH_SB_LAYOUT_SECTOR << 9,
-                 sizeof(struct bch_sb_layout));
-
-       for (i = 0; i < sb->layout.nr_superblocks; i++)
-               range_add(&data,
-                         le64_to_cpu(sb->layout.sb_offset[i]) << 9,
-                         vstruct_bytes(sb));
-
-       /* Journal: */
-       for (i = 0; i < ca->journal.nr; i++)
-               if (ca->journal.bucket_seq[i] >= c->journal.last_seq_ondisk) {
-                       u64 bucket = ca->journal.buckets[i];
-
-                       range_add(&data,
-                                 bucket_bytes(ca) * bucket,
-                                 bucket_bytes(ca));
-               }
-
-       /* Btree: */
-       for (i = 0; i < BTREE_ID_NR; i++) {
-               const struct bch_extent_ptr *ptr;
-               struct bkey_ptrs_c ptrs;
-               struct btree_trans trans;
-               struct btree_iter iter;
-               struct btree *b;
-
-               bch2_trans_init(&trans, c, 0, 0);
-
-               __for_each_btree_node(&trans, iter, i, POS_MIN, 0, 1, 0, b, ret) {
-                       struct btree_node_iter iter;
-                       struct bkey u;
-                       struct bkey_s_c k;
-
-                       for_each_btree_node_key_unpack(b, k, &iter, &u) {
-                               ptrs = bch2_bkey_ptrs_c(k);
-
-                               bkey_for_each_ptr(ptrs, ptr)
-                                       if (ptr->dev == ca->dev_idx)
-                                               range_add(&data,
-                                                         ptr->offset << 9,
-                                                         btree_bytes(c));
-                       }
-               }
-
-               if (ret)
-                       die("error %s walking btree nodes", strerror(-ret));
-
-               b = c->btree_roots[i].b;
-               if (!btree_node_fake(b)) {
-                       ptrs = bch2_bkey_ptrs_c(bkey_i_to_s_c(&b->key));
-
-                       bkey_for_each_ptr(ptrs, ptr)
-                               if (ptr->dev == ca->dev_idx)
-                                       range_add(&data,
-                                                 ptr->offset << 9,
-                                                 btree_bytes(c));
-               }
-
-               bch2_trans_iter_exit(&trans, &iter);
-               bch2_trans_exit(&trans);
-       }
-
-       qcow2_write_image(ca->disk_sb.bdev->bd_fd, fd, &data,
-                         max_t(unsigned, btree_bytes(c) / 8, block_bytes(c)));
-       darray_free(data);
-}
-
-int cmd_dump(int argc, char *argv[])
-{
-       struct bch_opts opts = bch2_opts_empty();
-       struct bch_dev *ca;
-       char *out = NULL;
-       unsigned i, nr_devices = 0;
-       bool force = false;
-       int fd, opt;
-
-       opt_set(opts, nochanges,        true);
-       opt_set(opts, norecovery,       true);
-       opt_set(opts, degraded,         true);
-       opt_set(opts, errors,           BCH_ON_ERROR_continue);
-       opt_set(opts, fix_errors,       FSCK_OPT_NO);
-
-       while ((opt = getopt(argc, argv, "o:fvh")) != -1)
-               switch (opt) {
-               case 'o':
-                       out = optarg;
-                       break;
-               case 'f':
-                       force = true;
-                       break;
-               case 'v':
-                       opt_set(opts, verbose, true);
-                       break;
-               case 'h':
-                       dump_usage();
-                       exit(EXIT_SUCCESS);
-               }
-       args_shift(optind);
-
-       if (!out)
-               die("Please supply output filename");
-
-       if (!argc)
-               die("Please supply device(s) to check");
-
-       struct bch_fs *c = bch2_fs_open(argv, argc, opts);
-       if (IS_ERR(c))
-               die("error opening %s: %s", argv[0], strerror(-PTR_ERR(c)));
-
-       down_read(&c->gc_lock);
-
-       for_each_online_member(ca, c, i)
-               nr_devices++;
-
-       BUG_ON(!nr_devices);
-
-       for_each_online_member(ca, c, i) {
-               int flags = O_WRONLY|O_CREAT|O_TRUNC;
-
-               if (!force)
-                       flags |= O_EXCL;
-
-               if (!c->devs[i])
-                       continue;
-
-               char *path = nr_devices > 1
-                       ? mprintf("%s.%u", out, i)
-                       : strdup(out);
-               fd = xopen(path, flags, 0600);
-               free(path);
-
-               dump_one_device(c, ca, fd);
-               close(fd);
-       }
-
-       up_read(&c->gc_lock);
-
-       bch2_fs_stop(c);
-       return 0;
-}
-
 static void list_keys(struct bch_fs *c, enum btree_id btree_id,
                      struct bpos start, struct bpos end)
 {
        struct btree_trans trans;
        struct btree_iter iter;
        struct bkey_s_c k;
-       char buf[512];
+       struct printbuf buf = PRINTBUF;
        int ret;
 
        bch2_trans_init(&trans, c, 0, 0);
@@ -200,12 +34,15 @@ static void list_keys(struct bch_fs *c, enum btree_id btree_id,
                if (bkey_cmp(k.k->p, end) > 0)
                        break;
 
-               bch2_bkey_val_to_text(&PBUF(buf), c, k);
-               puts(buf);
+               printbuf_reset(&buf);
+               bch2_bkey_val_to_text(&buf, c, k);
+               puts(buf.buf);
        }
        bch2_trans_iter_exit(&trans, &iter);
 
        bch2_trans_exit(&trans);
+
+       printbuf_exit(&buf);
 }
 
 static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id, unsigned level,
@@ -214,7 +51,7 @@ static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id, unsigne
        struct btree_trans trans;
        struct btree_iter iter;
        struct btree *b;
-       char buf[4096];
+       struct printbuf buf = PRINTBUF;
        int ret;
 
        bch2_trans_init(&trans, c, 0, 0);
@@ -223,8 +60,9 @@ static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id, unsigne
                if (bkey_cmp(b->key.k.p, end) > 0)
                        break;
 
-               bch2_btree_node_to_text(&PBUF(buf), c, b);
-               puts(buf);
+               printbuf_reset(&buf);
+               bch2_btree_node_to_text(&buf, c, b);
+               puts(buf.buf);
        }
        bch2_trans_iter_exit(&trans, &iter);
 
@@ -232,6 +70,7 @@ static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id, unsigne
                die("error %s walking btree nodes", strerror(-ret));
 
        bch2_trans_exit(&trans);
+       printbuf_exit(&buf);
 }
 
 static void list_nodes(struct bch_fs *c, enum btree_id btree_id, unsigned level,
@@ -240,7 +79,7 @@ static void list_nodes(struct bch_fs *c, enum btree_id btree_id, unsigned level,
        struct btree_trans trans;
        struct btree_iter iter;
        struct btree *b;
-       char buf[4096];
+       struct printbuf buf = PRINTBUF;
        int ret;
 
        bch2_trans_init(&trans, c, 0, 0);
@@ -249,8 +88,9 @@ static void list_nodes(struct bch_fs *c, enum btree_id btree_id, unsigned level,
                if (bkey_cmp(b->key.k.p, end) > 0)
                        break;
 
-               bch2_bkey_val_to_text(&PBUF(buf), c, bkey_i_to_s_c(&b->key));
-               fputs(buf, stdout);
+               printbuf_reset(&buf);
+               bch2_bkey_val_to_text(&buf, c, bkey_i_to_s_c(&b->key));
+               fputs(buf.buf, stdout);
                putchar('\n');
        }
        bch2_trans_iter_exit(&trans, &iter);
@@ -259,6 +99,7 @@ static void list_nodes(struct bch_fs *c, enum btree_id btree_id, unsigned level,
                die("error %s walking btree nodes", strerror(-ret));
 
        bch2_trans_exit(&trans);
+       printbuf_exit(&buf);
 }
 
 static void print_node_ondisk(struct bch_fs *c, struct btree *b)
@@ -268,6 +109,7 @@ static void print_node_ondisk(struct bch_fs *c, struct btree *b)
        struct bch_dev *ca;
        struct bio *bio;
        unsigned offset = 0;
+       int ret;
 
        if (bch2_bkey_pick_read_device(c, bkey_i_to_s_c(&b->key), NULL, &pick) <= 0) {
                printf("error getting device to read from\n");
@@ -280,17 +122,19 @@ static void print_node_ondisk(struct bch_fs *c, struct btree *b)
                return;
        }
 
-       n_ondisk = malloc(btree_bytes(c));
+       n_ondisk = aligned_alloc(block_bytes(c), btree_bytes(c));
 
-       bio = bio_alloc_bioset(GFP_NOIO,
-                       buf_pages(n_ondisk, 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_ondisk, 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_ondisk, btree_bytes(c));
 
-       submit_bio_wait(bio);
+       ret = submit_bio_wait(bio);
+       if (ret)
+               die("error reading btree node: %i", ret);
 
        bio_put(bio);
        percpu_ref_put(&ca->io_ref);
@@ -306,7 +150,8 @@ static void print_node_ondisk(struct bch_fs *c, struct btree *b)
                        i = &n_ondisk->keys;
 
                        if (!bch2_checksum_type_valid(c, BSET_CSUM_TYPE(i)))
-                               die("unknown checksum type");
+                               die("unknown checksum type at offset %u: %llu",
+                                   offset, BSET_CSUM_TYPE(i));
 
                        nonce = btree_nonce(i, offset << 9);
                        csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, n_ondisk);
@@ -326,7 +171,8 @@ static void print_node_ondisk(struct bch_fs *c, struct btree *b)
                                break;
 
                        if (!bch2_checksum_type_valid(c, BSET_CSUM_TYPE(i)))
-                               die("unknown checksum type");
+                               die("unknown checksum type at offset %u: %llu",
+                                   offset, BSET_CSUM_TYPE(i));
 
                        nonce = btree_nonce(i, offset << 9);
                        csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, bne);
@@ -347,10 +193,14 @@ static void print_node_ondisk(struct bch_fs *c, struct btree *b)
 
                for (k = i->start; k != vstruct_last(i); k = bkey_next(k)) {
                        struct bkey u;
-                       char buf[4096];
+                       struct printbuf buf = PRINTBUF;
+
+                       printbuf_indent_add(&buf, 4);
+
+                       bch2_bkey_val_to_text(&buf, c, bkey_disassemble(b, k, &u));
+                       fprintf(stdout, "%s\n", buf.buf);
 
-                       bch2_bkey_val_to_text(&PBUF(buf), c, bkey_disassemble(b, k, &u));
-                       fprintf(stdout, "    %s\n", buf);
+                       printbuf_exit(&buf);
                }
        }
 
@@ -363,7 +213,7 @@ static void list_nodes_ondisk(struct bch_fs *c, enum btree_id btree_id, unsigned
        struct btree_trans trans;
        struct btree_iter iter;
        struct btree *b;
-       char buf[4096];
+       struct printbuf buf = PRINTBUF;
        int ret;
 
        bch2_trans_init(&trans, c, 0, 0);
@@ -372,8 +222,9 @@ static void list_nodes_ondisk(struct bch_fs *c, enum btree_id btree_id, unsigned
                if (bkey_cmp(b->key.k.p, end) > 0)
                        break;
 
-               bch2_bkey_val_to_text(&PBUF(buf), c, bkey_i_to_s_c(&b->key));
-               fputs(buf, stdout);
+               printbuf_reset(&buf);
+               bch2_bkey_val_to_text(&buf, c, bkey_i_to_s_c(&b->key));
+               fputs(buf.buf, stdout);
                putchar('\n');
 
                print_node_ondisk(c, b);
@@ -384,6 +235,7 @@ static void list_nodes_ondisk(struct bch_fs *c, enum btree_id btree_id, unsigned
                die("error %s walking btree nodes", strerror(-ret));
 
        bch2_trans_exit(&trans);
+       printbuf_exit(&buf);
 }
 
 static void list_nodes_keys(struct bch_fs *c, enum btree_id btree_id, unsigned level,
@@ -395,7 +247,7 @@ static void list_nodes_keys(struct bch_fs *c, enum btree_id btree_id, unsigned l
        struct bkey unpacked;
        struct bkey_s_c k;
        struct btree *b;
-       char buf[4096];
+       struct printbuf buf = PRINTBUF;
        int ret;
 
        bch2_trans_init(&trans, c, 0, 0);
@@ -404,13 +256,15 @@ static void list_nodes_keys(struct bch_fs *c, enum btree_id btree_id, unsigned l
                if (bkey_cmp(b->key.k.p, end) > 0)
                        break;
 
-               bch2_btree_node_to_text(&PBUF(buf), c, b);
-               fputs(buf, stdout);
+               printbuf_reset(&buf);
+               bch2_btree_node_to_text(&buf, c, b);
+               fputs(buf.buf, stdout);
 
                for_each_btree_node_key_unpack(b, k, &node_iter, &unpacked) {
-                       bch2_bkey_val_to_text(&PBUF(buf), c, k);
+                       printbuf_reset(&buf);
+                       bch2_bkey_val_to_text(&buf, c, k);
                        putchar('\t');
-                       puts(buf);
+                       puts(buf.buf);
                }
        }
        bch2_trans_iter_exit(&trans, &iter);
@@ -419,6 +273,7 @@ static void list_nodes_keys(struct bch_fs *c, enum btree_id btree_id, unsigned l
                die("error %s walking btree nodes", strerror(-ret));
 
        bch2_trans_exit(&trans);
+       printbuf_exit(&buf);
 }
 
 static void list_keys_usage(void)
@@ -437,7 +292,7 @@ static void list_keys_usage(void)
             "  -f                                    Check (fsck) the filesystem first\n"
             "  -v                                    Verbose mode\n"
             "  -h                                    Display this help and exit\n"
-            "Report bugs to <linux-bcache@vger.kernel.org>");
+            "Report bugs to <linux-bcachefs@vger.kernel.org>");
 }
 
 #define LIST_MODES()           \
@@ -551,70 +406,3 @@ int cmd_list(int argc, char *argv[])
        bch2_fs_stop(c);
        return 0;
 }
-
-static void list_journal_usage(void)
-{
-       puts("bcachefs list_journal - print contents of journal\n"
-            "Usage: bcachefs list_journal [OPTION]... <devices>\n"
-            "\n"
-            "Options:\n"
-            "  -a            Read entire journal, not just dirty entries\n"
-            "  -h            Display this help and exit\n"
-            "Report bugs to <linux-bcache@vger.kernel.org>");
-}
-
-int cmd_list_journal(int argc, char *argv[])
-{
-       struct bch_opts opts = bch2_opts_empty();
-       int opt;
-
-       opt_set(opts, nochanges,        true);
-       opt_set(opts, norecovery,       true);
-       opt_set(opts, degraded,         true);
-       opt_set(opts, errors,           BCH_ON_ERROR_continue);
-       opt_set(opts, fix_errors,       FSCK_OPT_YES);
-       opt_set(opts, keep_journal,     true);
-
-       while ((opt = getopt(argc, argv, "ah")) != -1)
-               switch (opt) {
-               case 'a':
-                       opt_set(opts, read_entire_journal, true);
-                       break;
-               case 'h':
-                       list_journal_usage();
-                       exit(EXIT_SUCCESS);
-               }
-       args_shift(optind);
-
-       if (!argc)
-               die("Please supply device(s) to open");
-
-       struct bch_fs *c = bch2_fs_open(argv, argc, opts);
-       if (IS_ERR(c))
-               die("error opening %s: %s", argv[0], strerror(-PTR_ERR(c)));
-
-       struct journal_replay *p;
-       struct jset_entry *entry;
-
-       list_for_each_entry(p, &c->journal_entries, list) {
-               printf("journal entry   %8llu\n"
-                      "    version     %8u\n"
-                      "    last seq    %8llu\n"
-                      ,
-                      le64_to_cpu(p->j.seq),
-                      le32_to_cpu(p->j.version),
-                      le64_to_cpu(p->j.last_seq));
-
-               vstruct_for_each(&p->j, entry) {
-                       char _buf[4096];
-                       struct printbuf buf = PBUF(_buf);
-
-                       printbuf_indent_push(&buf, 2);
-                       bch2_journal_entry_to_text(&buf, c, entry);
-                       printf("%s\n", _buf);
-               }
-       }
-
-       bch2_fs_stop(c);
-       return 0;
-}