From: Ming Lei ming.lei@redhat.com
[ Upstream commit cb9516be7708a2a18ec0a19fe3a225b5b3bc92c7 ]
Commit 6e6fcbc27e77 ("blk-mq: support batching dispatch in case of io") starts to support io batching submission by using hctx->dispatch_busy.
However, blk_mq_update_dispatch_busy() isn't changed to update hctx->dispatch_busy in that commit, so fix the issue by updating hctx->dispatch_busy in case of real scheduler.
Reported-by: Jan Kara jack@suse.cz Reviewed-by: Jan Kara jack@suse.cz Fixes: 6e6fcbc27e77 ("blk-mq: support batching dispatch in case of io") Signed-off-by: Ming Lei ming.lei@redhat.com Link: https://lore.kernel.org/r/20210625020248.1630497-1-ming.lei@redhat.com Signed-off-by: Jens Axboe axboe@kernel.dk Signed-off-by: Sasha Levin sashal@kernel.org --- block/blk-mq.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c index dd371f321d35..c732aa581124 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1224,9 +1224,6 @@ static void blk_mq_update_dispatch_busy(struct blk_mq_hw_ctx *hctx, bool busy) { unsigned int ewma;
- if (hctx->queue->elevator) - return; - ewma = hctx->dispatch_busy;
if (!ewma && !busy)