projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1d0903d
)
blk-wbt: make sure throttle is enabled properly
author
Zhang Yi
<yi.zhang@huawei.com>
Sat, 19 Jun 2021 09:37:00 +0000
(17:37 +0800)
committer
Jens Axboe
<axboe@kernel.dk>
Mon, 21 Jun 2021 21:03:41 +0000
(15:03 -0600)
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>
block/blk-wbt.c
patch
|
blob
|
history
diff --git
a/block/blk-wbt.c
b/block/blk-wbt.c
index
0ce0883
..
3ed71b8
100644
(file)
--- a/
block/blk-wbt.c
+++ b/
block/blk-wbt.c
@@
-636,9
+636,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))