Commit 81ea1222 authored Apr 20, 2023 by Ming Lei Committed by Jens Axboe Apr 20, 2023

Revert "block: Merge bio before checking ->cached_rq"



This reverts commit 23f3e327.

blk-mq sched bio merge still needs request to grab queue usage counter,
so we can't simply call blk_mq_attempt_bio_merge() when queue usage
counter isn't held.

Fixes: 23f3e327 ("block: Merge bio before checking ->cached_rq")
Cc: Xiao Ni <xni@redhat.com>
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20230420112018.1108058-1-ming.lei@redhat.com


Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent f7ca1ae3

block/blk-mq.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -2878,16 +2878,15 @@ static inline struct request blk_mq_get_cached_request(struct request_queue q,

		if (!plug)
		return NULL;
		rq = rq_list_peek(&plug->cached_rq);
		if (!rq \|\| rq->q != q)
		return NULL;

		if (blk_mq_attempt_bio_merge(q, *bio, nsegs)) {
		*bio = NULL;
		return NULL;
		}

		rq = rq_list_peek(&plug->cached_rq);
		if (!rq \|\| rq->q != q)
		return NULL;

		type = blk_mq_get_hctx_type((*bio)->bi_opf);
		hctx_type = rq->mq_hctx->type;
		if (type != hctx_type &&