diff options
| author | Yu Kuai <yukuai3@huawei.com> | 2022-10-19 14:15:18 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-10-24 02:59:17 +0200 |
| commit | 671fae5e51297fc76b3758ca2edd514858734a6a (patch) | |
| tree | a7f429a319b75d06d43e3d4d757e2f2f664fbceb /block/bfq-iosched.c | |
| parent | elevator: add new field flags in struct elevator_queue (diff) | |
| download | linux-671fae5e51297fc76b3758ca2edd514858734a6a.tar.xz linux-671fae5e51297fc76b3758ca2edd514858734a6a.zip | |
blk-wbt: don't enable throttling if default elevator is bfq
Commit b5dc5d4d1f4f ("block,bfq: Disable writeback throttling") tries to
disable wbt for bfq, it's done by calling wbt_disable_default() in
bfq_init_queue(). However, wbt is still enabled if default elevator is
bfq:
device_add_disk
elevator_init_mq
bfq_init_queue
wbt_disable_default -> done nothing
blk_register_queue
wbt_enable_default -> wbt is enabled
Fix the problem by adding a new flag ELEVATOR_FLAG_DISBALE_WBT, bfq
will set the flag in bfq_init_queue, and following wbt_enable_default()
won't enable wbt while the flag is set.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20221019121518.3865235-7-yukuai1@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/bfq-iosched.c')
| -rw-r--r-- | block/bfq-iosched.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 7ea427817f7f..ccfadc6f71bf 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -7045,6 +7045,7 @@ static void bfq_exit_queue(struct elevator_queue *e) #endif blk_stat_disable_accounting(bfqd->queue); + clear_bit(ELEVATOR_FLAG_DISABLE_WBT, &e->flags); wbt_enable_default(bfqd->queue); kfree(bfqd); @@ -7190,6 +7191,7 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) /* We dispatch from request queue wide instead of hw queue */ blk_queue_flag_set(QUEUE_FLAG_SQ_SCHED, q); + set_bit(ELEVATOR_FLAG_DISABLE_WBT, &eq->flags); wbt_disable_default(q); blk_stat_enable_accounting(q); |