bcachefs: bch2_copygc_wakeup()
PATCH 1/3 bcachefs: bch2_copygc_wakeup()
Signed-off-by Kent Overstreet <[email protected]>
--- fs/bcachefs/movinggc.h | 9 +++++++++ fs/bcachefs/rebalance.c | 4 ++-- fs/bcachefs/rebalance.h | 2 +- fs/bcachefs/super.c | 4 ++-- fs/bcachefs/sysfs.c | 7 +++---- 5 files changed, 17 insertions(+), 9 deletions(-)
fs/bcachefs/movinggc.h +9 -0
@@ -5,6 +5,15 @@unsigned long bch2_copygc_wait_amount (struct bch_fs *);void bch2_copygc_wait_to_text (struct printbuf *,struct bch_fs *); +static inline void bch2_copygc_wakeup (struct bch_fs *c) +{ +rcu_read_lock (); +struct task_struct *p =rcu_dereference (c->copygc_thread); +if (p) +wake_up_process (p); +rcu_read_unlock (); +} +void bch2_copygc_stop (struct bch_fs *);int bch2_copygc_start (struct bch_fs *);void bch2_fs_copygc_init (struct bch_fs *);
fs/bcachefs/rebalance.c +2 -2
@@ -268,7 +268,7 @@ int bch2_set_rebalance_needs_scan(struct bch_fs *c, u64 inum)int ret =bch2_trans_commit_do (c,NULL ,NULL , BCH_TRANS_COMMIT_no_enospc,bch2_set_rebalance_needs_scan_trans (trans, inum)); -rebalance_wakeup (c); +bch2_rebalance_wakeup (c);return ret; }
@@ -670,7 +670,7 @@ void bch2_rebalance_stop(struct bch_fs *c) c->rebalance.thread =NULL ;if (p) { -/* for sychronizing with rebalance_wakeup() */ +/* for sychronizing with bch2_rebalance_wakeup() */ synchronize_rcu ();kthread_stop (p);
fs/bcachefs/rebalance.h +1 -1
@@ -37,7 +37,7 @@ int bch2_set_rebalance_needs_scan_trans(struct btree_trans *, u64);int bch2_set_rebalance_needs_scan (struct bch_fs *,u64 inum);int bch2_set_fs_needs_rebalance (struct bch_fs *); -static inline void rebalance_wakeup (struct bch_fs *c) +static inline void bch2_rebalance_wakeup (struct bch_fs *c) {struct task_struct *p;
fs/bcachefs/super.c +2 -2
@@ -1526,7 +1526,7 @@ static int bch2_dev_attach_bdev(struct bch_fs *c, struct bch_sb_handle *sb)strscpy (ca->name, name.buf,sizeof (ca->name));printbuf_exit (&name); -rebalance_wakeup (c); +bch2_rebalance_wakeup (c);return 0 ; }
@@ -1672,7 +1672,7 @@ int __bch2_dev_set_state(struct bch_fs *c, struct bch_dev *ca,if (new_state == BCH_MEMBER_STATE_rw)__bch2_dev_read_write (c, ca); -rebalance_wakeup (c); +bch2_rebalance_wakeup (c);return ret; }
fs/bcachefs/sysfs.c +3 -4
@@ -766,11 +766,10 @@ static ssize_t sysfs_opt_store(struct bch_fs *c,bch2_set_rebalance_needs_scan (c,0 );if (v && id == Opt_rebalance_enabled) -rebalance_wakeup (c); +bch2_rebalance_wakeup (c); -if (v && id == Opt_copygc_enabled && - c->copygc_thread) -wake_up_process (c->copygc_thread); +if (v && id == Opt_copygc_enabled) +bch2_copygc_wakeup (c);if (id == Opt_discard && !ca) {mutex_lock (&c->sb_lock);
Signature · 1 line
2.49.0
PATCH 2/3 bcachefs: Clean up option pre/post hooks, small fixes
The helpers are now:
- bch2_opt_hook_pre_set()
- bch2_opts_hooks_pre_set()
- bch2_opt_hook_post_set
Fix a bug where the filesystem discard option would incorrectly be changed when setting the device option, and don't trigger rebalance scans unnecessarily (when options aren't changing).
Signed-off-by Kent Overstreet <[email protected]>
--- fs/bcachefs/inode.h | 2 +- fs/bcachefs/opts.c | 81 +++++++++++++++++++++++++++++++++++++++------ fs/bcachefs/opts.h | 11 +++--- fs/bcachefs/super.c | 2 +- fs/bcachefs/sysfs.c | 29 ++++------------ fs/bcachefs/xattr.c | 2 +- 6 files changed, 87 insertions(+), 40 deletions(-)
fs/bcachefs/inode.h +1 -1
@@ -284,7 +284,7 @@ static inline bool bch2_inode_should_have_single_bp(struct bch_inode_unpacked *istruct bch_opts bch2_inode_opts_to_opts (struct bch_inode_unpacked *);void bch2_inode_opts_get (struct bch_io_opts *,struct bch_fs *,struct bch_inode_unpacked *); -int bch2_inum_opts_get (struct btree_trans *,subvol_inum ,struct bch_io_opts *); +int bch2_inum_opts_get (struct btree_trans *,subvol_inum ,struct bch_io_opts *);#include "rebalance.h"
fs/bcachefs/opts.c +71 -10
141 lines not on this page · raw message
fs/bcachefs/opts.h +7 -4
@@ -607,10 +607,10 @@ void bch2_opt_set_by_id(struct bch_opts *, enum bch_opt_id, u64);u64 bch2_opt_from_sb (struct bch_sb *,enum bch_opt_id ,int );int bch2_opts_from_sb (struct bch_opts *,struct bch_sb *); -void __bch2_opt_set_sb (struct bch_sb *,int ,const struct bch_option *,u64 ); +bool __bch2_opt_set_sb (struct bch_sb *,int ,const struct bch_option *,u64 );struct bch_dev ; -void bch2_opt_set_sb (struct bch_fs *,struct bch_dev *,const struct bch_option *,u64 ); +bool bch2_opt_set_sb (struct bch_fs *,struct bch_dev *,const struct bch_option *,u64 );int bch2_opt_lookup (const char *);int bch2_opt_validate (const struct bch_option *,u64 ,struct printbuf *);
@@ -627,8 +627,11 @@ 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 *,struct bch_dev *,int ,u64 ); -int bch2_opts_check_may_set (struct bch_fs *); +int bch2_opt_hook_pre_set (struct bch_fs *,struct bch_dev *,enum bch_opt_id ,u64 ); +int bch2_opts_hooks_pre_set (struct bch_fs *); +void bch2_opt_hook_post_set (struct bch_fs *,struct bch_dev *,u64 , +struct bch_opts *,enum bch_opt_id ); +int bch2_parse_one_mount_opt (struct bch_fs *,struct bch_opts *,struct printbuf *,const char *,const char *); int bch2_parse_mount_opts(struct bch_fs *, struct bch_opts *, struct printbuf *,
fs/bcachefs/super.c +1 -1
@@ -1099,7 +1099,7 @@ int bch2_fs_start(struct bch_fs *c)if (ret) goto err; - ret =bch2_opts_check_may_set (c); + ret =bch2_opts_hooks_pre_set (c);if (ret) goto err;
fs/bcachefs/sysfs.c +6 -23
@@ -749,36 +749,19 @@ static ssize_t sysfs_opt_store(struct bch_fs *c,u64 v; ret =bch2_opt_parse (c, opt,strim (tmp), &v,NULL ) ?: -bch2_opt_check_may_set (c, ca, id, v); +bch2_opt_hook_pre_set (c, ca, id, v);kfree (tmp);if (ret <0 ) goto err; -bch2_opt_set_sb (c, ca, opt, v); -bch2_opt_set_by_id (&c->opts, id, v); +bool changed =bch2_opt_set_sb (c, ca, opt, v); -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 ); +if (!ca) +bch2_opt_set_by_id (&c->opts, id, v); -if (v && id == Opt_rebalance_enabled) -bch2_rebalance_wakeup (c); - -if (v && id == Opt_copygc_enabled) -bch2_copygc_wakeup (c); - -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); - } +if (changed) +bch2_opt_hook_post_set (c, ca,0 , &c->opts, id); ret = size; err:
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,NULL , opt_id, v); + ret =bch2_opt_hook_pre_set (c,NULL , opt_id, v);if (ret <0 ) goto err_class_exit;
Signature · 1 line
2.49.0
PATCH 3/3 bcachefs: Incompatible features may now be enabled at runtime
In reply to Kent Overstreetversion_upgrade is now a runtime option.
In the future we'll want to add compatible upgrades at runtime, and call the full check_version_upgrade() when the option changes, but we don't have compatible optional upgrades just yet.
Signed-off-by Kent Overstreet <[email protected]>
--- fs/bcachefs/opts.c | 9 +++++++++ fs/bcachefs/opts.h | 2 +- fs/bcachefs/recovery.c | 4 ++-- fs/bcachefs/super-io.c | 25 +++++++++++++++++++++++++ fs/bcachefs/super-io.h | 1 + 5 files changed, 38 insertions(+), 3 deletions(-)
fs/bcachefs/opts.c +9 -0
@@ -595,6 +595,15 @@ void bch2_opt_hook_post_set(struct bch_fs *c, struct bch_dev *ca, u64 inum,mutex_unlock (&c->sb_lock); }break ; +case Opt_version_upgrade: +/* +* XXX: in the future we'll likely want to do compatible +* upgrades at runtime as well, but right now there's nothing +* that does that: +*/ +if (new_opts->version_upgrade == BCH_VERSION_UPGRADE_incompatible) +bch2_sb_upgrade_incompat (c); +break ;default :break ; }
fs/bcachefs/opts.h +1 -1
@@ -445,7 +445,7 @@ enum fsck_err_opts { BCH2_NO_SB_OPT, false, \ NULL, "Reconstruct alloc btree") \x (version_upgrade, u8, \ -OPT_FS |OPT_MOUNT , \ +OPT_FS |OPT_MOUNT |OPT_RUNTIME , \OPT_STR (bch2_version_upgrade_opts), \BCH_SB_VERSION_UPGRADE , BCH_VERSION_UPGRADE_compatible, \ NULL, "Set superblock to latest version,\n" \
fs/bcachefs/recovery.c +2 -2
@@ -666,7 +666,7 @@ static bool check_version_upgrade(struct bch_fs *c) bch2_recovery_passes_from_stable(le64_to_cpu(passes))); } -bch_info (c,"%s" , buf.buf); +bch_notice (c,"%s" , buf.buf);printbuf_exit (&buf); ret = true;
@@ -682,7 +682,7 @@ static bool check_version_upgrade(struct bch_fs *c)bch2_version_to_text (&buf, c->sb.version_incompat_allowed);prt_newline (&buf); -bch_info (c,"%s" , buf.buf); +bch_notice (c,"%s" , buf.buf);printbuf_exit (&buf); ret = true;
fs/bcachefs/super-io.c +25 -0
@@ -1273,6 +1273,31 @@ void bch2_sb_upgrade(struct bch_fs *c, unsigned new_version, bool incompat) } } +void bch2_sb_upgrade_incompat (struct bch_fs *c) +{ +mutex_lock (&c->sb_lock); +if (c->sb.version == c->sb.version_incompat_allowed) + goto unlock; + +struct printbuf buf =PRINTBUF ; + +prt_str (&buf,"Now allowing incompatible features up to " ); +bch2_version_to_text (&buf, c->sb.version); +prt_str (&buf,", previously allowed up to " ); +bch2_version_to_text (&buf, c->sb.version_incompat_allowed); +prt_newline (&buf); + +bch_notice (c,"%s" , buf.buf); +printbuf_exit (&buf); + + c->disk_sb.sb->features[0 ] |=cpu_to_le64 (BCH_SB_FEATURES_ALL ); +SET_BCH_SB_VERSION_INCOMPAT_ALLOWED (c->disk_sb.sb, +max (BCH_SB_VERSION_INCOMPAT_ALLOWED (c->disk_sb.sb), c->sb.version)); +bch2_write_super (c); +unlock: +mutex_unlock (&c->sb_lock); +} +static int bch2_sb_ext_validate (struct bch_sb *sb,struct bch_sb_field *f,enum bch_validate_flags flags,struct printbuf *err) {
fs/bcachefs/super-io.h +1 -0
@@ -107,6 +107,7 @@ static inline void bch2_check_set_feature(struct bch_fs *c, unsigned feat)bool bch2_check_version_downgrade (struct bch_fs *);void bch2_sb_upgrade (struct bch_fs *,unsigned ,bool ); +void bch2_sb_upgrade_incompat (struct bch_fs *);void __bch2_sb_field_to_text (struct printbuf *,struct bch_sb *,struct bch_sb_field *);
Signature · 1 line
2.49.0