alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

cmd_fsck: -k, run fsck in kernel

Browse Source 
This adds a new option to cmd_fsck for using the kernel implementation
of fsck instead of userspace, via the BCH_IOCTL_FSCK_OFFLINE ioctl.

This isn't intended for normal usage - mainly for testing and debugging
purposes, and for when the kernel version of bcachefs better matches the
on disk format version.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-12-23 19:37:04 -05:00
parent f0334bbc10
commit 4524069e52
2 changed files with 101 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
cmd_fsck.c
View File

@ -8,7 +8,7 @@
#include "libbcachefs/super.h" #include "libbcachefs/super.h"
#include "tools-util.h" #include "tools-util.h"
static void usage(void) static void fsck_usage(void)
{ {
puts("bcachefs fsck - filesystem check and repair\n" puts("bcachefs fsck - filesystem check and repair\n"
"Usage: bcachefs fsck [OPTION]... <devices>\n" "Usage: bcachefs fsck [OPTION]... <devices>\n"
@ -20,6 +20,7 @@ static void usage(void)
" -f Force checking even if filesystem is marked clean\n" " -f Force checking even if filesystem is marked clean\n"
" -r, --ratelimit_errors Don't display more than 10 errors of a given type\n" " -r, --ratelimit_errors Don't display more than 10 errors of a given type\n"
" -R, --reconstruct_alloc Reconstruct the alloc btree\n" " -R, --reconstruct_alloc Reconstruct the alloc btree\n"
" -k, --kernel Use the in-kernel fsck implementation\n"
" -v Be verbose\n" " -v Be verbose\n"
" -h, --help Display this help and exit\n" " -h, --help Display this help and exit\n"
"Report bugs to <linux-bcachefs@vger.kernel.org>"); "Report bugs to <linux-bcachefs@vger.kernel.org>");
@ -48,6 +49,29 @@ static int do_splice(int rfd, int wfd)
return 0; return 0;
} }
static int splice_fd_to_stdinout(int fd)
{
setnonblocking(STDIN_FILENO);
setnonblocking(fd);
while (true) {
fd_set fds;
FD_ZERO(&fds);
FD_SET(STDIN_FILENO, &fds);
FD_SET(fd, &fds);
select(fd + 1, &fds, NULL, NULL, NULL);
int r = do_splice(fd, STDOUT_FILENO) ?:
do_splice(STDIN_FILENO, fd);
if (r)
return r < 0 ? r : 0;
}
return 0;
}
static int fsck_online(const char *dev_path) static int fsck_online(const char *dev_path)
{ {
int dev_idx; int dev_idx;
@ -59,26 +83,14 @@ static int fsck_online(const char *dev_path)
if (fsck_fd < 0) if (fsck_fd < 0)
die("BCH_IOCTL_FSCK_ONLINE error: %s", bch2_err_str(fsck_fd)); die("BCH_IOCTL_FSCK_ONLINE error: %s", bch2_err_str(fsck_fd));
setnonblocking(STDIN_FILENO); return splice_fd_to_stdinout(fsck_fd);
setnonblocking(fsck_fd); }
while (true) { static void append_opt(struct printbuf *out, const char *opt)
fd_set fds; {
if (out->pos)
FD_ZERO(&fds); prt_char(out, ',');
FD_SET(STDIN_FILENO, &fds); prt_str(out, opt);
FD_SET(fsck_fd, &fds);
select(fsck_fd + 1, &fds, NULL, NULL, NULL);
int r = do_splice(fsck_fd, STDOUT_FILENO) ?:
do_splice(STDIN_FILENO, fsck_fd);
if (r)
return r < 0 ? r : 0;
}
pr_info("done");
return 0;
} }
int cmd_fsck(int argc, char *argv[]) int cmd_fsck(int argc, char *argv[])
@ -86,48 +98,52 @@ int cmd_fsck(int argc, char *argv[])
static const struct option longopts[] = { static const struct option longopts[] = {
{ "ratelimit_errors", no_argument, NULL, 'r' }, { "ratelimit_errors", no_argument, NULL, 'r' },
{ "reconstruct_alloc", no_argument, NULL, 'R' }, { "reconstruct_alloc", no_argument, NULL, 'R' },
{ "kernel", no_argument, NULL, 'k' },
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ NULL } { NULL }
}; };
struct bch_opts opts = bch2_opts_empty(); bool kernel = false;
int opt, ret = 0; int opt, ret = 0;
struct printbuf opts_str = PRINTBUF;
opt_set(opts, degraded, true); append_opt(&opts_str, "degraded");
opt_set(opts, fsck, true); append_opt(&opts_str, "fsck");
opt_set(opts, fix_errors, FSCK_FIX_ask); append_opt(&opts_str, "fix_errors=ask");
append_opt(&opts_str, "read_only");
while ((opt = getopt_long(argc, argv, while ((opt = getopt_long(argc, argv,
"apynfo:rvh", "apynfo:rRkvh",
longopts, NULL)) != -1) longopts, NULL)) != -1)
switch (opt) { switch (opt) {
case 'a': /* outdated alias for -p */ case 'a': /* outdated alias for -p */
case 'p': case 'p':
case 'y': case 'y':
opt_set(opts, fix_errors, FSCK_FIX_yes); append_opt(&opts_str, "fix_errors=yes");
break; break;
case 'n': case 'n':
opt_set(opts, nochanges, true); append_opt(&opts_str, "nochanges");
opt_set(opts, fix_errors, FSCK_FIX_no); append_opt(&opts_str, "fix_errors=no");
break; break;
case 'f': case 'f':
/* force check, even if filesystem marked clean: */ /* force check, even if filesystem marked clean: */
break; break;
case 'o': case 'o':
ret = bch2_parse_mount_opts(NULL, &opts, optarg); append_opt(&opts_str, optarg);
if (ret)
return ret;
break; break;
case 'r': case 'r':
opt_set(opts, ratelimit_errors, true); append_opt(&opts_str, "ratelimit_errors");
break; break;
case 'R': case 'R':
opt_set(opts, reconstruct_alloc, true); append_opt(&opts_str, "reconstruct_alloc");
break;
case 'k':
kernel = true;
break; break;
case 'v': case 'v':
opt_set(opts, verbose, true); append_opt(&opts_str, "verbose");
break; break;
case 'h': case 'h':
usage(); fsck_usage();
exit(16); exit(16);
} }
args_shift(optind); args_shift(optind);
@ -139,23 +155,49 @@ int cmd_fsck(int argc, char *argv[])
darray_str devs = get_or_split_cmdline_devs(argc, argv); darray_str devs = get_or_split_cmdline_devs(argc, argv);
darray_for_each(devs, i) if (!kernel) {
if (dev_mounted(*i)) struct bch_opts opts = bch2_opts_empty();
return fsck_online(*i); ret = bch2_parse_mount_opts(NULL, &opts, opts_str.buf);
if (ret)
return ret;
struct bch_fs *c = bch2_fs_open(devs.data, devs.nr, opts); darray_for_each(devs, i)
if (IS_ERR(c)) if (dev_mounted(*i))
exit(8); return fsck_online(*i);
if (test_bit(BCH_FS_errors_fixed, &c->flags)) { struct bch_fs *c = bch2_fs_open(devs.data, devs.nr, opts);
fprintf(stderr, "%s: errors fixed\n", c->name); if (IS_ERR(c))
ret |= 1; exit(8);
}
if (test_bit(BCH_FS_error, &c->flags)) { if (test_bit(BCH_FS_errors_fixed, &c->flags)) {
fprintf(stderr, "%s: still has errors\n", c->name); fprintf(stderr, "%s: errors fixed\n", c->name);
ret |= 4; ret |= 1;
}
if (test_bit(BCH_FS_error, &c->flags)) {
fprintf(stderr, "%s: still has errors\n", c->name);
ret |= 4;
}
bch2_fs_stop(c);
} else {
struct bch_ioctl_fsck_offline *fsck = calloc(sizeof(*fsck) +
sizeof(u64) * devs.nr, 1);
fsck->opts = (unsigned long)opts_str.buf;
darray_for_each(devs, i)
fsck->devs[i - devs.data] = (unsigned long) *i;
fsck->nr_devs = devs.nr;
int ctl_fd = bcachectl_open();
int fsck_fd = ioctl(ctl_fd, BCH_IOCTL_FSCK_OFFLINE, fsck);
if (fsck_fd < 0)
die("BCH_IOCTL_FSCK_OFFLINE error: %s", bch2_err_str(fsck_fd));
ret = splice_fd_to_stdinout(fsck_fd);
free(fsck);
} }
bch2_fs_stop(c); printbuf_exit(&opts_str);
return ret; return ret;
} }

