Commit e5edd5f2 authored Dec 18, 2018 by Ming Lei Committed by Jens Axboe Dec 17, 2018

blk-mq: skip zero-queue maps in blk_mq_map_swqueue



From 7e849dd9 ("nvme-pci: don't share queue maps"), the mapping
table won't be initialized actually if map->nr_queues is zero, so
we can't use blk_mq_map_queue_type() to retrieve hctx any more.

This way still may cause broken mapping, fix it by skipping zero-queues
maps in blk_mq_map_swqueue().

Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: Mike Snitzer <snitzer@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 13369816

block/blk-mq.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2438,6 +2438,9 @@ static void blk_mq_map_swqueue(struct request_queue *q)

		ctx = per_cpu_ptr(q->queue_ctx, i);
		for (j = 0; j < set->nr_maps; j++) {
		if (!set->map[j].nr_queues)
		continue;

		hctx = blk_mq_map_queue_type(q, j, i);

		/*