Skip to content

Commit eebc21d

Browse files
YuKuai-huaweiaxboe
authored andcommitted
blk-iocost: move wbt_enable/disable_default() out of spinlock
There are following smatch warning: block/blk-wbt.c:843 wbt_init() warn: sleeping in atomic context ioc_qos_write() <- disables preempt -> wbt_enable_default() -> wbt_init() wbt_init() will be called from wbt_enable_default() if wbt is not initialized, currently this is only possible in blk_register_queue(), hence wbt_init() will never be called from iocost and this warning is false positive. However, we might support rq_qos destruction dynamically in the future, and it's better to prevent that, hence move wbt_enable_default() outside 'ioc->lock'. This is safe because queue is still freezed. Reported-by: Dan Carpenter <error27@gmail.com> Link: https://lore.kernel.org/lkml/Y+Ja5SRs886CEz7a@kadam/ Signed-off-by: Yu Kuai <yukuai3@huawei.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20230527010644.647900-5-yukuai1@huaweicloud.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 06257fd commit eebc21d

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

block/blk-iocost.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3301,11 +3301,9 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input,
33013301
blk_stat_enable_accounting(disk->queue);
33023302
blk_queue_flag_set(QUEUE_FLAG_RQ_ALLOC_TIME, disk->queue);
33033303
ioc->enabled = true;
3304-
wbt_disable_default(disk);
33053304
} else {
33063305
blk_queue_flag_clear(QUEUE_FLAG_RQ_ALLOC_TIME, disk->queue);
33073306
ioc->enabled = false;
3308-
wbt_enable_default(disk);
33093307
}
33103308

33113309
if (user) {
@@ -3318,6 +3316,11 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input,
33183316
ioc_refresh_params(ioc, true);
33193317
spin_unlock_irq(&ioc->lock);
33203318

3319+
if (enable)
3320+
wbt_disable_default(disk);
3321+
else
3322+
wbt_enable_default(disk);
3323+
33213324
blk_mq_unquiesce_queue(disk->queue);
33223325
blk_mq_unfreeze_queue(disk->queue);
33233326

0 commit comments

Comments
 (0)