From: Zhang Yi Date: Sat, 19 Jun 2021 09:37:00 +0000 (+0800) Subject: blk-wbt: make sure throttle is enabled properly X-Git-Tag: Ubuntu-5.11.0-34.36~373 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e25fa5613c6d0a4191348d47f937d1659f6b6c42;p=mirror_ubuntu-hirsute-kernel.git blk-wbt: make sure throttle is enabled properly BugLink: https://bugs.launchpad.net/bugs/1938340 [ Upstream commit 76a8040817b4b9c69b53f9b326987fa891b4082a ] After commit a79050434b45 ("blk-rq-qos: refactor out common elements of blk-wbt"), if throttle was disabled by wbt_disable_default(), we could not enable again, fix this by set enable_state back to WBT_STATE_ON_DEFAULT. Fixes: a79050434b45 ("blk-rq-qos: refactor out common elements of blk-wbt") Signed-off-by: Zhang Yi Link: https://lore.kernel.org/r/20210619093700.920393-3-yi.zhang@huawei.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin Signed-off-by: Kamal Mostafa Signed-off-by: Stefan Bader --- diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 3aaeefe393c8..4ec0a018a2ad 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -637,9 +637,13 @@ void wbt_set_write_cache(struct request_queue *q, bool write_cache_on) void wbt_enable_default(struct request_queue *q) { struct rq_qos *rqos = wbt_rq_qos(q); + /* Throttling already enabled? */ - if (rqos) + if (rqos) { + if (RQWB(rqos)->enable_state == WBT_STATE_OFF_DEFAULT) + RQWB(rqos)->enable_state = WBT_STATE_ON_DEFAULT; return; + } /* Queue not registered? Maybe shutting down... */ if (!blk_queue_registered(q))