From 0b847a19d96b66baeb651317d5e22f8bd4368975 Mon Sep 17 00:00:00 2001
From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Wed, 19 Dec 2018 12:58:56 -0500
Subject: [PATCH] bcachefs: Lots of option handling improvements
Add helptext to option definitions - so we can unify the option
handling with the format command
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---
fs/bcachefs/bcachefs.h | 4 +-
fs/bcachefs/fs.c | 2 +-
fs/bcachefs/opts.c | 47 +++--
fs/bcachefs/opts.h | 386 +++++++++++++++++++++++++---------------
fs/bcachefs/rebalance.c | 10 +-
fs/bcachefs/sysfs.c | 9 +-
fs/bcachefs/tests.c | 4 +-
fs/bcachefs/util.c | 27 ++-
fs/bcachefs/util.h | 3 +-
9 files changed, 310 insertions(+), 182 deletions(-)
diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h
index 92a0ecd8fbc3..244b808688b3 100644
--- a/fs/bcachefs/bcachefs.h
+++ b/fs/bcachefs/bcachefs.h
@@ -230,13 +230,13 @@
#define bch_verbose(c, fmt, ...) \
do { \
- if ((c)->opts.verbose_recovery) \
+ if ((c)->opts.verbose) \
bch_info(c, fmt, ##__VA_ARGS__); \
} while (0)
#define pr_verbose_init(opts, fmt, ...) \
do { \
- if (opt_get(opts, verbose_init)) \
+ if (opt_get(opts, verbose)) \
pr_info(fmt, ##__VA_ARGS__); \
} while (0)
diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index d23a82d94c5e..02c7543e40c8 100644
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@ -1690,7 +1690,7 @@ static int bch2_show_options(struct seq_file *seq, struct dentry *root)
const struct bch_option *opt = &bch2_opt_table[i];
u64 v = bch2_opt_get_by_id(&c->opts, i);
- if (opt->mode < OPT_MOUNT)
+ if (!(opt->mode & OPT_MOUNT))
continue;
if (v == bch2_opt_get_by_id(&bch2_opts_default, i))
diff --git a/fs/bcachefs/opts.c b/fs/bcachefs/opts.c
index 17245e0b4a73..13a9a2fcd575 100644
--- a/fs/bcachefs/opts.c
+++ b/fs/bcachefs/opts.c
@@ -75,22 +75,22 @@ const char * const bch2_dev_state[] = {
void bch2_opts_apply(struct bch_opts *dst, struct bch_opts src)
{
-#define BCH_OPT(_name, ...) \
+#define x(_name, ...) \
if (opt_defined(src, _name)) \
opt_set(*dst, _name, src._name);
BCH_OPTS()
-#undef BCH_OPT
+#undef x
}
bool bch2_opt_defined_by_id(const struct bch_opts *opts, enum bch_opt_id id)
{
switch (id) {
-#define BCH_OPT(_name, ...) \
+#define x(_name, ...) \
case Opt_##_name: \
return opt_defined(*opts, _name);
BCH_OPTS()
-#undef BCH_OPT
+#undef x
default:
BUG();
}
@@ -99,11 +99,11 @@ bool bch2_opt_defined_by_id(const struct bch_opts *opts, enum bch_opt_id id)
u64 bch2_opt_get_by_id(const struct bch_opts *opts, enum bch_opt_id id)
{
switch (id) {
-#define BCH_OPT(_name, ...) \
+#define x(_name, ...) \
case Opt_##_name: \
return opts->_name;
BCH_OPTS()
-#undef BCH_OPT
+#undef x
default:
BUG();
}
@@ -112,12 +112,12 @@ u64 bch2_opt_get_by_id(const struct bch_opts *opts, enum bch_opt_id id)
void bch2_opt_set_by_id(struct bch_opts *opts, enum bch_opt_id id, u64 v)
{
switch (id) {
-#define BCH_OPT(_name, ...) \
+#define x(_name, ...) \
case Opt_##_name: \
opt_set(*opts, _name, v); \
break;
BCH_OPTS()
-#undef BCH_OPT
+#undef x
default:
BUG();
}
@@ -131,11 +131,11 @@ struct bch_opts bch2_opts_from_sb(struct bch_sb *sb)
{
struct bch_opts opts = bch2_opts_empty();
-#define BCH_OPT(_name, _bits, _mode, _type, _sb_opt, _default) \
+#define x(_name, _bits, _mode, _type, _sb_opt, ...) \
if (_sb_opt != NO_SB_OPT) \
opt_set(opts, _name, _sb_opt(sb));
BCH_OPTS()
-#undef BCH_OPT
+#undef x
return opts;
}
@@ -143,24 +143,27 @@ struct bch_opts bch2_opts_from_sb(struct bch_sb *sb)
const struct bch_option bch2_opt_table[] = {
#define OPT_BOOL() .type = BCH_OPT_BOOL
#define OPT_UINT(_min, _max) .type = BCH_OPT_UINT, .min = _min, .max = _max
+#define OPT_SECTORS(_min, _max) .type = BCH_OPT_SECTORS, .min = _min, .max = _max
#define OPT_STR(_choices) .type = BCH_OPT_STR, .choices = _choices
#define OPT_FN(_fn) .type = BCH_OPT_FN, \
.parse = _fn##_parse, \
.to_text = _fn##_to_text
-#define BCH_OPT(_name, _bits, _mode, _type, _sb_opt, _default) \
+#define x(_name, _bits, _mode, _type, _sb_opt, _default, _hint, _help) \
[Opt_##_name] = { \
.attr = { \
.name = #_name, \
- .mode = _mode == OPT_RUNTIME ? 0644 : 0444, \
+ .mode = (_mode) & OPT_RUNTIME ? 0644 : 0444, \
}, \
.mode = _mode, \
+ .hint = _hint, \
+ .help = _help, \
.set_sb = SET_##_sb_opt, \
_type \
},
BCH_OPTS()
-#undef BCH_OPT
+#undef x
};
int bch2_opt_lookup(const char *name)
@@ -216,6 +219,19 @@ int bch2_opt_parse(struct bch_fs *c, const struct bch_option *opt,
if (ret < 0)
return ret;
+ if (*res < opt->min || *res >= opt->max)
+ return -ERANGE;
+ break;
+ case BCH_OPT_SECTORS:
+ ret = bch2_strtou64_h(val, res);
+ if (ret < 0)
+ return ret;
+
+ if (*res & 511)
+ return -EINVAL;
+
+ *res >>= 9;
+
if (*res < opt->min || *res >= opt->max)
return -ERANGE;
break;
@@ -256,6 +272,9 @@ void bch2_opt_to_text(struct printbuf *out, struct bch_fs *c,
case BCH_OPT_UINT:
pr_buf(out, "%lli", v);
break;
+ case BCH_OPT_SECTORS:
+ bch2_hprint(out, v);
+ break;
case BCH_OPT_STR:
if (flags & OPT_SHOW_FULL_LIST)
bch2_string_opt_to_text(out, opt->choices, v);
@@ -345,7 +364,7 @@ int bch2_parse_mount_opts(struct bch_opts *opts, char *options)
goto no_val;
}
- if (bch2_opt_table[id].mode < OPT_MOUNT)
+ if (!(bch2_opt_table[id].mode & OPT_MOUNT))
goto bad_opt;
if (id == Opt_acl &&
diff --git a/fs/bcachefs/opts.h b/fs/bcachefs/opts.h
index faa2a72c8c3b..f4cb0625c3cc 100644
--- a/fs/bcachefs/opts.h
+++ b/fs/bcachefs/opts.h
@@ -32,22 +32,25 @@ extern const char * const bch2_dev_state[];
/* dummy option, for options that aren't stored in the superblock */
LE64_BITMASK(NO_SB_OPT, struct bch_sb, flags[0], 0, 0);
+/* When can be set: */
enum opt_mode {
- OPT_INTERNAL,
- OPT_FORMAT,
- OPT_MOUNT,
- OPT_RUNTIME,
+ OPT_FORMAT = (1 << 0),
+ OPT_MOUNT = (1 << 1),
+ OPT_RUNTIME = (1 << 2),
+ OPT_INODE = (1 << 3),
+ OPT_DEVICE = (1 << 4),
};
enum opt_type {
BCH_OPT_BOOL,
BCH_OPT_UINT,
+ BCH_OPT_SECTORS,
BCH_OPT_STR,
BCH_OPT_FN,
};
/**
- * BCH_OPT(name, type, in mem type, mode, sb_opt)
+ * x(name, shortopt, type, in mem type, mode, sb_opt)
*
* @name - name of mount option, sysfs attribute, and struct bch_opts
* member
@@ -66,150 +69,252 @@ enum opt_type {
*/
#define BCH_OPTS() \
- BCH_OPT(block_size, u16, OPT_FORMAT, \
- OPT_UINT(1, 128), \
- BCH_SB_BLOCK_SIZE, 8) \
- BCH_OPT(btree_node_size, u16, OPT_FORMAT, \
- OPT_UINT(1, 128), \
- BCH_SB_BTREE_NODE_SIZE, 512) \
- BCH_OPT(errors, u8, OPT_RUNTIME, \
- OPT_STR(bch2_error_actions), \
- BCH_SB_ERROR_ACTION, BCH_ON_ERROR_RO) \
- BCH_OPT(metadata_replicas, u8, OPT_RUNTIME, \
- OPT_UINT(1, BCH_REPLICAS_MAX), \
- BCH_SB_META_REPLICAS_WANT, 1) \
- BCH_OPT(data_replicas, u8, OPT_RUNTIME, \
- OPT_UINT(1, BCH_REPLICAS_MAX), \
- BCH_SB_DATA_REPLICAS_WANT, 1) \
- BCH_OPT(metadata_replicas_required, u8, OPT_MOUNT, \
- OPT_UINT(1, BCH_REPLICAS_MAX), \
- BCH_SB_META_REPLICAS_REQ, 1) \
- BCH_OPT(data_replicas_required, u8, OPT_MOUNT, \
- OPT_UINT(1, BCH_REPLICAS_MAX), \
- BCH_SB_DATA_REPLICAS_REQ, 1) \
- BCH_OPT(metadata_checksum, u8, OPT_RUNTIME, \
- OPT_STR(bch2_csum_types), \
- BCH_SB_META_CSUM_TYPE, BCH_CSUM_OPT_CRC32C) \
- BCH_OPT(data_checksum, u8, OPT_RUNTIME, \
- OPT_STR(bch2_csum_types), \
- BCH_SB_DATA_CSUM_TYPE, BCH_CSUM_OPT_CRC32C) \
- BCH_OPT(compression, u8, OPT_RUNTIME, \
- OPT_STR(bch2_compression_types), \
- BCH_SB_COMPRESSION_TYPE, BCH_COMPRESSION_OPT_NONE)\
- BCH_OPT(background_compression, u8, OPT_RUNTIME, \
- OPT_STR(bch2_compression_types), \
- BCH_SB_BACKGROUND_COMPRESSION_TYPE,BCH_COMPRESSION_OPT_NONE)\
- BCH_OPT(str_hash, u8, OPT_RUNTIME, \
- OPT_STR(bch2_str_hash_types), \
- BCH_SB_STR_HASH_TYPE, BCH_STR_HASH_SIPHASH) \
- BCH_OPT(foreground_target, u16, OPT_RUNTIME, \
- OPT_FN(bch2_opt_target), \
- BCH_SB_FOREGROUND_TARGET, 0) \
- BCH_OPT(background_target, u16, OPT_RUNTIME, \
- OPT_FN(bch2_opt_target), \
- BCH_SB_BACKGROUND_TARGET, 0) \
- BCH_OPT(promote_target, u16, OPT_RUNTIME, \
- OPT_FN(bch2_opt_target), \
- BCH_SB_PROMOTE_TARGET, 0) \
- BCH_OPT(erasure_code, u16, OPT_RUNTIME, \
- OPT_BOOL(), \
- BCH_SB_ERASURE_CODE, false) \
- BCH_OPT(inodes_32bit, u8, OPT_RUNTIME, \
- OPT_BOOL(), \
- BCH_SB_INODE_32BIT, false) \
- BCH_OPT(gc_reserve_percent, u8, OPT_RUNTIME, \
- OPT_UINT(5, 21), \
- BCH_SB_GC_RESERVE, 8) \
- BCH_OPT(gc_reserve_bytes, u64, OPT_RUNTIME, \
- OPT_UINT(0, U64_MAX), \
- BCH_SB_GC_RESERVE_BYTES, 0) \
- BCH_OPT(root_reserve_percent, u8, OPT_MOUNT, \
- OPT_UINT(0, 100), \
- BCH_SB_ROOT_RESERVE, 0) \
- BCH_OPT(wide_macs, u8, OPT_RUNTIME, \
- OPT_BOOL(), \
- BCH_SB_128_BIT_MACS, false) \
- BCH_OPT(acl, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- BCH_SB_POSIX_ACL, true) \
- BCH_OPT(usrquota, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- BCH_SB_USRQUOTA, false) \
- BCH_OPT(grpquota, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- BCH_SB_GRPQUOTA, false) \
- BCH_OPT(prjquota, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- BCH_SB_PRJQUOTA, false) \
- BCH_OPT(degraded, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(discard, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(verbose_recovery, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(verbose_init, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(journal_flush_disabled, u8, OPT_RUNTIME, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(fsck, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- NO_SB_OPT, true) \
- BCH_OPT(fix_errors, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(nochanges, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(noreplay, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(norecovery, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(noexcl, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(sb, u64, OPT_MOUNT, \
- OPT_UINT(0, S64_MAX), \
- NO_SB_OPT, BCH_SB_SECTOR) \
- BCH_OPT(read_only, u8, OPT_INTERNAL, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(nostart, u8, OPT_INTERNAL, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(no_data_io, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(version_upgrade, u8, OPT_MOUNT, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
- BCH_OPT(project, u8, OPT_INTERNAL, \
- OPT_BOOL(), \
- NO_SB_OPT, false) \
+ x(block_size, u16, \
+ OPT_FORMAT, \
+ OPT_SECTORS(1, 128), \
+ BCH_SB_BLOCK_SIZE, 8, \
+ "size", NULL) \
+ x(btree_node_size, u16, \
+ OPT_FORMAT, \
+ OPT_SECTORS(1, 128), \
+ BCH_SB_BTREE_NODE_SIZE, 512, \
+ "size", "Btree node size, default 256k") \
+ x(errors, u8, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME, \
+ OPT_STR(bch2_error_actions), \
+ BCH_SB_ERROR_ACTION, BCH_ON_ERROR_RO, \
+ NULL, "Action to take on filesystem error") \
+ x(metadata_replicas, u8, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME, \
+ OPT_UINT(1, BCH_REPLICAS_MAX), \
+ BCH_SB_META_REPLICAS_WANT, 1, \
+ "#", "Number of metadata replicas") \
+ x(data_replicas, u8, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME|OPT_INODE, \
+ OPT_UINT(1, BCH_REPLICAS_MAX), \
+ BCH_SB_DATA_REPLICAS_WANT, 1, \
+ "#", "Number of data replicas") \
+ x(metadata_replicas_required, u8, \
+ OPT_FORMAT|OPT_MOUNT, \
+ OPT_UINT(1, BCH_REPLICAS_MAX), \
+ BCH_SB_META_REPLICAS_REQ, 1, \
+ "#", NULL) \
+ x(data_replicas_required, u8, \
+ OPT_FORMAT|OPT_MOUNT, \
+ OPT_UINT(1, BCH_REPLICAS_MAX), \
+ BCH_SB_DATA_REPLICAS_REQ, 1, \
+ "#", NULL) \
+ x(metadata_checksum, u8, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME, \
+ OPT_STR(bch2_csum_types), \
+ BCH_SB_META_CSUM_TYPE, BCH_CSUM_OPT_CRC32C, \
+ NULL, NULL) \
+ x(data_checksum, u8, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME|OPT_INODE, \
+ OPT_STR(bch2_csum_types), \
+ BCH_SB_DATA_CSUM_TYPE, BCH_CSUM_OPT_CRC32C, \
+ NULL, NULL) \
+ x(compression, u8, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME|OPT_INODE, \
+ OPT_STR(bch2_compression_types), \
+ BCH_SB_COMPRESSION_TYPE, BCH_COMPRESSION_OPT_NONE, \
+ NULL, NULL) \
+ x(background_compression, u8, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME|OPT_INODE, \
+ OPT_STR(bch2_compression_types), \
+ BCH_SB_BACKGROUND_COMPRESSION_TYPE,BCH_COMPRESSION_OPT_NONE, \
+ NULL, NULL) \
+ x(str_hash, u8, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME, \
+ OPT_STR(bch2_str_hash_types), \
+ BCH_SB_STR_HASH_TYPE, BCH_STR_HASH_SIPHASH, \
+ NULL, "Hash function for directory entries and xattrs")\
+ x(foreground_target, u16, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME|OPT_INODE, \
+ OPT_FN(bch2_opt_target), \
+ BCH_SB_FOREGROUND_TARGET, 0, \
+ "(target)", "Device or disk group for foreground writes") \
+ x(background_target, u16, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME|OPT_INODE, \
+ OPT_FN(bch2_opt_target), \
+ BCH_SB_BACKGROUND_TARGET, 0, \
+ "(target)", "Device or disk group to move data to in the background")\
+ x(promote_target, u16, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME|OPT_INODE, \
+ OPT_FN(bch2_opt_target), \
+ BCH_SB_PROMOTE_TARGET, 0, \
+ "(target)", "Device or disk group to promote data to on read")\
+ x(erasure_code, u16, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME|OPT_INODE, \
+ OPT_BOOL(), \
+ BCH_SB_ERASURE_CODE, false, \
+ NULL, "Enable erasure coding (DO NOT USE YET)") \
+ x(inodes_32bit, u8, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME, \
+ OPT_BOOL(), \
+ BCH_SB_INODE_32BIT, false, \
+ NULL, "Constrain inode numbers to 32 bits") \
+ x(gc_reserve_percent, u8, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME, \
+ OPT_UINT(5, 21), \
+ BCH_SB_GC_RESERVE, 8, \
+ "%", "Percentage of disk space to reserve for copygc")\
+ x(gc_reserve_bytes, u64, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME, \
+ OPT_SECTORS(0, U64_MAX), \
+ BCH_SB_GC_RESERVE_BYTES, 0, \
+ "%", "Amount of disk space to reserve for copygc\n" \
+ "Takes precedence over gc_reserve_percent if set")\
+ x(root_reserve_percent, u8, \
+ OPT_FORMAT|OPT_MOUNT, \
+ OPT_UINT(0, 100), \
+ BCH_SB_ROOT_RESERVE, 0, \
+ "%", "Percentage of disk space to reserve for superuser")\
+ x(wide_macs, u8, \
+ OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME, \
+ OPT_BOOL(), \
+ BCH_SB_128_BIT_MACS, false, \
+ NULL, "Store full 128 bits of cryptographic MACs, instead of 80")\
+ x(acl, u8, \
+ OPT_FORMAT|OPT_MOUNT, \
+ OPT_BOOL(), \
+ BCH_SB_POSIX_ACL, true, \
+ NULL, "Enable POSIX acls") \
+ x(usrquota, u8, \
+ OPT_FORMAT|OPT_MOUNT, \
+ OPT_BOOL(), \
+ BCH_SB_USRQUOTA, false, \
+ NULL, "Enable user quotas") \
+ x(grpquota, u8, \
+ OPT_FORMAT|OPT_MOUNT, \
+ OPT_BOOL(), \
+ BCH_SB_GRPQUOTA, false, \
+ NULL, "Enable group quotas") \
+ x(prjquota, u8, \
+ OPT_FORMAT|OPT_MOUNT, \
+ OPT_BOOL(), \
+ BCH_SB_PRJQUOTA, false, \
+ NULL, "Enable project quotas") \
+ x(degraded, u8, \
+ OPT_MOUNT, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, "Allow mounting in degraded mode") \
+ x(discard, u8, \
+ OPT_MOUNT|OPT_DEVICE, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, "Enable discard/TRIM support") \
+ x(verbose, u8, \
+ OPT_MOUNT, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, "Extra debugging information during mount/recovery")\
+ x(journal_flush_disabled, u8, \
+ OPT_MOUNT|OPT_RUNTIME, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, "Disable journal flush on sync/fsync\n" \
+ "If enabled, writes can be lost, but only since the\n"\
+ "last journal write (default 1 second)") \
+ x(fsck, u8, \
+ OPT_MOUNT, \
+ OPT_BOOL(), \
+ NO_SB_OPT, true, \
+ NULL, "Run fsck on mount") \
+ x(fix_errors, u8, \
+ OPT_MOUNT, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, "Fix errors during fsck without asking") \
+ x(nochanges, u8, \
+ OPT_MOUNT, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, "Super read only mode - no writes at all will be issued,\n"\
+ "even if we have to replay the journal") \
+ x(noreplay, u8, \
+ OPT_MOUNT, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, "Don't replay the journal (only for internal tools)")\
+ x(norecovery, u8, \
+ OPT_MOUNT, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, NULL) \
+ x(noexcl, u8, \
+ OPT_MOUNT, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, "Don't open device in exclusive mode") \
+ x(sb, u64, \
+ OPT_MOUNT, \
+ OPT_UINT(0, S64_MAX), \
+ NO_SB_OPT, BCH_SB_SECTOR, \
+ "offset", "Sector offset of superblock") \
+ x(read_only, u8, \
+ 0, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, NULL) \
+ x(nostart, u8, \
+ 0, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, "Don\'t start filesystem, only open devices") \
+ x(version_upgrade, u8, \
+ OPT_MOUNT, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, "Set superblock to latest version,\n" \
+ "allowing any new features to be used") \
+ x(project, u8, \
+ OPT_INODE, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, NULL) \
+ x(no_data_io, u8, \
+ OPT_MOUNT, \
+ OPT_BOOL(), \
+ NO_SB_OPT, false, \
+ NULL, "Skip submit_bio() for data reads and writes, " \
+ "for performance testing purposes") \
+ x(fs_size, u64, \
+ OPT_DEVICE, \
+ OPT_SECTORS(0, S64_MAX), \
+ NO_SB_OPT, 0, \
+ "size", "Size of filesystem on device") \
+ x(bucket, u32, \
+ OPT_DEVICE, \
+ OPT_SECTORS(0, S64_MAX), \
+ NO_SB_OPT, 0, \
+ "size", "Size of filesystem on device") \
+ x(durability, u8, \
+ OPT_DEVICE, \
+ OPT_UINT(0, BCH_REPLICAS_MAX), \
+ NO_SB_OPT, 1, \
+ "n", "Data written to this device will be considered\n"\
+ "to have already been replicated n times")
+
struct bch_opts {
-#define BCH_OPT(_name, _bits, ...) unsigned _name##_defined:1;
+#define x(_name, _bits, ...) unsigned _name##_defined:1;
BCH_OPTS()
-#undef BCH_OPT
+#undef x
-#define BCH_OPT(_name, _bits, ...) _bits _name;
+#define x(_name, _bits, ...) _bits _name;
BCH_OPTS()
-#undef BCH_OPT
+#undef x
};
static const struct bch_opts bch2_opts_default = {
-#define BCH_OPT(_name, _bits, _mode, _type, _sb_opt, _default) \
+#define x(_name, _bits, _mode, _type, _sb_opt, _default, ...) \
._name##_defined = true, \
._name = _default, \
BCH_OPTS()
-#undef BCH_OPT
+#undef x
};
#define opt_defined(_opts, _name) ((_opts)._name##_defined)
@@ -231,9 +336,9 @@ static inline struct bch_opts bch2_opts_empty(void)
void bch2_opts_apply(struct bch_opts *, struct bch_opts);
enum bch_opt_id {
-#define BCH_OPT(_name, ...) Opt_##_name,
+#define x(_name, ...) Opt_##_name,
BCH_OPTS()
-#undef BCH_OPT
+#undef x
bch2_opts_nr
};
@@ -259,6 +364,9 @@ struct bch_option {
};
};
+ const char *hint;
+ const char *help;
+
};
extern const struct bch_option bch2_opt_table[];
diff --git a/fs/bcachefs/rebalance.c b/fs/bcachefs/rebalance.c
index eec74d4a5712..cc1a7deb90bc 100644
--- a/fs/bcachefs/rebalance.c
+++ b/fs/bcachefs/rebalance.c
@@ -263,13 +263,13 @@ ssize_t bch2_rebalance_work_show(struct bch_fs *c, char *buf)
struct rebalance_work w = rebalance_work(c);
char h1[21], h2[21];
- bch2_hprint(h1, w.dev_most_full_work << 9);
- bch2_hprint(h2, w.dev_most_full_capacity << 9);
+ bch2_hprint(&PBUF(h1), w.dev_most_full_work << 9);
+ bch2_hprint(&PBUF(h2), w.dev_most_full_capacity << 9);
pr_buf(&out, "fullest_dev (%i):\t%s/%s\n",
w.dev_most_full_idx, h1, h2);
- bch2_hprint(h1, w.total_work << 9);
- bch2_hprint(h2, c->capacity << 9);
+ bch2_hprint(&PBUF(h1), w.total_work << 9);
+ bch2_hprint(&PBUF(h2), c->capacity << 9);
pr_buf(&out, "total work:\t\t%s/%s\n", h1, h2);
pr_buf(&out, "rate:\t\t\t%u\n", r->pd.rate.rate);
@@ -279,7 +279,7 @@ ssize_t bch2_rebalance_work_show(struct bch_fs *c, char *buf)
pr_buf(&out, "waiting\n");
break;
case REBALANCE_THROTTLED:
- bch2_hprint(h1,
+ bch2_hprint(&PBUF(h1),
(r->throttled_until_iotime -
atomic_long_read(&c->io_clock[WRITE].now)) << 9);
pr_buf(&out, "throttled for %lu sec or %s io\n",
diff --git a/fs/bcachefs/sysfs.c b/fs/bcachefs/sysfs.c
index a423159b6ed5..b59b7a5a4cbb 100644
--- a/fs/bcachefs/sysfs.c
+++ b/fs/bcachefs/sysfs.c
@@ -73,9 +73,10 @@ do { \
#define sysfs_hprint(file, val) \
do { \
if (attr == &sysfs_ ## file) { \
- ssize_t ret = bch2_hprint(buf, val); \
- strcat(buf, "\n"); \
- return ret + 1; \
+ struct printbuf out = _PBUF(buf, PAGE_SIZE); \
+ bch2_hprint(&out, val); \
+ pr_buf(&out, "\n"); \
+ return out.pos - buf; \
} \
} while (0)
@@ -658,7 +659,7 @@ int bch2_opts_create_sysfs_files(struct kobject *kobj)
for (i = bch2_opt_table;
i < bch2_opt_table + bch2_opts_nr;
i++) {
- if (i->mode == OPT_INTERNAL)
+ if (!(i->mode & (OPT_FORMAT|OPT_MOUNT|OPT_RUNTIME)))
continue;
ret = sysfs_create_file(kobj, &i->attr);
diff --git a/fs/bcachefs/tests.c b/fs/bcachefs/tests.c
index dc8abce94ff0..bcbe782260f0 100644
--- a/fs/bcachefs/tests.c
+++ b/fs/bcachefs/tests.c
@@ -619,8 +619,8 @@ void bch2_btree_perf_test(struct bch_fs *c, const char *testname,
time = j.finish - j.start;
scnprintf(name_buf, sizeof(name_buf), "%s:", testname);
- bch2_hprint(nr_buf, nr);
- bch2_hprint(per_sec_buf, nr * NSEC_PER_SEC / time);
+ bch2_hprint(&PBUF(nr_buf), nr);
+ bch2_hprint(&PBUF(per_sec_buf), nr * NSEC_PER_SEC / time);
printk(KERN_INFO "%-12s %s with %u threads in %5llu sec, %5llu nsec per iter, %5s per sec\n",
name_buf, nr_buf, nr_threads,
time / NSEC_PER_SEC,
diff --git a/fs/bcachefs/util.c b/fs/bcachefs/util.c
index bb6b4383d33f..8931aa6a1e2a 100644
--- a/fs/bcachefs/util.c
+++ b/fs/bcachefs/util.c
@@ -100,10 +100,10 @@ STRTO_H(strtoint, int)
STRTO_H(strtouint, unsigned int)
STRTO_H(strtoll, long long)
STRTO_H(strtoull, unsigned long long)
+STRTO_H(strtou64, u64)
-ssize_t bch2_hprint(char *buf, s64 v)
+void bch2_hprint(struct printbuf *buf, s64 v)
{
- char dec[4] = "";
int u, t = 0;
for (u = 0; v >= 1024 || v <= -1024; u++) {
@@ -111,17 +111,16 @@ ssize_t bch2_hprint(char *buf, s64 v)
v >>= 10;
}
- if (!u)
- return sprintf(buf, "%lli", v);
+ pr_buf(buf, "%lli", v);
/*
* 103 is magic: t is in the range [-1023, 1023] and we want
* to turn it into [-9, 9]
*/
- if (v < 100 && v > -100)
- scnprintf(dec, sizeof(dec), ".%i", t / 103);
-
- return sprintf(buf, "%lli%s%c", v, dec, si_units[u]);
+ if (u && v < 100 && v > -100)
+ pr_buf(buf, ".%i", t / 103);
+ if (u)
+ pr_buf(buf, "%c", si_units[u]);
}
void bch2_string_opt_to_text(struct printbuf *out,
@@ -483,12 +482,12 @@ size_t bch2_pd_controller_print_debug(struct bch_pd_controller *pd, char *buf)
char change[21];
s64 next_io;
- bch2_hprint(rate, pd->rate.rate);
- bch2_hprint(actual, pd->last_actual);
- bch2_hprint(target, pd->last_target);
- bch2_hprint(proportional, pd->last_proportional);
- bch2_hprint(derivative, pd->last_derivative);
- bch2_hprint(change, pd->last_change);
+ bch2_hprint(&PBUF(rate), pd->rate.rate);
+ bch2_hprint(&PBUF(actual), pd->last_actual);
+ bch2_hprint(&PBUF(target), pd->last_target);
+ bch2_hprint(&PBUF(proportional), pd->last_proportional);
+ bch2_hprint(&PBUF(derivative), pd->last_derivative);
+ bch2_hprint(&PBUF(change), pd->last_change);
next_io = div64_s64(pd->rate.next - local_clock(), NSEC_PER_MSEC);
diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h
index 47afd3955c7a..7d1e6cc6afda 100644
--- a/fs/bcachefs/util.h
+++ b/fs/bcachefs/util.h
@@ -265,6 +265,7 @@ int bch2_strtoint_h(const char *, int *);
int bch2_strtouint_h(const char *, unsigned int *);
int bch2_strtoll_h(const char *, long long *);
int bch2_strtoull_h(const char *, unsigned long long *);
+int bch2_strtou64_h(const char *, u64 *);
static inline int bch2_strtol_h(const char *cp, long *res)
{
@@ -333,7 +334,7 @@ static inline int bch2_strtoul_h(const char *cp, long *res)
: type_is(var, char *) ? "%s\n" \
: "%i\n", var)
-ssize_t bch2_hprint(char *buf, s64 v);
+void bch2_hprint(struct printbuf *, s64);
bool bch2_is_zero(const void *, size_t);
--
2.30.9