18
libbcachefs.c
View File

@ -449,16 +449,17 @@ struct bchfs_handle bchu_fs_open_by_dev(const char *path, int *idx)
struct stat stat = xstat(path); struct stat stat = xstat(path);
if (!S_ISBLK(stat.st_mode)) if (S_ISBLK(stat.st_mode)) {
die("%s is not a block device", path); char *sysfs = mprintf("/sys/dev/block/%u:%u/bcachefs",
major(stat.st_dev),
minor(stat.st_dev));
char *sysfs = mprintf("/sys/dev/block/%u:%u/bcachefs", ssize_t len = readlink(sysfs, buf, sizeof(buf));
major(stat.st_dev), free(sysfs);
minor(stat.st_dev));
ssize_t len = readlink(sysfs, buf, sizeof(buf)); if (len <= 0)
free(sysfs); goto read_super;
if (len > 0) {
char *p = strrchr(buf, '/'); char *p = strrchr(buf, '/');
if (!p || sscanf(p + 1, "dev-%u", idx) != 1) if (!p || sscanf(p + 1, "dev-%u", idx) != 1)
die("error parsing sysfs"); die("error parsing sysfs");
@ -467,6 +468,7 @@ struct bchfs_handle bchu_fs_open_by_dev(const char *path, int *idx)
p = strrchr(buf, '/'); p = strrchr(buf, '/');
uuid_str = p + 1; uuid_str = p + 1;
} else { } else {
read_super:
struct bch_opts opts = bch2_opts_empty(); struct bch_opts opts = bch2_opts_empty();
opt_set(opts, noexcl, true); opt_set(opts, noexcl, true);