| Message ID | 20230328145701.33699-1-zhouchengming@bytedance.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] block, bfq: remove BFQ_WEIGHT_LEGACY_DFL | expand |
On Tue, Mar 28, 2023 at 10:56:58PM +0800, Chengming Zhou wrote: > BFQ_WEIGHT_LEGACY_DFL is the same as CGROUP_WEIGHT_DFL, which means > we don't need cpd_bind_fn() callback to update default weight when > attached to a hierarchy. > > This patch remove BFQ_WEIGHT_LEGACY_DFL and cpd_bind_fn(). > > Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com> For 1-3, Acked-by: Tejun Heo <tj@kernel.org> Thanks.
On 2023/3/30 02:59, Tejun Heo wrote: > On Tue, Mar 28, 2023 at 10:56:58PM +0800, Chengming Zhou wrote: >> BFQ_WEIGHT_LEGACY_DFL is the same as CGROUP_WEIGHT_DFL, which means >> we don't need cpd_bind_fn() callback to update default weight when >> attached to a hierarchy. >> >> This patch remove BFQ_WEIGHT_LEGACY_DFL and cpd_bind_fn(). >> >> Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com> > > For 1-3, > > Acked-by: Tejun Heo <tj@kernel.org> > > Thanks. > Thanks, I will drop the last patch and send v2 with the tag.
diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 89ffb3aa992c..a2ab5dd58068 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -504,8 +504,7 @@ static void bfq_cpd_init(struct blkcg_policy_data *cpd) { struct bfq_group_data *d = cpd_to_bfqgd(cpd); - d->weight = cgroup_subsys_on_dfl(io_cgrp_subsys) ? - CGROUP_WEIGHT_DFL : BFQ_WEIGHT_LEGACY_DFL; + d->weight = CGROUP_WEIGHT_DFL; } static void bfq_cpd_free(struct blkcg_policy_data *cpd) @@ -1302,7 +1301,6 @@ struct blkcg_policy blkcg_policy_bfq = { .cpd_alloc_fn = bfq_cpd_alloc, .cpd_init_fn = bfq_cpd_init, - .cpd_bind_fn = bfq_cpd_init, .cpd_free_fn = bfq_cpd_free, .pd_alloc_fn = bfq_pd_alloc, diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 69aaee52285a..467e8cfc41a2 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -20,7 +20,6 @@ #define BFQ_DEFAULT_QUEUE_IOPRIO 4 -#define BFQ_WEIGHT_LEGACY_DFL 100 #define BFQ_DEFAULT_GRP_IOPRIO 0 #define BFQ_DEFAULT_GRP_CLASS IOPRIO_CLASS_BE
BFQ_WEIGHT_LEGACY_DFL is the same as CGROUP_WEIGHT_DFL, which means we don't need cpd_bind_fn() callback to update default weight when attached to a hierarchy. This patch remove BFQ_WEIGHT_LEGACY_DFL and cpd_bind_fn(). Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com> --- block/bfq-cgroup.c | 4 +--- block/bfq-iosched.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-)