diff options
| author | Jan Kara <jack@suse.cz> | 2017-04-19 11:33:27 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-19 08:49:03 -0600 |
| commit | 8330cdb0fe55c9a9a8e440e56c19233229e0e259 (patch) | |
| tree | 644af58ba64f8cb431d01abaff81113b4ed6a835 /block/blk-wbt.c | |
| parent | ea25da48086d3bbebf3a2eeff387ea00ed96f5c4 (diff) | |
| download | linux-8330cdb0fe55c9a9a8e440e56c19233229e0e259.tar.gz linux-8330cdb0fe55c9a9a8e440e56c19233229e0e259.tar.bz2 linux-8330cdb0fe55c9a9a8e440e56c19233229e0e259.zip | |
block: Make writeback throttling defaults consistent for SQ devices
When CFQ is used as an elevator, it disables writeback throttling
because they don't play well together. Later when a different elevator
is chosen for the device, writeback throttling doesn't get enabled
again as it should. Make sure CFQ enables writeback throttling (if it
should be enabled by default) when we switch from it to another IO
scheduler.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-wbt.c')
| -rw-r--r-- | block/blk-wbt.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/block/blk-wbt.c b/block/blk-wbt.c index b3b79149d3a0..26e1bb617877 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -665,6 +665,25 @@ void wbt_disable_default(struct request_queue *q) } EXPORT_SYMBOL_GPL(wbt_disable_default); +/* + * Enable wbt if defaults are configured that way + */ +void wbt_enable_default(struct request_queue *q) +{ + /* Throttling already enabled? */ + if (q->rq_wb) + return; + + /* Queue not registered? Maybe shutting down... */ + if (!test_bit(QUEUE_FLAG_REGISTERED, &q->queue_flags)) + return; + + if ((q->mq_ops && IS_ENABLED(CONFIG_BLK_WBT_MQ)) || + (q->request_fn && IS_ENABLED(CONFIG_BLK_WBT_SQ))) + wbt_init(q); +} +EXPORT_SYMBOL_GPL(wbt_enable_default); + u64 wbt_default_latency_nsec(struct request_queue *q) { /* |