Commit 66841672 authored Feb 12, 2016 by Ming Lei Committed by Jens Axboe Feb 14, 2016

blk-mq: mark request queue as mq asap



Currently q->mq_ops is used widely to decide if the queue
is mq or not, so we should set the 'flag' asap so that both
block core and drivers can get the correct mq info.

For example, commit 868f2f0b(blk-mq: dynamic h/w context count)
moves the hctx's initialization before setting q->mq_ops in
blk_mq_init_allocated_queue(), then cause blk_alloc_flush_queue()
to think the queue is non-mq and don't allocate command size
for the per-hctx flush rq.

This patches should fix the problem reported by Sasha.

Cc: Keith Busch <keith.busch@intel.com>
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Fixes: 868f2f0b ("blk-mq: dynamic h/w context count")
Signed-off-by: Jens Axboe <axboe@fb.com>

parent d5df731a

block/blk-mq.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -2010,6 +2010,9 @@ static void blk_mq_realloc_hw_ctxs(struct blk_mq_tag_set *set,
		struct request_queue blk_mq_init_allocated_queue(struct blk_mq_tag_set set,
		struct request_queue *q)
		{
		/* mark the queue as mq asap */
		q->mq_ops = set->ops;

		q->queue_ctx = alloc_percpu(struct blk_mq_ctx);
		if (!q->queue_ctx)
		return ERR_PTR(-ENOMEM);
		@@ -2032,7 +2035,6 @@ struct request_queue blk_mq_init_allocated_queue(struct blk_mq_tag_set set,

		q->nr_queues = nr_cpu_ids;

		q->mq_ops = set->ops;
		q->queue_flags \|= QUEUE_FLAG_MQ_DEFAULT;

		if (!(set->flags & BLK_MQ_F_SG_MERGE))

Admin message