Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9555c6c1 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

Btrfs: add skip_balance mount option 



Since restriper kthread starts involuntarily on mount and can suck cpu
and memory bandwidth add a mount option to forcefully skip it.  The
restriper in that case hangs around in paused state and can be resumed
from userspace when it's convenient.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 59641015

fs/btrfs/ctree.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1492,6 +1492,7 @@ struct btrfs_ioctl_defrag_range_args { 
#define BTRFS_MOUNT_AUTO_DEFRAG		(1 << 16)

#define BTRFS_MOUNT_AUTO_DEFRAG		(1 << 16)

#define BTRFS_MOUNT_INODE_MAP_CACHE	(1 << 17)

#define BTRFS_MOUNT_INODE_MAP_CACHE	(1 << 17)

#define BTRFS_MOUNT_RECOVERY		(1 << 18)

#define BTRFS_MOUNT_RECOVERY		(1 << 18)

#define BTRFS_MOUNT_SKIP_BALANCE	(1 << 19)





#define btrfs_clear_opt(o, opt)		((o) &= ~BTRFS_MOUNT_##opt)

#define btrfs_clear_opt(o, opt)		((o) &= ~BTRFS_MOUNT_##opt)

#define btrfs_set_opt(o, opt)		((o) |= BTRFS_MOUNT_##opt)

#define btrfs_set_opt(o, opt)		((o) |= BTRFS_MOUNT_##opt)

fs/btrfs/super.c

+9 −2
Original line number Original line Diff line number Diff line
@@ -164,8 +164,9 @@ enum { 
	Opt_compress_type, Opt_compress_force, Opt_compress_force_type,

	Opt_compress_type, Opt_compress_force, Opt_compress_force_type,

	Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard,

	Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard,

	Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed,

	Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed,

	Opt_enospc_debug, Opt_subvolrootid, Opt_defrag,

	Opt_enospc_debug, Opt_subvolrootid, Opt_defrag, Opt_inode_cache,

	Opt_inode_cache, Opt_no_space_cache, Opt_recovery, Opt_err,

	Opt_no_space_cache, Opt_recovery, Opt_skip_balance,

	Opt_err,

};

};





static match_table_t tokens = {

static match_table_t tokens = {
@@ -200,6 +201,7 @@ static match_table_t tokens = { 
	{Opt_inode_cache, "inode_cache"},

	{Opt_inode_cache, "inode_cache"},

	{Opt_no_space_cache, "nospace_cache"},

	{Opt_no_space_cache, "nospace_cache"},

	{Opt_recovery, "recovery"},

	{Opt_recovery, "recovery"},

	{Opt_skip_balance, "skip_balance"},

	{Opt_err, NULL},

	{Opt_err, NULL},

};

};
@@ -398,6 +400,9 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) 
			printk(KERN_INFO "btrfs: enabling auto recovery");

			printk(KERN_INFO "btrfs: enabling auto recovery");

			btrfs_set_opt(info->mount_opt, RECOVERY);

			btrfs_set_opt(info->mount_opt, RECOVERY);

			break;

			break;

		case Opt_skip_balance:

			btrfs_set_opt(info->mount_opt, SKIP_BALANCE);

			break;

		case Opt_err:

		case Opt_err:

			printk(KERN_INFO "btrfs: unrecognized mount option "

			printk(KERN_INFO "btrfs: unrecognized mount option "

			       "'%s'\n", p);

			       "'%s'\n", p);
@@ -723,6 +728,8 @@ static int btrfs_show_options(struct seq_file *seq, struct vfsmount *vfs) 
		seq_puts(seq, ",autodefrag");

		seq_puts(seq, ",autodefrag");

	if (btrfs_test_opt(root, INODE_MAP_CACHE))

	if (btrfs_test_opt(root, INODE_MAP_CACHE))

		seq_puts(seq, ",inode_cache");

		seq_puts(seq, ",inode_cache");

	if (btrfs_test_opt(root, SKIP_BALANCE))

		seq_puts(seq, ",skip_balance");

	return 0;

	return 0;

}

}

fs/btrfs/volumes.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -2707,15 +2707,19 @@ static int balance_kthread(void *data) 
	struct btrfs_balance_control *bctl =

	struct btrfs_balance_control *bctl =

			(struct btrfs_balance_control *)data;

			(struct btrfs_balance_control *)data;

	struct btrfs_fs_info *fs_info = bctl->fs_info;

	struct btrfs_fs_info *fs_info = bctl->fs_info;

	int ret;

	int ret = 0;





	mutex_lock(&fs_info->volume_mutex);

	mutex_lock(&fs_info->volume_mutex);

	mutex_lock(&fs_info->balance_mutex);

	mutex_lock(&fs_info->balance_mutex);





	set_balance_control(bctl);

	set_balance_control(bctl);





	if (btrfs_test_opt(fs_info->tree_root, SKIP_BALANCE)) {

		printk(KERN_INFO "btrfs: force skipping balance\n");

	} else {

		printk(KERN_INFO "btrfs: continuing balance\n");

		printk(KERN_INFO "btrfs: continuing balance\n");

		ret = btrfs_balance(bctl, NULL);

		ret = btrfs_balance(bctl, NULL);

	}





	mutex_unlock(&fs_info->balance_mutex);

	mutex_unlock(&fs_info->balance_mutex);

	mutex_unlock(&fs_info->volume_mutex);

	mutex_unlock(&fs_info->volume_mutex);