X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cmd_migrate.c;h=51260906dccd95f71ed71627095dbe187777ba47;hb=edc3ffe8f25506e60218aa6eb5cbcd3a019f6210;hp=4b0dd9bca97f24effa315fb179956703d9637e04;hpb=b9845593296c2e9cc53780fb2ad80ddaf26862d1;p=bcachefs-tools-debian diff --git a/cmd_migrate.c b/cmd_migrate.c index 4b0dd9b..5126090 100644 --- a/cmd_migrate.c +++ b/cmd_migrate.c @@ -1,15 +1,15 @@ -#include +#include #include #include #include #include +#include #include #include #include #include #include #include -#include #include #include @@ -24,16 +24,22 @@ #include #include #include -#include "bcachefs.h" -#include "btree_update.h" -#include "buckets.h" -#include "dirent.h" -#include "fs.h" -#include "inode.h" -#include "io.h" -#include "str_hash.h" -#include "super.h" -#include "xattr.h" +#include "libbcachefs/bcachefs.h" +#include "libbcachefs/alloc_background.h" +#include "libbcachefs/alloc_foreground.h" +#include "libbcachefs/btree_update.h" +#include "libbcachefs/buckets.h" +#include "libbcachefs/dirent.h" +#include "libbcachefs/fs-common.h" +#include "libbcachefs/inode.h" +#include "libbcachefs/io.h" +#include "libbcachefs/replicas.h" +#include "libbcachefs/str_hash.h" +#include "libbcachefs/super.h" +#include "libbcachefs/xattr.h" + +/* XXX cut and pasted from fsck.c */ +#define QSTR(n) { { { .len = strlen(n) } }, .name = n } static char *dev_t_to_path(dev_t dev) { @@ -58,7 +64,7 @@ static char *dev_t_to_path(dev_t dev) return mprintf("/dev/%s", p); } -static bool path_is_fs_root(char *path) +static bool path_is_fs_root(const char *path) { char *line = NULL, *p, *mount; size_t n = 0; @@ -97,7 +103,6 @@ static void mark_unreserved_space(struct bch_fs *c, ranges extents) struct range i; for_each_hole(iter, extents, bucket_to_sector(ca, ca->mi.nbuckets) << 9, i) { - struct bucket_mark new; u64 b; if (i.start == i.end) @@ -105,7 +110,7 @@ static void mark_unreserved_space(struct bch_fs *c, ranges extents) b = sector_to_bucket(ca, i.start >> 9); do { - bucket_cmpxchg(&ca->buckets[b], new, new.nouse = 1); + set_bit(b, ca->buckets_nouse); b++; } while (bucket_to_sector(ca, b) << 9 < i.end); } @@ -117,42 +122,26 @@ static void update_inode(struct bch_fs *c, struct bkey_inode_buf packed; int ret; - bch2_inode_pack(&packed, inode); - ret = bch2_btree_update(c, BTREE_ID_INODES, &packed.inode.k_i, NULL); + bch2_inode_pack(c, &packed, inode); + ret = bch2_btree_insert(c, BTREE_ID_inodes, &packed.inode.k_i, + NULL, NULL, 0); if (ret) - die("error creating file: %s", strerror(-ret)); -} - -static void create_dirent(struct bch_fs *c, - struct bch_inode_unpacked *parent, - const char *name, u64 inum, mode_t mode) -{ - struct bch_hash_info parent_hash_info = bch2_hash_info_init(c, parent); - struct qstr qname = { { { .len = strlen(name), } }, .name = name }; - - int ret = bch2_dirent_create(c, parent->bi_inum, &parent_hash_info, - mode_to_type(mode), &qname, - inum, NULL, BCH_HASH_SET_MUST_CREATE); - if (ret) - die("error creating file: %s", strerror(-ret)); - - if (S_ISDIR(mode)) - parent->bi_nlink++; + die("error updating inode: %s", strerror(-ret)); } static void create_link(struct bch_fs *c, struct bch_inode_unpacked *parent, const char *name, u64 inum, mode_t mode) { + struct qstr qstr = QSTR(name); + struct bch_inode_unpacked parent_u; struct bch_inode_unpacked inode; - int ret = bch2_inode_find_by_inum(c, inum, &inode); - if (ret) - die("error looking up hardlink: %s", strerror(-ret)); - - inode.bi_nlink++; - update_inode(c, &inode); - create_dirent(c, parent, name, inum, mode); + int ret = bch2_trans_do(c, NULL, NULL, 0, + bch2_link_trans(&trans, parent->bi_inum, inum, + &parent_u, &inode, &qstr)); + if (ret) + die("error creating hardlink: %s", strerror(-ret)); } static struct bch_inode_unpacked create_file(struct bch_fs *c, @@ -161,18 +150,17 @@ static struct bch_inode_unpacked create_file(struct bch_fs *c, uid_t uid, gid_t gid, mode_t mode, dev_t rdev) { + struct qstr qstr = QSTR(name); struct bch_inode_unpacked new_inode; - int ret; - bch2_inode_init(c, &new_inode, uid, gid, mode, rdev); - - ret = bch2_inode_create(c, &new_inode, BLOCKDEV_INODE_MAX, 0, - &c->unused_inode_hint); + int ret = bch2_trans_do(c, NULL, NULL, 0, + bch2_create_trans(&trans, + parent->bi_inum, parent, + &new_inode, &qstr, + uid, gid, mode, rdev, NULL, NULL)); if (ret) die("error creating file: %s", strerror(-ret)); - create_dirent(c, parent, name, new_inode.bi_inum, mode); - return new_inode; } @@ -182,13 +170,13 @@ static struct bch_inode_unpacked create_file(struct bch_fs *c, (handler) != NULL; \ (handler) = *(handlers)++) -static const struct xattr_handler *xattr_resolve_name(const char **name) +static const struct xattr_handler *xattr_resolve_name(char **name) { const struct xattr_handler **handlers = bch2_xattr_handlers; const struct xattr_handler *handler; for_each_xattr_handler(handlers, handler) { - const char *n; + char *n; n = strcmp_prefix(*name, xattr_prefix(handler)); if (n) { @@ -222,7 +210,7 @@ static void copy_xattrs(struct bch_fs *c, struct bch_inode_unpacked *dst, if (attrs_size < 0) die("listxattr error: %m"); - const char *next, *attr; + char *next, *attr; for (attr = attrs; attr < attrs + attrs_size; attr = next) { @@ -236,20 +224,24 @@ static void copy_xattrs(struct bch_fs *c, struct bch_inode_unpacked *dst, const struct xattr_handler *h = xattr_resolve_name(&attr); - int ret = __bch2_xattr_set(c, dst->bi_inum, &hash_info, attr, - val, val_size, 0, h->flags, NULL); + int ret = bch2_trans_do(c, NULL, NULL, 0, + bch2_xattr_set(&trans, dst->bi_inum, &hash_info, attr, + val, val_size, h->flags, 0)); if (ret < 0) die("error creating xattr: %s", strerror(-ret)); } } +static char buf[1 << 20] __aligned(PAGE_SIZE); + static void write_data(struct bch_fs *c, struct bch_inode_unpacked *dst_inode, u64 dst_offset, void *buf, size_t len) { - struct disk_reservation res; - struct bch_write_op op; - struct bio_vec bv; + struct { + struct bch_write_op op; + struct bio_vec bv[sizeof(buf) / PAGE_SIZE]; + } o; struct closure cl; BUG_ON(dst_offset & (block_bytes(c) - 1)); @@ -257,33 +249,37 @@ static void write_data(struct bch_fs *c, closure_init_stack(&cl); - bio_init(&op.wbio.bio, &bv, 1); - op.wbio.bio.bi_iter.bi_size = len; - bch2_bio_map(&op.wbio.bio, buf); + bio_init(&o.op.wbio.bio, o.bv, ARRAY_SIZE(o.bv)); + bch2_bio_map(&o.op.wbio.bio, buf, len); + + bch2_write_op_init(&o.op, c, bch2_opts_to_inode_opts(c->opts)); + o.op.write_point = writepoint_hashed(0); + o.op.nr_replicas = 1; + o.op.pos = POS(dst_inode->bi_inum, dst_offset >> 9); - int ret = bch2_disk_reservation_get(c, &res, len >> 9, 0); + int ret = bch2_disk_reservation_get(c, &o.op.res, len >> 9, + c->opts.data_replicas, 0); if (ret) die("error reserving space in new filesystem: %s", strerror(-ret)); - bch2_write_op_init(&op, c, res, c->write_points, - POS(dst_inode->bi_inum, dst_offset >> 9), NULL, 0); - closure_call(&op.cl, bch2_write, NULL, &cl); + closure_call(&o.op.cl, bch2_write, NULL, &cl); closure_sync(&cl); dst_inode->bi_sectors += len >> 9; } -static char buf[1 << 20] __aligned(PAGE_SIZE); - static void copy_data(struct bch_fs *c, struct bch_inode_unpacked *dst_inode, int src_fd, u64 start, u64 end) { while (start < end) { unsigned len = min_t(u64, end - start, sizeof(buf)); + unsigned pad = round_up(len, block_bytes(c)) - len; xpread(src_fd, buf, len, start); - write_data(c, dst_inode, start, buf, len); + memset(buf + len, 0, pad); + + write_data(c, dst_inode, start, buf, len + pad); start += len; } } @@ -305,8 +301,8 @@ static void link_data(struct bch_fs *c, struct bch_inode_unpacked *dst, while (length) { struct bkey_i_extent *e; - BKEY_PADDED(k) k; - u64 b = sector_to_bucket(ca, physical >> 9); + __BKEY_PADDED(k, BKEY_EXTENT_VAL_U64s_MAX) k; + u64 b = sector_to_bucket(ca, physical); struct disk_reservation res; unsigned sectors; int ret; @@ -319,22 +315,22 @@ static void link_data(struct bch_fs *c, struct bch_inode_unpacked *dst, e->k.p.inode = dst->bi_inum; e->k.p.offset = logical + sectors; e->k.size = sectors; - extent_ptr_append(e, (struct bch_extent_ptr) { + bch2_bkey_append_ptr(&e->k_i, (struct bch_extent_ptr) { .offset = physical, .dev = 0, - .gen = ca->buckets[b].mark.gen, + .gen = bucket(ca, b)->mark.gen, }); - ret = bch2_disk_reservation_get(c, &res, sectors, + ret = bch2_disk_reservation_get(c, &res, sectors, 1, BCH_DISK_RESERVATION_NOFAIL); if (ret) die("error reserving space in new filesystem: %s", strerror(-ret)); - bch2_check_mark_super(c, extent_i_to_s_c(e), false); + bch2_mark_bkey_replicas(c, extent_i_to_s_c(e).s_c); - ret = bch2_btree_insert(c, BTREE_ID_EXTENTS, &e->k_i, - &res, NULL, NULL, 0); + ret = bch2_btree_insert(c, BTREE_ID_extents, &e->k_i, + &res, NULL, 0); if (ret) die("btree insert error %s", strerror(-ret)); @@ -358,18 +354,19 @@ static void copy_link(struct bch_fs *c, struct bch_inode_unpacked *dst, } static void copy_file(struct bch_fs *c, struct bch_inode_unpacked *dst, - int src, char *src_path, ranges *extents) + int src_fd, u64 src_size, + char *src_path, ranges *extents) { struct fiemap_iter iter; struct fiemap_extent e; - fiemap_for_each(src, iter, e) + fiemap_for_each(src_fd, iter, e) if (e.fe_flags & FIEMAP_EXTENT_UNKNOWN) { - fsync(src); + fsync(src_fd); break; } - fiemap_for_each(src, iter, e) { + fiemap_for_each(src_fd, iter, e) { if ((e.fe_logical & (block_bytes(c) - 1)) || (e.fe_length & (block_bytes(c) - 1))) die("Unaligned extent in %s - can't handle", src_path); @@ -378,20 +375,20 @@ static void copy_file(struct bch_fs *c, struct bch_inode_unpacked *dst, FIEMAP_EXTENT_ENCODED| FIEMAP_EXTENT_NOT_ALIGNED| FIEMAP_EXTENT_DATA_INLINE)) { - copy_data(c, dst, - src, - round_down(e.fe_logical, block_bytes(c)), - round_up(e.fe_logical + e.fe_length, - block_bytes(c))); + copy_data(c, dst, src_fd, e.fe_logical, + min(src_size - e.fe_logical, + e.fe_length)); continue; } + /* + * if the data is below 1 MB, copy it so it doesn't conflict + * with bcachefs's potentially larger superblock: + */ if (e.fe_physical < 1 << 20) { - copy_data(c, dst, - src, - round_down(e.fe_logical, block_bytes(c)), - round_up(e.fe_logical + e.fe_length, - block_bytes(c))); + copy_data(c, dst, src_fd, e.fe_logical, + min(src_size - e.fe_logical, + e.fe_length)); continue; } @@ -470,7 +467,8 @@ static void copy_dir(struct copy_fs_state *s, inode.bi_size = stat.st_size; fd = xopen(d->d_name, O_RDONLY|O_NOATIME); - copy_file(c, &inode, fd, child_path, &s->extents); + copy_file(c, &inode, fd, stat.st_size, + child_path, &s->extents); close(fd); break; case DT_LNK: @@ -597,9 +595,13 @@ static void copy_fs(struct bch_fs *c, int src_fd, const char *src_path, darray_free(s.extents); genradix_free(&s.hardlinks); + + bch2_alloc_write(c, false); } -static void find_superblock_space(ranges extents, struct dev_opts *dev) +static void find_superblock_space(ranges extents, + struct format_opts opts, + struct dev_opts *dev) { struct range *i; @@ -609,9 +611,10 @@ static void find_superblock_space(ranges extents, struct dev_opts *dev) u64 end = round_down(i->end, dev->bucket_size << 9); - if (start + (128 << 10) <= end) { + /* Need space for two superblocks: */ + if (start + (opts.superblock_size << 9) * 2 <= end) { dev->sb_offset = start >> 9; - dev->sb_end = dev->sb_offset + 256; + dev->sb_end = dev->sb_offset + opts.superblock_size * 2; return; } } @@ -639,37 +642,12 @@ static const struct option migrate_opts[] = { { NULL } }; -int cmd_migrate(int argc, char *argv[]) +static int migrate_fs(const char *fs_path, + struct bch_opt_strs fs_opt_strs, + struct bch_opts fs_opts, + struct format_opts format_opts, + bool force) { - struct format_opts format_opts = format_opts_default(); - char *fs_path = NULL; - unsigned block_size; - bool no_passphrase = false, force = false; - int opt; - - while ((opt = getopt_long(argc, argv, "f:Fh", - migrate_opts, NULL)) != -1) - switch (opt) { - case 'f': - fs_path = optarg; - break; - case 'e': - format_opts.encrypted = true; - break; - case 'p': - no_passphrase = true; - break; - case 'F': - force = true; - break; - case 'h': - migrate_usage(); - exit(EXIT_SUCCESS); - } - - if (!fs_path) - die("Please specify a filesytem to migrate"); - if (!path_is_fs_root(fs_path)) die("%s is not a filysestem root", fs_path); @@ -684,43 +662,24 @@ int cmd_migrate(int argc, char *argv[]) dev.path = dev_t_to_path(stat.st_dev); dev.fd = xopen(dev.path, O_RDWR); - block_size = min_t(unsigned, stat.st_blksize, - get_blocksize(dev.path, dev.fd) << 9); - - BUG_ON(!is_power_of_2(block_size) || block_size < 512); - format_opts.block_size = block_size >> 9; + opt_set(fs_opts, block_size, get_blocksize(dev.path, dev.fd)); - u64 bcachefs_inum; char *file_path = mprintf("%s/bcachefs", fs_path); + printf("Creating new filesystem on %s in space reserved at %s\n", + dev.path, file_path); - bch2_pick_bucket_size(format_opts, &dev); + bch2_pick_bucket_size(fs_opts, &dev); + u64 bcachefs_inum; ranges extents = reserve_new_fs_space(file_path, - block_size, get_size(dev.path, dev.fd) / 5, + fs_opts.block_size << 9, + get_size(dev.path, dev.fd) / 5, &bcachefs_inum, stat.st_dev, force); - find_superblock_space(extents, &dev); - - if (format_opts.encrypted && !no_passphrase) { - format_opts.passphrase = read_passphrase("Enter passphrase: "); - - if (isatty(STDIN_FILENO)) { - char *pass2 = - read_passphrase("Enter same passphrase again: "); - - if (strcmp(format_opts.passphrase, pass2)) { - memzero_explicit(format_opts.passphrase, - strlen(format_opts.passphrase)); - memzero_explicit(pass2, strlen(pass2)); - die("Passphrases do not match"); - } - - memzero_explicit(pass2, strlen(pass2)); - free(pass2); - } - } + find_superblock_space(extents, format_opts, &dev); - struct bch_sb *sb = bch2_format(format_opts, &dev, 1); + struct bch_sb *sb = bch2_format(fs_opt_strs, + fs_opts,format_opts, &dev, 1); u64 sb_offset = le64_to_cpu(sb->layout.sb_offset[0]); if (format_opts.passphrase) @@ -728,40 +687,23 @@ int cmd_migrate(int argc, char *argv[]) free(sb); - printf("Creating new filesystem on %s in space reserved at %s\n" - "To mount, run\n" - " mount -t bcachefs -o sb=%llu %s dir\n" - "\n" - "After verifying that the new filesystem is correct, to create a\n" - "superblock at the default offset and finish the migration run\n" - " bcachefs migrate_superblock -d %s -o %llu\n" - "\n" - "The new filesystem will have a file at /old_migrated_filestem\n" - "referencing all disk space that might be used by the existing\n" - "filesystem. That file can be deleted once the old filesystem is\n" - "no longer needed (and should be deleted prior to running\n" - "bcachefs migrate_superblock)\n", - dev.path, file_path, sb_offset, dev.path, - dev.path, sb_offset); - struct bch_opts opts = bch2_opts_empty(); struct bch_fs *c = NULL; char *path[1] = { dev.path }; - const char *err; opt_set(opts, sb, sb_offset); opt_set(opts, nostart, true); opt_set(opts, noexcl, true); - err = bch2_fs_open(path, 1, opts, &c); - if (err) - die("Error opening new filesystem: %s", err); + c = bch2_fs_open(path, 1, opts); + if (IS_ERR(c)) + die("Error opening new filesystem: %s", strerror(-PTR_ERR(c))); mark_unreserved_space(c, extents); - err = bch2_fs_start(c); - if (err) - die("Error starting new filesystem: %s", err); + int ret = bch2_fs_start(c); + if (ret) + die("Error starting new filesystem: %s", strerror(-ret)); copy_fs(c, fs_fd, fs_path, bcachefs_inum, &extents); @@ -771,19 +713,78 @@ int cmd_migrate(int argc, char *argv[]) opt_set(opts, nostart, false); opt_set(opts, nochanges, true); - err = bch2_fs_open(path, 1, opts, &c); - if (err) - die("Error opening new filesystem: %s", err); + c = bch2_fs_open(path, 1, opts); + if (IS_ERR(c)) + die("Error opening new filesystem: %s", strerror(-PTR_ERR(c))); bch2_fs_stop(c); printf("fsck complete\n"); + + printf("To mount the new filesystem, run\n" + " mount -t bcachefs -o sb=%llu %s dir\n" + "\n" + "After verifying that the new filesystem is correct, to create a\n" + "superblock at the default offset and finish the migration run\n" + " bcachefs migrate-superblock -d %s -o %llu\n" + "\n" + "The new filesystem will have a file at /old_migrated_filestem\n" + "referencing all disk space that might be used by the existing\n" + "filesystem. That file can be deleted once the old filesystem is\n" + "no longer needed (and should be deleted prior to running\n" + "bcachefs migrate-superblock)\n", + sb_offset, dev.path, dev.path, sb_offset); return 0; } +int cmd_migrate(int argc, char *argv[]) +{ + struct format_opts format_opts = format_opts_default(); + char *fs_path = NULL; + bool no_passphrase = false, force = false; + int opt; + + struct bch_opt_strs fs_opt_strs = + bch2_cmdline_opts_get(&argc, argv, OPT_FORMAT); + struct bch_opts fs_opts = bch2_parse_opts(fs_opt_strs); + + while ((opt = getopt_long(argc, argv, "f:Fh", + migrate_opts, NULL)) != -1) + switch (opt) { + case 'f': + fs_path = optarg; + break; + case 'e': + format_opts.encrypted = true; + break; + case 'p': + no_passphrase = true; + break; + case 'F': + force = true; + break; + case 'h': + migrate_usage(); + exit(EXIT_SUCCESS); + } + + if (!fs_path) + die("Please specify a filesystem to migrate"); + + if (format_opts.encrypted && !no_passphrase) + format_opts.passphrase = read_passphrase_twice("Enter passphrase: "); + + int ret = migrate_fs(fs_path, + fs_opt_strs, + fs_opts, + format_opts, force); + bch2_opt_strs_free(&fs_opt_strs); + return ret; +} + static void migrate_superblock_usage(void) { - puts("bcachefs migrate_superblock - create default superblock after migrating\n" - "Usage: bcachefs migrate_superblock [OPTION]...\n" + puts("bcachefs migrate-superblock - create default superblock after migrating\n" + "Usage: bcachefs migrate-superblock [OPTION]...\n" "\n" "Options:\n" " -d device Device to create superblock for\n"