#include "libbcachefs/error.h"
#include "libbcachefs/journal.h"
#include "libbcachefs/journal_io.h"
+#include "libbcachefs/journal_seq_blacklist.h"
#include "libbcachefs/super.h"
static void dump_usage(void)
"Options:\n"
" -o output Output qcow2 image(s)\n"
" -f Force; overwrite when needed\n"
+ " -j Dump entire journal, not just dirty entries\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)
+static void dump_one_device(struct bch_fs *c, struct bch_dev *ca, int fd,
+ bool entire_journal)
{
struct bch_sb *sb = ca->disk_sb.sb;
- ranges data;
+ ranges data = { 0 };
unsigned i;
-
- darray_init(data);
+ int ret;
/* Superblock: */
range_add(&data, BCH_SB_LAYOUT_SECTOR << 9,
/* Journal: */
for (i = 0; i < ca->journal.nr; i++)
- if (ca->journal.bucket_seq[i] >= c->journal.last_seq_ondisk) {
+ if (entire_journal ||
+ ca->journal.bucket_seq[i] >= c->journal.last_seq_ondisk) {
u64 bucket = ca->journal.buckets[i];
range_add(&data,
const struct bch_extent_ptr *ptr;
struct bkey_ptrs_c ptrs;
struct btree_trans trans;
- struct btree_iter *iter;
+ 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) {
+ __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;
}
}
+ 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));
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_exit(&data);
}
int cmd_dump(int argc, char *argv[])
struct bch_dev *ca;
char *out = NULL;
unsigned i, nr_devices = 0;
- bool force = false;
+ bool force = false, entire_journal = 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_YES);
+ opt_set(opts, errors, BCH_ON_ERROR_continue);
+ opt_set(opts, fix_errors, FSCK_OPT_NO);
- while ((opt = getopt(argc, argv, "o:fvh")) != -1)
+ while ((opt = getopt(argc, argv, "o:fjvh")) != -1)
switch (opt) {
case 'o':
out = optarg;
case 'f':
force = true;
break;
+ case 'j':
+ entire_journal = true;
+ break;
case 'v':
opt_set(opts, verbose, true);
break;
fd = xopen(path, flags, 0600);
free(path);
- dump_one_device(c, ca, fd);
+ dump_one_device(c, ca, fd, entire_journal);
close(fd);
}
struct bpos start, struct bpos end)
{
struct btree_trans trans;
- struct btree_iter *iter;
+ 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);
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;
- 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,
+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_iter iter;
struct btree *b;
- char buf[4096];
+ struct printbuf buf = PRINTBUF;
+ int ret;
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, ret) {
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);
+
+ if (ret)
+ 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,
- 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;
+ struct btree_iter iter;
struct btree *b;
- char buf[4096];
+ struct printbuf buf = PRINTBUF;
+ int ret;
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, 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);
+ 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);
+
+ if (ret)
+ 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)
bio_put(bio);
percpu_ref_put(&ca->io_ref);
- while (offset < c->opts.btree_node_size) {
+ while (offset < btree_sectors(c)) {
struct bset *i;
struct nonce nonce;
struct bch_csum csum;
le64_to_cpu(i->journal_seq));
offset += sectors;
- for (k = i->start;
- k != vstruct_last(i);
- k = bkey_next_skip_noops(k, vstruct_last(i))) {
+ for (k = i->start; k != vstruct_last(i); k = bkey_next(k)) {
struct bkey u;
- char buf[4096];
+ struct printbuf buf = PRINTBUF;
+
+ 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);
}
}
free(n_ondisk);
}
-static void list_nodes_ondisk(struct bch_fs *c, enum btree_id btree_id,
+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_iter iter;
struct btree *b;
- char buf[4096];
+ struct printbuf buf = PRINTBUF;
+ int ret;
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, 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);
+ 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);
}
+ bch2_trans_iter_exit(&trans, &iter);
+
+ if (ret)
+ 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,
+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_iter iter;
struct btree_node_iter node_iter;
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);
- for_each_btree_node(&trans, iter, 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;
- 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_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_exit(&trans, &iter);
- if ((field = strsep(&s, ":")) &&
- kstrtoull(field, 10, &offset_v))
- die("invalid bpos %s", buf);
+ if (ret)
+ die("error %s walking btree nodes", strerror(-ret));
- if (s)
- die("invalid bpos %s", buf);
-
- return (struct bpos) { .inode = inode_v, .offset = offset_v };
+ bch2_trans_exit(&trans);
+ printbuf_exit(&buf);
}
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_ondisk",
- "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 = 0;
struct bpos start = POS_MIN, end = POS_MAX;
- u64 inum;
+ u64 inum = 0;
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_ondisk(c, btree_id, start, end);
+ case LIST_MODE_nodes_ondisk:
+ list_nodes_ondisk(c, btree_id, level, start, end);
break;
- case 4:
- list_nodes_keys(c, btree_id, start, end);
+ case LIST_MODE_nodes_keys:
+ list_nodes_keys(c, btree_id, level, start, end);
break;
default:
die("Invalid mode");
"\n"
"Options:\n"
" -a Read entire journal, not just dirty entries\n"
+ " -n Number of journal entries to print, starting from the most recent\n"
" -h Display this help and exit\n"
"Report bugs to <linux-bcache@vger.kernel.org>");
}
+static void star_start_of_lines(char *buf)
+{
+ char *p = buf;
+
+ if (*p == ' ')
+ *p = '*';
+
+ while ((p = strstr(p, "\n ")))
+ p[1] = '*';
+}
+
int cmd_list_journal(int argc, char *argv[])
{
struct bch_opts opts = bch2_opts_empty();
+ u32 nr_entries = U32_MAX;
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, errors, BCH_ON_ERROR_continue);
opt_set(opts, fix_errors, FSCK_OPT_YES);
opt_set(opts, keep_journal, true);
+ opt_set(opts, read_journal_only,true);
- while ((opt = getopt(argc, argv, "ah")) != -1)
+ while ((opt = getopt(argc, argv, "an:h")) != -1)
switch (opt) {
case 'a':
opt_set(opts, read_entire_journal, true);
break;
+ case 'n':
+ nr_entries = kstrtouint(optarg, 10, &nr_entries);
+ opt_set(opts, read_entire_journal, true);
+ break;
case 'h':
list_journal_usage();
exit(EXIT_SUCCESS);
if (IS_ERR(c))
die("error opening %s: %s", argv[0], strerror(-PTR_ERR(c)));
- struct journal_replay *p;
+ struct journal_replay *p, **_p;
+ struct genradix_iter iter;
struct jset_entry *entry;
- struct bkey_i *k, *_n;
+ struct printbuf buf = PRINTBUF;
- /* This could be greatly expanded: */
+ genradix_for_each(&c->journal_entries, iter, _p) {
+ p = *_p;
+ if (!p)
+ continue;
- 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));
+ if (le64_to_cpu(p->j.seq) + nr_entries < atomic64_read(&c->journal.seq))
+ continue;
+
+ bool blacklisted =
+ bch2_journal_seq_is_blacklisted(c,
+ le64_to_cpu(p->j.seq), false);
+
+ if (blacklisted)
+ printf("blacklisted ");
+
+ printf("journal entry %llu\n", le64_to_cpu(p->j.seq));
- for_each_jset_key(k, _n, entry, &p->j) {
- char buf[200];
+ printbuf_reset(&buf);
- 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);
+ pr_buf(&buf,
+ " version %u\n"
+ " last seq %llu\n"
+ " flush %u\n"
+ " written at ",
+ le32_to_cpu(p->j.version),
+ le64_to_cpu(p->j.last_seq),
+ !JSET_NO_FLUSH(&p->j));
+ bch2_journal_ptrs_to_text(&buf, c, p);
+
+ if (blacklisted)
+ star_start_of_lines(buf.buf);
+ printf("%s\n", buf.buf);
+
+ vstruct_for_each(&p->j, entry) {
+ printbuf_reset(&buf);
+
+ /*
+ * log entries denote the start of a new transaction
+ * commit:
+ */
+ if (entry->type == BCH_JSET_ENTRY_log && !entry->level)
+ pr_newline(&buf);
+ pr_indent_push(&buf, 4);
+ bch2_journal_entry_to_text(&buf, c, entry);
+
+ if (blacklisted)
+ star_start_of_lines(buf.buf);
+ printf("%s\n", buf.buf);
}
}
+ printbuf_exit(&buf);
bch2_fs_stop(c);
return 0;
}
+
+static void kill_btree_node_usage(void)
+{
+ puts("bcachefs kill_btree_node - make btree nodes unreadable\n"
+ "Usage: bcachefs kill_btree_node [OPTION]... <devices>\n"
+ "\n"
+ "Options:\n"
+ " -b (extents|inodes|dirents|xattrs) Btree to delete from\n"
+ " -l level Levle to delete from (0 == leaves)\n"
+ " -i index Index of btree node to kill\n"
+ " -h Display this help and exit\n"
+ "Report bugs to <linux-bcache@vger.kernel.org>");
+}
+
+int cmd_kill_btree_node(int argc, char *argv[])
+{
+ struct bch_opts opts = bch2_opts_empty();
+ enum btree_id btree_id = 0;
+ unsigned level = 0;
+ u64 node_index = 0;
+ int opt;
+
+ opt_set(opts, read_only, true);
+
+ while ((opt = getopt(argc, argv, "b:l:i:h")) != -1)
+ switch (opt) {
+ case 'b':
+ btree_id = read_string_list_or_die(optarg,
+ bch2_btree_ids, "btree id");
+ break;
+ case 'l':
+ if (kstrtouint(optarg, 10, &level) || level >= BTREE_MAX_DEPTH)
+ die("invalid level");
+ break;
+ case 'i':
+ if (kstrtoull(optarg, 10, &node_index))
+ die("invalid index %s", optarg);
+ break;
+ case 'h':
+ kill_btree_node_usage();
+ exit(EXIT_SUCCESS);
+ }
+ args_shift(optind);
+
+ 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)));
+
+ struct btree_trans trans;
+ struct btree_iter iter;
+ struct btree *b;
+ int ret;
+ void *zeroes;
+
+ ret = posix_memalign(&zeroes, c->opts.block_size, c->opts.block_size);
+ if (ret)
+ die("error %s from posix_memalign", strerror(ret));
+
+ bch2_trans_init(&trans, c, 0, 0);
+
+ __for_each_btree_node(&trans, iter, btree_id, POS_MIN, 0, level, 0, b, ret) {
+ if (b->c.level != level)
+ continue;
+
+ if (!node_index) {
+ struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(bkey_i_to_s_c(&b->key));
+ const struct bch_extent_ptr *ptr;
+
+ struct printbuf buf = PRINTBUF;
+
+ bch2_bkey_val_to_text(&buf, c, bkey_i_to_s_c(&b->key));
+ bch_info(c, "killing btree node %s", buf.buf);
+ printbuf_exit(&buf);
+
+ bkey_for_each_ptr(ptrs, ptr) {
+ struct bch_dev *ca = bch_dev_bkey_exists(c, ptr->dev);
+
+ ret = pwrite(ca->disk_sb.bdev->bd_fd, zeroes,
+ c->opts.block_size, ptr->offset << 9);
+ if (ret != c->opts.block_size) {
+ bch_err(c, "pwrite error: expected %u got %i %s",
+ c->opts.block_size, ret, strerror(errno));
+ ret = EXIT_FAILURE;
+ goto done;
+ }
+ }
+ goto done;
+ }
+
+ node_index--;
+ }
+ if (ret)
+ bch_err(c, "error %i walking btree nodes", ret);
+ else
+ bch_err(c, "node at specified index not found");
+ ret = EXIT_FAILURE;
+done:
+ bch2_trans_iter_exit(&trans, &iter);
+ bch2_trans_exit(&trans);
+
+ bch2_fs_stop(c);
+ return ret;
+}
projects / bcachefs-tools-debian / blobdiff