Re: [PATCH 08/10] blkcg: implement blk-iocost
From: Tejun Heo
Date: Wed Sep 11 2019 - 11:55:03 EST
Hey,
On Wed, Sep 11, 2019 at 07:16:30AM -0700, Tejun Heo wrote:
> > > I can implement
> > > the switching if so.
> >
> > That would be perfect.
>
> Whichever way it gets decided, this is easy enough. I'll prep a
> patch.
Here's the patch.
* It disables iocost when bfq iosched is selected. iocost is only
re-enabled when bfq module is unloaded. While it can easily be made
to flip when there's no bfq queue left, I think minimizing the
number of switches is likely is better.
* It looks like building bfq as module has been broken for some time
and I added symbol exports to make it work. They should be
separated into a separate patch.
* It doesn't actually rename any of the bfq interface files. It just
gets rid of potential conflict from iocost.
Please feel free to use / modify the patch however you see fit.
Thanks.
---
diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 86a607cf19a1..decda96770f4 100644
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -1194,7 +1194,9 @@ struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node)
}
struct blkcg_policy blkcg_policy_bfq = {
+#ifndef CONFIG_BLK_CGROUP_IOCOST
.dfl_cftypes = bfq_blkg_files,
+#endif
.legacy_cftypes = bfq_blkcg_legacy_files,
.cpd_alloc_fn = bfq_cpd_alloc,
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index b33be928d164..b4aaeef1fb87 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -6365,6 +6365,36 @@ static void bfq_init_root_group(struct bfq_group *root_group,
root_group->sched_data.bfq_class_idle_last_service = jiffies;
}
+#if defined(CONFIG_BFQ_GROUP_IOSCHED) && defined(CONFIG_BLK_CGROUP_IOCOST)
+static bool bfq_enabled = false;
+
+static void bfq_enable(void)
+{
+ static DEFINE_MUTEX(bfq_enable_mutex);
+
+ mutex_lock(&bfq_enable_mutex);
+ if (!bfq_enabled) {
+ pr_info("bfq-iosched: Overriding iocost\n");
+ blkcg_policy_unregister(&blkcg_policy_iocost);
+ cgroup_add_dfl_cftypes(&io_cgrp_subsys, bfq_blkg_files);
+ bfq_enabled = true;
+ }
+ mutex_unlock(&bfq_enable_mutex);
+}
+
+static void __exit bfq_disable(void)
+{
+ if (bfq_enabled) {
+ pr_info("bfq-iosched: Restoring iocost\n");
+ cgroup_rm_cftypes(bfq_blkg_files);
+ blkcg_policy_register(&blkcg_policy_iocost);
+ }
+}
+#else
+static void bfq_enable(void) {}
+static void __exit bfq_disable(void) {}
+#endif
+
static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
{
struct bfq_data *bfqd;
@@ -6489,6 +6519,7 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
bfq_init_entity(&bfqd->oom_bfqq.entity, bfqd->root_group);
wbt_disable_default(q);
+ bfq_enable();
return 0;
out_free:
@@ -6806,6 +6837,7 @@ static void __exit bfq_exit(void)
blkcg_policy_unregister(&blkcg_policy_bfq);
#endif
bfq_slab_kill();
+ bfq_disable();
}
module_init(bfq_init);
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 0e2619c1a422..b6f20be0fc78 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -900,6 +900,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol,
}
return ret;
}
+EXPORT_SYMBOL_GPL(blkg_conf_prep);
/**
* blkg_conf_finish - finish up per-blkg config update
@@ -915,6 +916,7 @@ void blkg_conf_finish(struct blkg_conf_ctx *ctx)
rcu_read_unlock();
put_disk_and_module(ctx->disk);
}
+EXPORT_SYMBOL_GPL(blkg_conf_finish);
static int blkcg_print_stat(struct seq_file *sf, void *v)
{
diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index 3b39deb8b9f8..1ef5b443c09a 100644
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -605,8 +605,6 @@ static u32 vrate_adj_pct[] =
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 16 };
-static struct blkcg_policy blkcg_policy_iocost;
-
/* accessors and helpers */
static struct ioc *rqos_to_ioc(struct rq_qos *rqos)
{
@@ -2434,7 +2432,7 @@ static struct cftype ioc_files[] = {
{}
};
-static struct blkcg_policy blkcg_policy_iocost = {
+struct blkcg_policy blkcg_policy_iocost = {
.dfl_cftypes = ioc_files,
.cpd_alloc_fn = ioc_cpd_alloc,
.cpd_free_fn = ioc_cpd_free,
@@ -2442,6 +2440,7 @@ static struct blkcg_policy blkcg_policy_iocost = {
.pd_init_fn = ioc_pd_init,
.pd_free_fn = ioc_pd_free,
};
+EXPORT_SYMBOL_GPL(blkcg_policy_iocost);
static int __init ioc_init(void)
{
diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
index bed9e43f9426..5669e3cfa1bc 100644
--- a/include/linux/blk-cgroup.h
+++ b/include/linux/blk-cgroup.h
@@ -815,6 +815,11 @@ static inline void blkcg_clear_delay(struct blkcg_gq *blkg)
void blkcg_add_delay(struct blkcg_gq *blkg, u64 now, u64 delta);
void blkcg_schedule_throttle(struct request_queue *q, bool use_memdelay);
void blkcg_maybe_throttle_current(void);
+
+#ifdef CONFIG_BLK_CGROUP_IOCOST
+extern struct blkcg_policy blkcg_policy_iocost;
+#endif
+
#else /* CONFIG_BLK_CGROUP */
struct blkcg {
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 753afbca549f..ced23229f359 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -4059,6 +4059,7 @@ int cgroup_rm_cftypes(struct cftype *cfts)
mutex_unlock(&cgroup_mutex);
return ret;
}
+EXPORT_SYMBOL_GPL(cgroup_rm_cftypes);
/**
* cgroup_add_cftypes - add an array of cftypes to a subsystem
@@ -4115,6 +4116,7 @@ int cgroup_add_dfl_cftypes(struct cgroup_subsys *ss, struct cftype *cfts)
cft->flags |= __CFTYPE_ONLY_ON_DFL;
return cgroup_add_cftypes(ss, cfts);
}
+EXPORT_SYMBOL_GPL(cgroup_add_dfl_cftypes);
/**
* cgroup_add_legacy_cftypes - add an array of cftypes for legacy hierarchies