hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8ND38
--------------------------------
Since 88c4110e635b ("cgroup: Support iocost for cgroup v1"), iocost is enabled in cgroup v1. Provide BLK_CGROUP_LEGACY_IOCOST to control this function.
Fixes: 88c4110e635b ("cgroup: Support iocost for cgroup v1") Signed-off-by: Li Nan linan122@huawei.com --- block/blk-iocost.c | 4 ++++ block/Kconfig | 8 ++++++++ 2 files changed, 12 insertions(+)
diff --git a/block/blk-iocost.c b/block/blk-iocost.c index d0bdb286632f..92ad34e95378 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -3490,6 +3490,7 @@ static ssize_t ioc_cost_model_write(struct kernfs_open_file *of, char *input, return ret; }
+#ifdef CONFIG_BLK_CGROUP_LEGACY_IOCOST static struct cftype ioc_legacy_files[] = { { .name = "cost.weight", @@ -3511,6 +3512,7 @@ static struct cftype ioc_legacy_files[] = { }, {} }; +#endif
static struct cftype ioc_files[] = { { @@ -3536,7 +3538,9 @@ static struct cftype ioc_files[] = {
static struct blkcg_policy blkcg_policy_iocost = { .dfl_cftypes = ioc_files, +#ifdef CONFIG_BLK_CGROUP_LEGACY_IOCOST .legacy_cftypes = ioc_legacy_files, +#endif .cpd_alloc_fn = ioc_cpd_alloc, .cpd_free_fn = ioc_cpd_free, .pd_alloc_fn = ioc_pd_alloc, diff --git a/block/Kconfig b/block/Kconfig index f1364d1c0d93..d34ea2227917 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -157,6 +157,14 @@ config BLK_CGROUP_IOCOST distributes IO capacity between different groups based on their share of the overall weight distribution.
+config BLK_CGROUP_LEGACY_IOCOST + bool "Enable iocost in cgroup v1" + default n + depends on BLK_CGROUP_IOCOST=y + help + Enabling this option enables the .cost.weight interface for cost + model based proportional IO control when cgroup is version 1. + config BLK_CGROUP_IOPRIO bool "Cgroup I/O controller for assigning an I/O priority class" depends on BLK_CGROUP