From: Yu Kuai yukuai3@huawei.com
[ Upstream commit 8796acbc9a0eceeddd99eaef833bdda1241d39b9 ]
Commit b5dc5d4d1f4f ("block,bfq: Disable writeback throttling") disable wbt for bfq, because different write-throttling heuristics should not work together.
For the same reason, wbt and iocost should not work together as well, unless admin really want to do that, dispite that performance is affected.
Signed-off-by: Yu Kuai yukuai3@huawei.com Acked-by: Tejun Heo tj@kernel.org Link: https://lore.kernel.org/r/20221012094035.390056-2-yukuai1@huaweicloud.com Signed-off-by: Jens Axboe axboe@kernel.dk Stable-dep-of: f814bdda774c ("blk-wbt: Fix detection of dirty-throttled tasks") Signed-off-by: Sasha Levin sashal@kernel.org --- block/blk-iocost.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/block/blk-iocost.c b/block/blk-iocost.c index e6557024e3da8..3788774a7b729 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -3281,9 +3281,11 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input, blk_stat_enable_accounting(disk->queue); blk_queue_flag_set(QUEUE_FLAG_RQ_ALLOC_TIME, disk->queue); ioc->enabled = true; + wbt_disable_default(disk->queue); } else { blk_queue_flag_clear(QUEUE_FLAG_RQ_ALLOC_TIME, disk->queue); ioc->enabled = false; + wbt_enable_default(disk->queue); }
if (user) {