#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"
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, errors, BCH_ON_ERROR_continue);
opt_set(opts, fix_errors, FSCK_OPT_YES);
while ((opt = getopt(argc, argv, "o:fvh")) != -1)
bch2_bkey_val_to_text(&PBUF(buf), c, k);
puts(buf);
}
+ bch2_trans_iter_put(&trans, iter);
+
bch2_trans_exit(&trans);
}
-static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id,
+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;
bch2_trans_init(&trans, c, 0, 0);
- for_each_btree_node(&trans, iter, btree_id, start, 0, b) {
+ __for_each_btree_node(&trans, iter, btree_id, start, 0, level, 0, b) {
if (bkey_cmp(b->key.k.p, end) > 0)
break;
bch2_btree_node_to_text(&PBUF(buf), c, b);
puts(buf);
}
+ bch2_trans_iter_put(&trans, iter);
+
bch2_trans_exit(&trans);
}
-static void list_nodes(struct bch_fs *c, enum btree_id btree_id,
- struct bpos start, struct bpos end)
+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;
bch2_trans_init(&trans, c, 0, 0);
- for_each_btree_node(&trans, iter, btree_id, start, 0, b) {
+ __for_each_btree_node(&trans, iter, btree_id, start, 0, level, 0, b) {
if (bkey_cmp(b->key.k.p, end) > 0)
break;
fputs(buf, stdout);
putchar('\n');
}
+ bch2_trans_iter_put(&trans, iter);
+
bch2_trans_exit(&trans);
}
-static void list_nodes_keys(struct bch_fs *c, enum btree_id btree_id,
+static void print_node_ondisk(struct bch_fs *c, struct btree *b)
+{
+ 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 (!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, 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];
+
+ bch2_trans_init(&trans, c, 0, 0);
+
+ __for_each_btree_node(&trans, iter, btree_id, start, 0, level, 0, b) {
+ 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_put(&trans, iter);
+
+ 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;
bch2_trans_init(&trans, c, 0, 0);
- for_each_btree_node(&trans, iter, btree_id, start, 0, b) {
+ __for_each_btree_node(&trans, iter, btree_id, start, 0, level, 0, b) {
if (bkey_cmp(b->key.k.p, end) > 0)
break;
puts(buf);
}
}
- bch2_trans_exit(&trans);
-}
-
-static struct bpos parse_pos(char *buf)
-{
- char *s = buf, *field;
- u64 inode_v = 0, offset_v = 0;
-
- if (!(field = strsep(&s, ":")) ||
- kstrtoull(field, 10, &inode_v))
- die("invalid bpos %s", buf);
+ bch2_trans_iter_put(&trans, iter);
- if ((field = strsep(&s, ":")) &&
- kstrtoull(field, 10, &offset_v))
- die("invalid bpos %s", buf);
-
- if (s)
- die("invalid bpos %s", buf);
-
- return (struct bpos) { .inode = inode_v, .offset = offset_v };
+ bch2_trans_exit(&trans);
}
static void list_keys_usage(void)
"\n"
"Options:\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) List mode\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[] = {
- "keys",
- "formats",
- "nodes",
- "nodes_keys",
+#define x(n) #n,
+ LIST_MODES()
+#undef x
NULL
};
enum btree_id btree_id_start = 0;
enum btree_id btree_id_end = BTREE_ID_NR;
enum btree_id btree_id;
+ unsigned level;
struct bpos start = POS_MIN, end = POS_MAX;
u64 inum;
int mode = 0, 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, errors, BCH_ON_ERROR_continue);
- while ((opt = getopt(argc, argv, "b:s:e:i:m:fvh")) != -1)
+ while ((opt = getopt(argc, argv, "b:l:s:e:i:m:fvh")) != -1)
switch (opt) {
case 'b':
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))
btree_id < btree_id_end;
btree_id++) {
switch (mode) {
- case 0:
+ case LIST_MODE_keys:
list_keys(c, btree_id, start, end);
break;
- case 1:
- list_btree_formats(c, btree_id, start, end);
+ case LIST_MODE_formats:
+ list_btree_formats(c, btree_id, level, start, end);
break;
- case 2:
- list_nodes(c, btree_id, start, end);
+ case LIST_MODE_nodes:
+ list_nodes(c, btree_id, level, start, end);
break;
- case 3:
- list_nodes_keys(c, btree_id, start, end);
+ 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");
"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>");
}
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, errors, BCH_ON_ERROR_continue);
opt_set(opts, fix_errors, FSCK_OPT_YES);
opt_set(opts, keep_journal, true);
- while ((opt = getopt(argc, argv, "h")) != -1)
+ 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);
printf("journal entry %8llu\n"
" version %8u\n"
" last seq %8llu\n"
- " read clock %8u\n"
- " write clock %8u\n"
,
le64_to_cpu(p->j.seq),
- le32_to_cpu(p->j.seq),
- le64_to_cpu(p->j.last_seq),
- le16_to_cpu(p->j.read_clock),
- le16_to_cpu(p->j.write_clock));
+ 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];
projects / bcachefs-tools-debian / blobdiff