#include <sys/types.h>
#include "cmds.h"
-#include "libbcache.h"
+#include "libbcachefs.h"
#include "qcow2.h"
#include "tools-util.h"
-#include "bcache.h"
-#include "alloc.h"
-#include "btree_cache.h"
-#include "btree_iter.h"
-#include "buckets.h"
-#include "journal.h"
-#include "super.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/super.h"
static void dump_usage(void)
{
- puts("bcache dump - dump filesystem metadata\n"
- "Usage: bcache dump [OPTION]... <devices>\n"
+ 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 cache_set *c, struct cache *ca, int fd)
+static void dump_one_device(struct bch_fs *c, struct bch_dev *ca, int fd)
{
struct bch_sb *sb = ca->disk_sb.sb;
- sparse_data data;
+ ranges data;
unsigned i;
+ int ret;
darray_init(data);
/* Superblock: */
- data_add(&data, BCH_SB_LAYOUT_SECTOR << 9,
- sizeof(struct bch_sb_layout));
+ range_add(&data, BCH_SB_LAYOUT_SECTOR << 9,
+ sizeof(struct bch_sb_layout));
for (i = 0; i < sb->layout.nr_superblocks; i++)
- data_add(&data,
- le64_to_cpu(sb->layout.sb_offset[i]) << 9,
- vstruct_bytes(sb));
+ 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];
- data_add(&data,
- bucket_bytes(ca) * bucket,
- bucket_bytes(ca));
+ range_add(&data,
+ bucket_bytes(ca) * bucket,
+ bucket_bytes(ca));
}
- /* Prios/gens: */
- for (i = 0; i < prio_buckets(ca); i++)
- data_add(&data,
- bucket_bytes(ca) * ca->prio_last_buckets[i],
- 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;
- for_each_btree_node(&iter, c, i, POS_MIN, 0, b) {
- struct bkey_s_c_extent e = bkey_i_to_s_c_extent(&b->key);
+ 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));
- extent_for_each_ptr(e, ptr)
+ 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)
- data_add(&data,
- ptr->offset << 9,
- b->written << 9);
+ range_add(&data,
+ ptr->offset << 9,
+ btree_bytes(c));
}
- bch_btree_iter_unlock(&iter);
+
+ 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 = bch_opts_empty();
- struct cache_set *c = NULL;
- const char *err;
- char *out = NULL, *buf;
+ 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;
- opts.nochanges = true;
- opts.noreplay = true;
- opts.errors = BCH_ON_ERROR_CONTINUE;
- fsck_err_opt = FSCK_ERR_NO;
+ 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:fh")) != -1)
+ while ((opt = getopt(argc, argv, "o:fvh")) != -1)
switch (opt) {
case 'o':
out = optarg;
case 'f':
force = true;
break;
+ case 'v':
+ opt_set(opts, verbose, true);
+ break;
case 'h':
dump_usage();
exit(EXIT_SUCCESS);
}
-
- if (optind >= argc)
- die("Please supply device(s) to check");
+ args_shift(optind);
if (!out)
die("Please supply output filename");
- buf = alloca(strlen(out) + 10);
- strcpy(buf, out);
+ if (!argc)
+ die("Please supply device(s) to check");
- err = bch_fs_open(argv + optind, argc - optind, opts, &c);
- if (err)
- die("error opening %s: %s", argv[optind], err);
+ 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 (i = 0; i < c->sb.nr_devices; i++)
- if (c->cache[i])
- nr_devices++;
+ for_each_online_member(ca, c, i)
+ nr_devices++;
BUG_ON(!nr_devices);
- for (i = 0; i < c->sb.nr_devices; i++) {
- int mode = O_WRONLY|O_CREAT|O_TRUNC;
+ for_each_online_member(ca, c, i) {
+ int flags = O_WRONLY|O_CREAT|O_TRUNC;
if (!force)
- mode |= O_EXCL;
+ flags |= O_EXCL;
- if (!c->cache[i])
+ if (!c->devs[i])
continue;
- if (nr_devices > 1)
- sprintf(buf, "%s.%u", out, i);
+ char *path = nr_devices > 1
+ ? mprintf("%s.%u", out, i)
+ : strdup(out);
+ fd = xopen(path, flags, 0600);
+ free(path);
- fd = open(buf, mode, 0600);
- if (fd < 0)
- die("error opening %s: %s", buf, strerror(errno));
-
- dump_one_device(c, c->cache[i], fd);
+ dump_one_device(c, ca, fd);
close(fd);
}
up_read(&c->gc_lock);
- bch_fs_stop_sync(c);
+ bch2_fs_stop(c);
return 0;
}
-static void list_keys(struct cache_set *c, enum btree_id btree_id,
- struct bpos start, struct bpos end, int mode)
+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];
+ int ret;
+
+ bch2_trans_init(&trans, c, 0, 0);
- for_each_btree_key(&iter, c, btree_id, start, k) {
+ for_each_btree_key(&trans, iter, btree_id, start,
+ BTREE_ITER_ALL_SNAPSHOTS|
+ BTREE_ITER_PREFETCH, k, ret) {
if (bkey_cmp(k.k->p, end) > 0)
break;
- bch_bkey_val_to_text(c, bkey_type(0, btree_id),
- buf, sizeof(buf), k);
+ bch2_bkey_val_to_text(&PBUF(buf), c, k);
puts(buf);
}
- bch_btree_iter_unlock(&iter);
+ bch2_trans_iter_exit(&trans, &iter);
+
+ bch2_trans_exit(&trans);
}
-static void list_btree_formats(struct cache_set *c, enum btree_id btree_id,
- struct bpos start, struct bpos end, int mode)
+static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id, unsigned level,
+ struct bpos start, struct bpos end)
{
+ struct btree_trans trans;
struct btree_iter iter;
struct btree *b;
char buf[4096];
+ int ret;
+
+ bch2_trans_init(&trans, c, 0, 0);
- for_each_btree_node(&iter, c, btree_id, start, 0, b) {
+ __for_each_btree_node(&trans, iter, btree_id, start, 0, level, 0, b, ret) {
if (bkey_cmp(b->key.k.p, end) > 0)
break;
- bch_print_btree_node(c, b, buf, sizeof(buf));
+ bch2_btree_node_to_text(&PBUF(buf), c, b);
puts(buf);
}
- bch_btree_iter_unlock(&iter);
+ bch2_trans_iter_exit(&trans, &iter);
+
+ if (ret)
+ die("error %s walking btree nodes", strerror(-ret));
+
+ bch2_trans_exit(&trans);
+}
+
+static void list_nodes(struct bch_fs *c, enum btree_id btree_id, unsigned level,
+ struct bpos start, struct bpos end)
+{
+ struct btree_trans trans;
+ struct btree_iter iter;
+ struct btree *b;
+ char buf[4096];
+ int ret;
+
+ bch2_trans_init(&trans, c, 0, 0);
+
+ __for_each_btree_node(&trans, iter, btree_id, start, 0, level, 0, b, ret) {
+ 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);
+ putchar('\n');
+ }
+ bch2_trans_iter_exit(&trans, &iter);
+
+ if (ret)
+ die("error %s walking btree nodes", strerror(-ret));
+
+ bch2_trans_exit(&trans);
}
-static struct bpos parse_pos(char *buf)
+static void print_node_ondisk(struct bch_fs *c, struct btree *b)
{
- char *s = buf;
- char *inode = strsep(&s, ":");
- char *offset = strsep(&s, ":");
- struct bpos ret = { 0 };
+ struct btree_node *n_ondisk;
+ struct extent_ptr_decoded pick;
+ struct bch_dev *ca;
+ struct bio *bio;
+ unsigned offset = 0;
+
+ 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");
+ return;
+ }
+
+ ca = bch_dev_bkey_exists(c, pick.ptr.dev);
+ if (!bch2_dev_get_ioref(ca, READ)) {
+ printf("error getting device to read from\n");
+ return;
+ }
+
+ n_ondisk = malloc(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->bi_iter.bi_sector = pick.ptr.offset;
+ bch2_bio_map(bio, n_ondisk, btree_bytes(c));
+
+ submit_bio_wait(bio);
+
+ bio_put(bio);
+ percpu_ref_put(&ca->io_ref);
+
+ while (offset < c->opts.btree_node_size) {
+ struct bset *i;
+ struct nonce nonce;
+ struct bch_csum csum;
+ struct bkey_packed *k;
+ unsigned sectors;
+
+ if (!offset) {
+ i = &n_ondisk->keys;
+
+ if (!bch2_checksum_type_valid(c, BSET_CSUM_TYPE(i)))
+ die("unknown checksum type");
+
+ nonce = btree_nonce(i, offset << 9);
+ csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, n_ondisk);
+
+ if (bch2_crc_cmp(csum, n_ondisk->csum))
+ die("invalid checksum\n");
+
+ bset_encrypt(c, i, offset << 9);
+
+ sectors = vstruct_sectors(n_ondisk, c->block_bits);
+ } else {
+ struct btree_node_entry *bne = (void *) n_ondisk + (offset << 9);
+
+ i = &bne->keys;
+
+ if (i->seq != n_ondisk->keys.seq)
+ break;
- if (!inode || !offset || s ||
- kstrtoull(inode, 10, &ret.inode) ||
- kstrtoull(offset, 10, &ret.offset))
- die("invalid bpos %s", buf);
+ if (!bch2_checksum_type_valid(c, BSET_CSUM_TYPE(i)))
+ die("unknown checksum type");
- return ret;
+ nonce = btree_nonce(i, offset << 9);
+ csum = csum_vstruct(c, BSET_CSUM_TYPE(i), nonce, bne);
+
+ if (bch2_crc_cmp(csum, bne->csum))
+ die("invalid checksum");
+
+ bset_encrypt(c, i, offset << 9);
+
+ sectors = vstruct_sectors(bne, c->block_bits);
+ }
+
+ fprintf(stdout, " offset %u version %u, journal seq %llu\n",
+ offset,
+ le16_to_cpu(i->version),
+ le64_to_cpu(i->journal_seq));
+ offset += sectors;
+
+ for (k = i->start; k != vstruct_last(i); k = bkey_next(k)) {
+ struct bkey u;
+ char buf[4096];
+
+ bch2_bkey_val_to_text(&PBUF(buf), c, bkey_disassemble(b, k, &u));
+ fprintf(stdout, " %s\n", buf);
+ }
+ }
+
+ free(n_ondisk);
+}
+
+static void list_nodes_ondisk(struct bch_fs *c, enum btree_id btree_id, unsigned level,
+ struct bpos start, struct bpos end)
+{
+ struct btree_trans trans;
+ struct btree_iter iter;
+ struct btree *b;
+ char buf[4096];
+ int ret;
+
+ bch2_trans_init(&trans, c, 0, 0);
+
+ __for_each_btree_node(&trans, iter, btree_id, start, 0, level, 0, b, ret) {
+ 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);
+ putchar('\n');
+
+ print_node_ondisk(c, b);
+ }
+ bch2_trans_iter_exit(&trans, &iter);
+
+ if (ret)
+ die("error %s walking btree nodes", strerror(-ret));
+
+ bch2_trans_exit(&trans);
+}
+
+static void list_nodes_keys(struct bch_fs *c, enum btree_id btree_id, unsigned level,
+ struct bpos start, struct bpos end)
+{
+ struct btree_trans trans;
+ struct btree_iter iter;
+ struct btree_node_iter node_iter;
+ struct bkey unpacked;
+ struct bkey_s_c k;
+ struct btree *b;
+ char buf[4096];
+ int ret;
+
+ bch2_trans_init(&trans, c, 0, 0);
+
+ __for_each_btree_node(&trans, iter, btree_id, start, 0, level, 0, b, ret) {
+ if (bkey_cmp(b->key.k.p, end) > 0)
+ break;
+
+ bch2_btree_node_to_text(&PBUF(buf), c, b);
+ fputs(buf, stdout);
+
+ for_each_btree_node_key_unpack(b, k, &node_iter, &unpacked) {
+ bch2_bkey_val_to_text(&PBUF(buf), c, k);
+ putchar('\t');
+ puts(buf);
+ }
+ }
+ bch2_trans_iter_exit(&trans, &iter);
+
+ if (ret)
+ die("error %s walking btree nodes", strerror(-ret));
+
+ bch2_trans_exit(&trans);
}
static void list_keys_usage(void)
{
- puts("bcache list_keys - list filesystem metadata to stdout\n"
- "Usage: bcache list_keys [OPTION]... <devices>\n"
+ puts("bcachefs list - list filesystem metadata to stdout\n"
+ "Usage: bcachefs list [OPTION]... <devices>\n"
"\n"
"Options:\n"
- " -b btree_id Integer btree id to list\n"
- " -s start Start pos (as inode:offset)\n"
- " -e end End pos\n"
- " -m mode Mode for listing\n"
- " -h Display this help and exit\n"
+ " -b (extents|inodes|dirents|xattrs) Btree to list from\n"
+ " -l level Btree depth to descend to (0 == leaves)\n"
+ " -s inode:offset Start position to list from\n"
+ " -e inode:offset End position\n"
+ " -i inode List keys for a given inode number\n"
+ " -m (keys|formats|nodes|nodes_ondisk|nodes_keys)\n"
+ " List mode\n"
+ " -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>");
}
+#define LIST_MODES() \
+ x(keys) \
+ x(formats) \
+ x(nodes) \
+ x(nodes_ondisk) \
+ x(nodes_keys)
+
+enum list_modes {
+#define x(n) LIST_MODE_##n,
+ LIST_MODES()
+#undef x
+};
+
+static const char * const list_modes[] = {
+#define x(n) #n,
+ LIST_MODES()
+#undef x
+ NULL
+};
+
int cmd_list(int argc, char *argv[])
{
- struct bch_opts opts = bch_opts_empty();
- struct cache_set *c = NULL;
- enum btree_id btree_id = BTREE_ID_EXTENTS;
+ struct bch_opts opts = bch2_opts_empty();
+ enum btree_id btree_id_start = 0;
+ enum btree_id btree_id_end = BTREE_ID_NR;
+ enum btree_id btree_id;
+ unsigned level = 0;
struct bpos start = POS_MIN, end = POS_MAX;
- const char *err;
+ u64 inum = 0;
int mode = 0, opt;
- u64 v;
- opts.nochanges = true;
- opts.norecovery = true;
- opts.errors = BCH_ON_ERROR_CONTINUE;
- fsck_err_opt = FSCK_ERR_NO;
+ opt_set(opts, nochanges, true);
+ opt_set(opts, norecovery, true);
+ opt_set(opts, degraded, true);
+ opt_set(opts, errors, BCH_ON_ERROR_continue);
- while ((opt = getopt(argc, argv, "b:s:e:m:h")) != -1)
+ while ((opt = getopt(argc, argv, "b:l:s:e:i:m:fvh")) != -1)
switch (opt) {
case 'b':
- if (kstrtoull(optarg, 10, &v) ||
- v >= BTREE_ID_NR)
- die("invalid btree id");
- btree_id = v;
+ btree_id_start = read_string_list_or_die(optarg,
+ bch2_btree_ids, "btree id");
+ btree_id_end = btree_id_start + 1;
+ break;
+ case 'l':
+ if (kstrtouint(optarg, 10, &level) || level >= BTREE_MAX_DEPTH)
+ die("invalid level");
break;
case 's':
- start = parse_pos(optarg);
+ start = bpos_parse(optarg);
break;
case 'e':
- end = parse_pos(optarg);
+ end = bpos_parse(optarg);
+ break;
+ case 'i':
+ if (kstrtoull(optarg, 10, &inum))
+ die("invalid inode %s", optarg);
+ start = POS(inum, 0);
+ end = POS(inum + 1, 0);
break;
case 'm':
+ mode = read_string_list_or_die(optarg,
+ list_modes, "list mode");
+ break;
+ case 'f':
+ opt_set(opts, fix_errors, FSCK_OPT_YES);
+ opt_set(opts, norecovery, false);
+ break;
+ case 'v':
+ opt_set(opts, verbose, true);
break;
case 'h':
list_keys_usage();
exit(EXIT_SUCCESS);
}
+ args_shift(optind);
- if (optind >= argc)
- die("Please supply device(s) to check");
+ if (!argc)
+ die("Please supply device(s)");
+
+ 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)));
+
+
+ for (btree_id = btree_id_start;
+ btree_id < btree_id_end;
+ btree_id++) {
+ switch (mode) {
+ case LIST_MODE_keys:
+ list_keys(c, btree_id, start, end);
+ break;
+ case LIST_MODE_formats:
+ list_btree_formats(c, btree_id, level, start, end);
+ break;
+ case LIST_MODE_nodes:
+ list_nodes(c, btree_id, level, start, end);
+ break;
+ case LIST_MODE_nodes_ondisk:
+ list_nodes_ondisk(c, btree_id, level, start, end);
+ break;
+ case LIST_MODE_nodes_keys:
+ list_nodes_keys(c, btree_id, level, start, end);
+ break;
+ default:
+ die("Invalid mode");
+ }
+ }
- err = bch_fs_open(argv + optind, argc - optind, opts, &c);
- if (err)
- die("error opening %s: %s", argv[optind], err);
-
- switch (mode) {
- case 0:
- list_keys(c, btree_id, start, end, mode);
- break;
- case 1:
- list_btree_formats(c, btree_id, start, end, mode);
- break;
- default:
- die("Invalid mode");
+ 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;
+ struct bkey_i *k, *_n;
+
+ /* This could be greatly expanded: */
+
+ 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));
+
+ for_each_jset_key(k, _n, entry, &p->j) {
+ char buf[200];
+
+ bch2_bkey_val_to_text(&PBUF(buf), c, bkey_i_to_s_c(k));
+ printf("btree %s l %u: %s\n",
+ bch2_btree_ids[entry->btree_id],
+ entry->level,
+ buf);
+ }
}
- bch_fs_stop_sync(c);
+ bch2_fs_stop(c);
return 0;
}
projects / bcachefs-tools-debian / blobdiff