| From 9a894ea989fa7c49a7159a1e718f5237ef6d3cb4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 19 Jun 2021 17:37:00 +0800 |
| Subject: blk-wbt: make sure throttle is enabled properly |
| |
| From: Zhang Yi <yi.zhang@huawei.com> |
| |
| [ 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 <yi.zhang@huawei.com> |
| Link: https://lore.kernel.org/r/20210619093700.920393-3-yi.zhang@huawei.com |
| Signed-off-by: Jens Axboe <axboe@kernel.dk> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| block/blk-wbt.c | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| diff --git a/block/blk-wbt.c b/block/blk-wbt.c |
| index d90082c6b41f..35d81b5deae1 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)) |
| -- |
| 2.30.2 |
| |