#include "chardev.h"
#include "journal.h"
#include "move.h"
+#include "recovery.h"
#include "replicas.h"
#include "super.h"
#include "super-io.h"
+#include "thread_with_file.h"
-#include <linux/anon_inodes.h>
#include <linux/cdev.h>
#include <linux/device.h>
-#include <linux/file.h>
#include <linux/fs.h>
#include <linux/ioctl.h>
-#include <linux/kthread.h>
#include <linux/major.h>
#include <linux/sched/task.h>
#include <linux/slab.h>
return copy_to_user(to, from, n) ? -EFAULT : 0;
}
-struct thread_with_file {
- struct task_struct *task;
- int ret;
-};
-
-static void thread_with_file_exit(struct thread_with_file *thr)
-{
- if (thr->task) {
- kthread_stop(thr->task);
- put_task_struct(thr->task);
- }
-}
-
-static int run_thread_with_file(struct thread_with_file *thr,
- const struct file_operations *fops,
- int (*fn)(void *), const char *fmt, ...)
-{
- va_list args;
- struct file *file = NULL;
- int ret, fd = -1;
- struct printbuf name = PRINTBUF;
- unsigned fd_flags = O_RDONLY|O_CLOEXEC|O_NONBLOCK;
-
- va_start(args, fmt);
- prt_vprintf(&name, fmt, args);
- va_end(args);
-
- thr->ret = 0;
- thr->task = kthread_create(fn, thr, name.buf);
- ret = PTR_ERR_OR_ZERO(thr->task);
- if (ret)
- goto err;
-
- ret = get_unused_fd_flags(fd_flags);
- if (ret < 0)
- goto err_stop_task;
- fd = ret;
-
- file = anon_inode_getfile(name.buf, fops, thr, fd_flags);
- ret = PTR_ERR_OR_ZERO(file);
- if (ret)
- goto err_put_fd;
-
- fd_install(fd, file);
- get_task_struct(thr->task);
- wake_up_process(thr->task);
- printbuf_exit(&name);
- return fd;
-err_put_fd:
- put_unused_fd(fd);
-err_stop_task:
- kthread_stop(thr->task);
-err:
- printbuf_exit(&name);
- return ret;
-}
-
/* returns with ref on ca->ref */
static struct bch_dev *bch2_device_lookup(struct bch_fs *c, u64 dev,
unsigned flags)
#endif
struct fsck_thread {
- struct thread_with_file thr;
- struct printbuf buf;
+ struct thread_with_stdio thr;
struct bch_fs *c;
char **devs;
size_t nr_devs;
struct bch_opts opts;
-
- struct log_output output;
- DARRAY(char) output2;
};
-static void bch2_fsck_thread_free(struct fsck_thread *thr)
+static void bch2_fsck_thread_exit(struct thread_with_stdio *_thr)
{
- thread_with_file_exit(&thr->thr);
+ struct fsck_thread *thr = container_of(_thr, struct fsck_thread, thr);
if (thr->devs)
for (size_t i = 0; i < thr->nr_devs; i++)
kfree(thr->devs[i]);
- darray_exit(&thr->output2);
- printbuf_exit(&thr->output.buf);
kfree(thr->devs);
kfree(thr);
}
-static int bch2_fsck_thread_release(struct inode *inode, struct file *file)
-{
- struct fsck_thread *thr = container_of(file->private_data, struct fsck_thread, thr);
-
- bch2_fsck_thread_free(thr);
- return 0;
-}
-
-static ssize_t bch2_fsck_thread_read(struct file *file, char __user *buf,
- size_t len, loff_t *ppos)
-{
- struct fsck_thread *thr = container_of(file->private_data, struct fsck_thread, thr);
- size_t copied = 0, b;
- int ret = 0;
-
- ret = wait_event_interruptible(thr->output.wait,
- thr->output.buf.pos || thr->output2.nr);
- if (ret)
- return ret;
-
- while (len) {
- ret = darray_make_room(&thr->output2, thr->output.buf.pos);
- if (ret)
- break;
-
- spin_lock_irq(&thr->output.lock);
- b = min_t(size_t, darray_room(thr->output2), thr->output.buf.pos);
-
- memcpy(&darray_top(thr->output2), thr->output.buf.buf, b);
- memmove(thr->output.buf.buf,
- thr->output.buf.buf + b,
- thr->output.buf.pos - b);
-
- thr->output2.nr += b;
- thr->output.buf.pos -= b;
- spin_unlock_irq(&thr->output.lock);
-
- b = min(len, thr->output2.nr);
- if (!b)
- break;
-
- b -= copy_to_user(buf, thr->output2.data, b);
- if (!b) {
- ret = -EFAULT;
- break;
- }
-
- copied += b;
- buf += b;
- len -= b;
-
- memmove(thr->output2.data,
- thr->output2.data + b,
- thr->output2.nr - b);
- thr->output2.nr -= b;
- }
-
- return copied ?: ret;
-}
-
-static const struct file_operations fsck_thread_ops = {
- .release = bch2_fsck_thread_release,
- .read = bch2_fsck_thread_read,
- .llseek = no_llseek,
-};
-
static int bch2_fsck_offline_thread_fn(void *arg)
{
struct fsck_thread *thr = container_of(arg, struct fsck_thread, thr);
struct bch_fs *c = bch2_fs_open(thr->devs, thr->nr_devs, thr->opts);
- thr->thr.ret = PTR_ERR_OR_ZERO(c);
- if (!thr->thr.ret)
+ thr->thr.thr.ret = PTR_ERR_OR_ZERO(c);
+ if (!thr->thr.thr.ret)
bch2_fs_stop(c);
+
+ thread_with_stdio_done(&thr->thr);
return 0;
}
if (arg.flags)
return -EINVAL;
+ if (!capable(CAP_SYS_ADMIN))
+ return -EPERM;
+
if (!(devs = kcalloc(arg.nr_devs, sizeof(*devs), GFP_KERNEL)) ||
!(thr = kzalloc(sizeof(*thr), GFP_KERNEL)) ||
!(thr->devs = kcalloc(arg.nr_devs, sizeof(*thr->devs), GFP_KERNEL))) {
goto err;
}
+ thr->opts = bch2_opts_empty();
thr->nr_devs = arg.nr_devs;
- thr->output.buf = PRINTBUF;
- thr->output.buf.atomic++;
- spin_lock_init(&thr->output.lock);
- init_waitqueue_head(&thr->output.wait);
- darray_init(&thr->output2);
- if (copy_from_user(devs, &user_arg->devs[0], sizeof(user_arg->devs[0]) * arg.nr_devs)) {
+ if (copy_from_user(devs, &user_arg->devs[0],
+ array_size(sizeof(user_arg->devs[0]), arg.nr_devs))) {
ret = -EINVAL;
goto err;
}
goto err;
}
- opt_set(thr->opts, log_output, (u64)(unsigned long)&thr->output);
+ opt_set(thr->opts, stdio, (u64)(unsigned long)&thr->thr.stdio);
- ret = run_thread_with_file(&thr->thr,
- &fsck_thread_ops,
- bch2_fsck_offline_thread_fn,
- "bch-fsck");
+ ret = bch2_run_thread_with_stdio(&thr->thr,
+ bch2_fsck_thread_exit,
+ bch2_fsck_offline_thread_fn);
err:
if (ret < 0) {
if (thr)
- bch2_fsck_thread_free(thr);
+ bch2_fsck_thread_exit(&thr->thr);
pr_err("ret %s", bch2_err_str(ret));
}
kfree(devs);
{
struct bch_data_ctx *ctx = container_of(file->private_data, struct bch_data_ctx, thr);
- thread_with_file_exit(&ctx->thr);
+ bch2_thread_with_file_exit(&ctx->thr);
kfree(ctx);
return 0;
}
ctx->c = c;
ctx->arg = arg;
- ret = run_thread_with_file(&ctx->thr,
- &bcachefs_data_ops,
- bch2_data_thread,
- "bch-data/%s", c->name);
+ ret = bch2_run_thread_with_file(&ctx->thr,
+ &bcachefs_data_ops,
+ bch2_data_thread);
if (ret < 0)
kfree(ctx);
return ret;
struct bch_ioctl_disk_get_idx arg)
{
dev_t dev = huge_decode_dev(arg.dev);
- struct bch_dev *ca;
- unsigned i;
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
if (!dev)
return -EINVAL;
- for_each_online_member(ca, c, i)
+ for_each_online_member(c, ca)
if (ca->dev == dev) {
percpu_ref_put(&ca->io_ref);
- return i;
+ return ca->dev_idx;
}
return -BCH_ERR_ENOENT_dev_idx_not_found;
{
struct fsck_thread *thr = container_of(arg, struct fsck_thread, thr);
struct bch_fs *c = thr->c;
-#if 0
- struct bch_fs *c = bch2_fs_open(thr->devs, thr->nr_devs, thr->opts);
- thr->thr.ret = PTR_ERR_OR_ZERO(c);
- if (!thr->thr.ret)
- bch2_fs_stop(c);
-#endif
+ c->stdio_filter = current;
+ c->stdio = &thr->thr.stdio;
+
+ /*
+ * XXX: can we figure out a way to do this without mucking with c->opts?
+ */
+ unsigned old_fix_errors = c->opts.fix_errors;
+ if (opt_defined(thr->opts, fix_errors))
+ c->opts.fix_errors = thr->opts.fix_errors;
+ else
+ c->opts.fix_errors = FSCK_FIX_ask;
+
+ c->opts.fsck = true;
+ set_bit(BCH_FS_fsck_running, &c->flags);
+
+ c->curr_recovery_pass = BCH_RECOVERY_PASS_check_alloc_info;
+ int ret = bch2_run_online_recovery_passes(c);
+
+ clear_bit(BCH_FS_fsck_running, &c->flags);
+ bch_err_fn(c, ret);
+
+ c->stdio = NULL;
+ c->stdio_filter = NULL;
+ c->opts.fix_errors = old_fix_errors;
+
+ thread_with_stdio_done(&thr->thr);
+
+ up(&c->online_fsck_mutex);
+ bch2_ro_ref_put(c);
return 0;
}
if (arg.flags)
return -EINVAL;
+ if (!capable(CAP_SYS_ADMIN))
+ return -EPERM;
+
+ if (!bch2_ro_ref_tryget(c))
+ return -EROFS;
+
+ if (down_trylock(&c->online_fsck_mutex)) {
+ bch2_ro_ref_put(c);
+ return -EAGAIN;
+ }
+
thr = kzalloc(sizeof(*thr), GFP_KERNEL);
- if (!thr)
- return -ENOMEM;
+ if (!thr) {
+ ret = -ENOMEM;
+ goto err;
+ }
thr->c = c;
- thr->output.buf = PRINTBUF;
- thr->output.buf.atomic++;
- spin_lock_init(&thr->output.lock);
- init_waitqueue_head(&thr->output.wait);
- darray_init(&thr->output2);
-
- ret = run_thread_with_file(&thr->thr,
- &fsck_thread_ops,
- bch2_fsck_online_thread_fn,
- "bch-fsck");
- bch_err_fn(c, ret);
- if (ret < 0)
- bch2_fsck_thread_free(thr);
+ thr->opts = bch2_opts_empty();
+
+ if (arg.opts) {
+ char *optstr = strndup_user((char __user *)(unsigned long) arg.opts, 1 << 16);
+
+ ret = PTR_ERR_OR_ZERO(optstr) ?:
+ bch2_parse_mount_opts(c, &thr->opts, optstr);
+ kfree(optstr);
+
+ if (ret)
+ goto err;
+ }
+
+ ret = bch2_run_thread_with_stdio(&thr->thr,
+ bch2_fsck_thread_exit,
+ bch2_fsck_online_thread_fn);
+err:
+ if (ret < 0) {
+ bch_err_fn(c, ret);
+ if (thr)
+ bch2_fsck_thread_exit(&thr->thr);
+ up(&c->online_fsck_mutex);
+ bch2_ro_ref_put(c);
+ }
return ret;
}
projects / bcachefs-tools-debian / blobdiff