]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
blk-wbt: introduce a new disable state to prevent false positive by rwb_enabled()
authorZhang Yi <yi.zhang@huawei.com>
Sat, 19 Jun 2021 09:36:59 +0000 (17:36 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:15:48 +0000 (16:15 +0200)
commit327e0b2c0c4281cb9bc1c5814e4e999d0af1b1c7
tree149795ea88fec34449883a985fdc6888c5808f46
parent32afb981e38c0f68185eac93a673d9d9a7e260ca
blk-wbt: introduce a new disable state to prevent false positive by rwb_enabled()

[ Upstream commit 1d0903d61e9645c6330b94247b96dd873dfc11c8 ]

Now that we disable wbt by simply zero out rwb->wb_normal in
wbt_disable_default() when switch elevator to bfq, but it's not safe
because it will become false positive if we change queue depth. If it
become false positive between wbt_wait() and wbt_track() when submit
write request, it will lead to drop rqw->inflight to -1 in wbt_done(),
which will end up trigger IO hung. Fix this issue by introduce a new
state which mean the wbt was disabled.

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-2-yi.zhang@huawei.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
block/blk-wbt.c
block/blk-wbt.h