device option handling improvements
cover device option handling improvements
Previously, device options had a fair bit of special casing - superblock getter/setters, sysfs code.
This does a fair bit of cleanup and unifying, to fix a couple things
- discard option should now be working properly in all cases, i.e. when set at format time
- with the latest tools, all the device options can be set at device add time, in particular data_allowed and state (for spare/ro)
The io path option state changes are still a bit more "special" than I'd like, but foreground_target now also triggers a rebalance when necessary.
Kent Overstreet (5):
bcachefs: Kill BCH_DEV_OPT_SETTERS()
bcachefs: Device options now use standard sysfs code
bcachefs: Setting foreground_target at runtime now triggers rebalance
bcachefs: Device state is now a runtime option
bcachefs: Filesystem discard option now propagates to devices
fs/bcachefs/alloc_background.c | 15 +++- fs/bcachefs/bcachefs.h | 3 +- fs/bcachefs/fs.c | 3 + fs/bcachefs/opts.c | 117 +++++++++++++++-------------- fs/bcachefs/opts.h | 52 ++++++------- fs/bcachefs/sb-members_format.h | 1 + fs/bcachefs/super-io.c | 8 +- fs/bcachefs/super.c | 6 +- fs/bcachefs/sysfs.c | 126 ++++++++++++++++++-------------- fs/bcachefs/sysfs.h | 5 +- fs/bcachefs/xattr.c | 2 +- 11 files changed, 187 insertions(+), 151 deletions(-)
Signature · 1 line
2.49.0
PATCH 1/5 bcachefs: Kill BCH_DEV_OPT_SETTERS()
Previously, device options had their superblock option field listed separately, which was weird and easy to miss when defining options.
--- fs/bcachefs/opts.c | 108 +++++++++++++++----------------- fs/bcachefs/opts.h | 50 +++++++-------- fs/bcachefs/sb-members_format.h | 1 + fs/bcachefs/super-io.c | 8 +-- 4 files changed, 80 insertions(+), 87 deletions(-)
fs/bcachefs/opts.c +50 -58
@@ -163,16 +163,6 @@ const char * const bch2_d_types[BCH_DT_MAX] = { [DT_SUBVOL] = "subvol", }; -u64 BCH2_NO_SB_OPT (const struct bch_sb *sb) -{ -BUG (); -} - -void SET_BCH2_NO_SB_OPT (struct bch_sb *sb,u64 v) -{ -BUG (); -} -void bch2_opts_apply (struct bch_opts *dst,struct bch_opts src) {#define x (_name, ...) \
@@ -223,6 +213,21 @@ void bch2_opt_set_by_id(struct bch_opts *opts, enum bch_opt_id id, u64 v) } } +/* dummy option, for options that aren't stored in the superblock */ +typedef u64 (*sb_opt_get_fn )(const struct bch_sb *); +typedef void (*sb_opt_set_fn )(struct bch_sb *,u64 ); +typedef u64 (*member_opt_get_fn )(const struct bch_member *); +typedef void (*member_opt_set_fn )(struct bch_member *,u64 ); + +static const sb_opt_get_fn BCH2_NO_SB_OPT =NULL ; +static const sb_opt_set_fn SET_BCH2_NO_SB_OPT =NULL ; +static const member_opt_get_fn BCH2_NO_MEMBER_OPT =NULL ; +static const member_opt_set_fn SET_BCH2_NO_MEMBER_OPT =NULL ; + +#define type_compatible_or_null (_p, _type) \ + __builtin_choose_expr( \ + __builtin_types_compatible_p(typeof(_p), typeof(_type)), _p, NULL) +const struct bch_option bch2_opt_table[] = { #define OPT_BOOL() .type = BCH_OPT_BOOL, .min = 0, .max = 2 #define OPT_UINT(_min, _max) .type = BCH_OPT_UINT, \
@@ -239,15 +244,15 @@ const struct bch_option bch2_opt_table[] = {#define x (_name, _bits, _flags, _type, _sb_opt, _default, _hint, _help) \ [Opt_##_name] = { \ - .attr = { \ - .name = #_name, \ - .mode = (_flags) & OPT_RUNTIME ? 0644 : 0444, \ - }, \ - .flags = _flags, \ - .hint = _hint, \ - .help = _help, \ - .get_sb = _sb_opt, \ - .set_sb = SET_##_sb_opt, \ + .attr.name = #_name, \ + .attr.mode = (_flags) & OPT_RUNTIME ? 0644 : 0444, \ + .flags = _flags, \ + .hint = _hint, \ + .help = _help, \ + .get_sb = type_compatible_or_null(_sb_opt, *BCH2_NO_SB_OPT), \ + .set_sb = type_compatible_or_null(SET_##_sb_opt,*SET_BCH2_NO_SB_OPT), \ + .get_member = type_compatible_or_null(_sb_opt, *BCH2_NO_MEMBER_OPT), \ + .set_member = type_compatible_or_null(SET_##_sb_opt,*SET_BCH2_NO_MEMBER_OPT),\ _type \ },
@@ -495,12 +500,8 @@ int bch2_opt_check_may_set(struct bch_fs *c, int id, u64 v)int bch2_opts_check_may_set (struct bch_fs *c) { -unsigned i; -int ret; - -for (i =0 ; i < bch2_opts_nr; i++) { - ret =bch2_opt_check_may_set (c, i, -bch2_opt_get_by_id (&c->opts, i)); +for (unsigned i =0 ; i < bch2_opts_nr; i++) { +int ret =bch2_opt_check_may_set (c, i,bch2_opt_get_by_id (&c->opts, i));if (ret)return ret; }
@@ -619,12 +620,25 @@ int bch2_parse_mount_opts(struct bch_fs *c, struct bch_opts *opts,return ret; } -u64 bch2_opt_from_sb (struct bch_sb *sb,enum bch_opt_id id) +u64 bch2_opt_from_sb (struct bch_sb *sb,enum bch_opt_id id,int dev_idx) {const struct bch_option *opt = bch2_opt_table + id;u64 v; - v = opt->get_sb (sb); +if (dev_idx <0 ) { + v = opt->get_sb (sb); + }else { +if (WARN (!bch2_member_exists (sb, dev_idx), +"tried to set device option %s on nonexistent device %i" , + opt->attr.name, dev_idx)) +return 0 ; + +struct bch_member m =bch2_sb_member_get (sb, dev_idx); + v = opt->get_member (&m); + } + +if (opt->flags &OPT_SB_FIELD_ONE_BIAS ) + --v;if (opt->flags &OPT_SB_FIELD_ILOG2 ) v =1ULL << v;
@@ -641,35 +655,19 @@ u64 bch2_opt_from_sb(struct bch_sb *sb, enum bch_opt_id id)*/ int bch2_opts_from_sb (struct bch_opts *opts,struct bch_sb *sb) { -unsigned id; - -for (id =0 ; id < bch2_opts_nr; id++) { +for (unsigned id =0 ; id < bch2_opts_nr; id++) {const struct bch_option *opt = bch2_opt_table + id; -if (opt->get_sb ==BCH2_NO_SB_OPT ) -continue ; - -bch2_opt_set_by_id (opts, id,bch2_opt_from_sb (sb, id)); +if (opt->get_sb) +bch2_opt_set_by_id (opts, id,bch2_opt_from_sb (sb, id,-1 )); }return 0 ; } -struct bch_dev_sb_opt_set { -void (*set_sb)(struct bch_member *,u64 ); -}; - -static const struct bch_dev_sb_opt_set bch2_dev_sb_opt_setters [] = { -#define x(n, set) [Opt_##n] = { .set_sb = SET_##set }, - BCH_DEV_OPT_SETTERS() -#undef x -}; -void __bch2_opt_set_sb (struct bch_sb *sb,int dev_idx,const struct bch_option *opt,u64 v) { -enum bch_opt_id id = opt - bch2_opt_table; -if (opt->flags &OPT_SB_FIELD_SECTORS ) v >>=9 ;
@@ -679,24 +677,18 @@ void __bch2_opt_set_sb(struct bch_sb *sb, int dev_idx,if (opt->flags &OPT_SB_FIELD_ONE_BIAS ) v++; -if (opt->flags &OPT_FS ) { -if (opt->set_sb !=SET_BCH2_NO_SB_OPT ) - opt->set_sb (sb, v); - } +if ((opt->flags &OPT_FS ) && opt->set_sb) + opt->set_sb (sb, v); -if ((opt->flags &OPT_DEVICE ) && dev_idx >=0 ) { +if ((opt->flags &OPT_DEVICE ) && + opt->set_member && + dev_idx >=0 ) {if (WARN (!bch2_member_exists (sb, dev_idx),"tried to set device option %s on nonexistent device %i" , opt->attr.name, dev_idx))return ; -struct bch_member *m =bch2_members_v2_get_mut (sb, dev_idx); - -const struct bch_dev_sb_opt_set *set = bch2_dev_sb_opt_setters + id; -if (set->set_sb) - set->set_sb (m, v); -else -pr_err ("option %s cannot be set via opt_set_sb()" , opt->attr.name); + opt->set_member (bch2_members_v2_get_mut (sb, dev_idx), v); } }
fs/bcachefs/opts.h +25 -25
105 lines not on this page · raw message
fs/bcachefs/sb-members_format.h +1 -0
@@ -79,6 +79,7 @@ struct bch_member {#define BCH_MEMBER_V1_BYTES 56 +LE16_BITMASK(BCH_MEMBER_BUCKET_SIZE, struct bch_member, bucket_size, 0, 16) LE64_BITMASK(BCH_MEMBER_STATE, struct bch_member, flags, 0, 4) /* 4-14 unused, was TIER, HAS_(META)DATA, REPLACEMENT */ LE64_BITMASK(BCH_MEMBER_DISCARD, struct bch_member, flags, 14, 15)
fs/bcachefs/super-io.c +4 -4
@@ -489,8 +489,8 @@ int bch2_sb_validate(struct bch_sb *sb, u64 read_offset,for (opt_id =0 ; opt_id < bch2_opts_nr; opt_id++) {const struct bch_option *opt = bch2_opt_table + opt_id; -if (opt->get_sb !=BCH2_NO_SB_OPT ) { -u64 v =bch2_opt_from_sb (sb, opt_id); +if (opt->get_sb) { +u64 v =bch2_opt_from_sb (sb, opt_id,-1 );prt_printf (out,"Invalid option " ); ret =bch2_opt_validate (opt, v, out);
@@ -1473,8 +1473,8 @@ void bch2_sb_to_text(struct printbuf *out, struct bch_sb *sb,for (id =0 ; id < bch2_opts_nr; id++) {const struct bch_option *opt = bch2_opt_table + id; -if (opt->get_sb !=BCH2_NO_SB_OPT ) { -u64 v =bch2_opt_from_sb (sb, id); +if (opt->get_sb) { +u64 v =bch2_opt_from_sb (sb, id,-1 );prt_printf (out,"%s:\t" , opt->attr.name); bch2_opt_to_text(out, NULL, sb, opt, v,
Signature · 1 line
2.49.0
PATCH 2/5 bcachefs: Device options now use standard sysfs code
In reply to Kent OverstreetDevice options now use the common code for sysfs, and can superblock fields (in a struct bch_member).
This replaces BCH_DEV_OPT_SETTERS(), which was weird and easy to miss.
--- fs/bcachefs/opts.c | 4 +- fs/bcachefs/opts.h | 2 +- fs/bcachefs/super.c | 6 +-- fs/bcachefs/sysfs.c | 113 +++++++++++++++++++++++--------------------- fs/bcachefs/sysfs.h | 5 +- fs/bcachefs/xattr.c | 2 +- 6 files changed, 69 insertions(+), 63 deletions(-)
fs/bcachefs/opts.c +2 -2
@@ -480,7 +480,7 @@ void bch2_opts_to_text(struct printbuf *out, } } -int bch2_opt_check_may_set (struct bch_fs *c,int id,u64 v) +int bch2_opt_check_may_set (struct bch_fs *c,struct bch_dev *ca,int id,u64 v) {int ret =0 ;
@@ -501,7 +501,7 @@ int bch2_opt_check_may_set(struct bch_fs *c, int id, u64 v)int bch2_opts_check_may_set (struct bch_fs *c) {for (unsigned i =0 ; i < bch2_opts_nr; i++) { -int ret =bch2_opt_check_may_set (c, i,bch2_opt_get_by_id (&c->opts, i)); +int ret =bch2_opt_check_may_set (c,NULL , i,bch2_opt_get_by_id (&c->opts, i));if (ret)return ret; }
fs/bcachefs/opts.h +1 -1
@@ -635,7 +635,7 @@ void bch2_opts_to_text(struct printbuf *, struct bch_fs *, struct bch_sb *, unsigned, unsigned, unsigned); -int bch2_opt_check_may_set (struct bch_fs *,int ,u64 ); +int bch2_opt_check_may_set (struct bch_fs *,struct bch_dev *,int ,u64 );int bch2_opts_check_may_set (struct bch_fs *);int bch2_parse_one_mount_opt (struct bch_fs *,struct bch_opts *,struct printbuf *,const char *,const char *);
fs/bcachefs/super.c +3 -3
@@ -715,7 +715,7 @@ static int bch2_fs_online(struct bch_fs *c)kobject_add (&c->time_stats, &c->kobj,"time_stats" ) ?: #endifkobject_add (&c->counters_kobj, &c->kobj,"counters" ) ?: -bch2_opts_create_sysfs_files (&c->opts_dir); +bch2_opts_create_sysfs_files (&c->opts_dir,OPT_FS );if (ret) {bch_err (c,"error creating sysfs objects" );return ret;
@@ -1297,8 +1297,8 @@ static int bch2_dev_sysfs_online(struct bch_fs *c, struct bch_dev *ca)return 0 ;if (!ca->kobj.state_in_sysfs) { - ret =kobject_add (&ca->kobj, &c->kobj, -"dev-%u" , ca->dev_idx); + ret =kobject_add (&ca->kobj, &c->kobj,"dev-%u" , ca->dev_idx) ?: +bch2_opts_create_sysfs_files (&ca->kobj,OPT_DEVICE );if (ret)return ret; }
fs/bcachefs/sysfs.c +59 -54
214 lines not on this page · raw message
fs/bcachefs/sysfs.h +3 -2
@@ -23,7 +23,7 @@ extern const struct sysfs_ops bch2_fs_opts_dir_sysfs_ops;extern const struct sysfs_ops bch2_fs_time_stats_sysfs_ops;extern const struct sysfs_ops bch2_dev_sysfs_ops; -int bch2_opts_create_sysfs_files (struct kobject *); +int bch2_opts_create_sysfs_files (struct kobject *,unsigned );#else
@@ -41,7 +41,8 @@ static const struct sysfs_ops bch2_fs_opts_dir_sysfs_ops;static const struct sysfs_ops bch2_fs_time_stats_sysfs_ops;static const struct sysfs_ops bch2_dev_sysfs_ops; -static inline int bch2_opts_create_sysfs_files (struct kobject *kobj) {return 0 ; } +static inline int bch2_opts_create_sysfs_files (struct kobject *kobj,unsigned type) +{return 0 ; }#endif /* NO_BCACHEFS_SYSFS */
fs/bcachefs/xattr.c +1 -1
@@ -523,7 +523,7 @@ static int bch2_xattr_bcachefs_set(const struct xattr_handler *handler,if (ret <0 ) goto err_class_exit; - ret =bch2_opt_check_may_set (c, opt_id, v); + ret =bch2_opt_check_may_set (c,NULL , opt_id, v);if (ret <0 ) goto err_class_exit;
Signature · 1 line
2.49.0
PATCH 3/5 bcachefs: Setting foreground_target at runtime now triggers rebalance
In reply to Kent Overstreet--- fs/bcachefs/sysfs.c | 1 + 1 file changed, 1 insertion(+)
fs/bcachefs/sysfs.c +1 -0
@@ -650,6 +650,7 @@ static ssize_t sysfs_opt_store(struct bch_fs *c,if (v && (id == Opt_background_target || + (id == Opt_foreground_target && !c->opts.background_target) || id == Opt_background_compression || (id == Opt_compression && !c->opts.background_compression)))bch2_set_rebalance_needs_scan (c,0 );
Signature · 1 line
2.49.0
PATCH 4/5 bcachefs: Device state is now a runtime option
In reply to Kent OverstreetOther options can normally be set at runtime via sysfs, no reason for this one not to be as well - it just doesn't support the degraded flags argument this way, that requires the ioctl.
--- fs/bcachefs/opts.c | 7 +++++++ fs/bcachefs/opts.h | 2 +- fs/bcachefs/sysfs.c | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-)
fs/bcachefs/opts.c +7 -0
@@ -482,9 +482,16 @@ void bch2_opts_to_text(struct printbuf *out,int bch2_opt_check_may_set (struct bch_fs *c,struct bch_dev *ca,int id,u64 v) { +lockdep_assert_held (&c->state_lock); +int ret =0 ;switch (id) { +case Opt_state: +if (ca) +return __bch2_dev_set_state (c, ca, v,BCH_FORCE_IF_DEGRADED ); +break ; +case Opt_compression:case Opt_background_compression: ret =bch2_check_set_has_compressed_data (c, v);
fs/bcachefs/opts.h +1 -1
@@ -495,7 +495,7 @@ enum fsck_err_opts { NULL, "Skip submit_bio() for data reads and writes, " \ "for performance testing purposes") \x (state, u64, \ -OPT_DEVICE , \ +OPT_DEVICE |OPT_RUNTIME , \OPT_STR (bch2_member_states), \BCH_MEMBER_STATE , BCH_MEMBER_STATE_rw, \"state" ,"rw,ro,failed,spare" ) \
fs/bcachefs/sysfs.c +3 -0
@@ -631,6 +631,8 @@ static ssize_t sysfs_opt_store(struct bch_fs *c,if (unlikely (!bch2_write_ref_tryget (c, BCH_WRITE_REF_sysfs)))return -EROFS ; +down_write (&c->state_lock); +char *tmp =kstrdup (buf,GFP_KERNEL );if (!tmp) { ret = -ENOMEM ;
@@ -664,6 +666,7 @@ static ssize_t sysfs_opt_store(struct bch_fs *c, ret = size; err: +up_write (&c->state_lock);bch2_write_ref_put (c, BCH_WRITE_REF_sysfs);return ret; }
Signature · 1 line
2.49.0
PATCH 5/5 bcachefs: Filesystem discard option now propagates to devices
In reply to Kent Overstreetthe discard option is special, because it's both a filesystem and a device option.
When set at the filesytsem level, it's supposed to propagate to (if set persistently via sysfs) or override (if non persistently as a mount option) the devices - that now works correctly.
--- fs/bcachefs/alloc_background.c | 15 ++++++++++++++- fs/bcachefs/bcachefs.h | 3 ++- fs/bcachefs/fs.c | 3 +++ fs/bcachefs/sysfs.c | 9 +++++++++ 4 files changed, 28 insertions(+), 2 deletions(-)
fs/bcachefs/alloc_background.c +14 -1
@@ -1806,6 +1806,19 @@ struct discard_buckets_state {u64 discarded; }; +/* +* This is needed because discard is both a filesystem option and a device +* option, and mount options are supposed to apply to that mount and not be +* persisted, i.e. if it's set as a mount option we can't propagate it to the +* device. +*/ +static inline bool discard_opt_enabled (struct bch_fs *c,struct bch_dev *ca) +{ +return test_bit (BCH_FS_discard_mount_opt_set, &c->flags) + ? c->opts.discard + : ca->mi.discard; +} + static int bch2_discard_one_bucket(struct btree_trans *trans, struct bch_dev *ca, struct btree_iter *need_discard_iter,
@@ -1869,7 +1882,7 @@ static int bch2_discard_one_bucket(struct btree_trans *trans, s->discarded++; *discard_pos_done = iter.pos; -if (ca->mi.discard && !c->opts.nochanges) { +if (discard_opt_enabled (c, ca) && !c->opts.nochanges) {/* * This works without any other locks because this is the only * thread that removes items from the need_discard tree
fs/bcachefs/bcachefs.h +2 -1
@@ -627,7 +627,8 @@ struct bch_dev {x (topology_error) \x (errors_fixed ) \x (errors_not_fixed) \ -x (no_invalid_checks) +x (no_invalid_checks) \ +x (discard_mount_opt_set) \ enum bch_fs_flags {#define x (n) BCH_FS_##n,
fs/bcachefs/fs.c +3 -0
@@ -2172,6 +2172,9 @@ static int bch2_fs_get_tree(struct fs_context *fc)if (ret) goto err; +if (opt_defined (opts, discard)) +set_bit (BCH_FS_discard_mount_opt_set, &c->flags); +/* Some options can't be parsed until after the fs is started: */ opts =bch2_opts_empty (); ret =bch2_parse_mount_opts (c, &opts,NULL , opts_parse->parse_later.buf);
fs/bcachefs/sysfs.c +9 -0
@@ -664,6 +664,15 @@ static ssize_t sysfs_opt_store(struct bch_fs *c, c->copygc_thread)wake_up_process (c->copygc_thread); +if (id == Opt_discard && !ca) { +mutex_lock (&c->sb_lock); +for_each_member_device (c, ca) + opt->set_member (bch2_members_v2_get_mut (ca->disk_sb.sb, ca->dev_idx), v); + +bch2_write_super (c); +mutex_unlock (&c->sb_lock); + } + ret = size; err:up_write (&c->state_lock);
Signature · 1 line
2.49.0