diff options
| author | Ming Lei <ming.lei@redhat.com> | 2018-12-18 01:28:56 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-12-17 11:19:55 -0700 |
| commit | e5edd5f298fafda28284bafb8371e6f0b7681035 (patch) | |
| tree | a61df6c3d7132d57294cd0dd2be47ae067afcfed /block | |
| parent | 13369816cb648f897ce9cbf57e55eeb742ce4eb3 (diff) | |
| download | linux-0-day-e5edd5f298fafda28284bafb8371e6f0b7681035.tar.gz linux-0-day-e5edd5f298fafda28284bafb8371e6f0b7681035.tar.xz | |
blk-mq: skip zero-queue maps in blk_mq_map_swqueue
From 7e849dd9cf37 ("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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 9c1c1544bac31..6847f014606b1 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -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); /* |