[PATCH] nvme-pci: only set nr_maps to 2 if poll queues are supported

[axboe@kernel.dk (Jens Axboe)]

On 12/14/18 11:43 AM, Sagi Grimberg wrote:
> 
>> The block layer now enables polling support on a queue if nr_maps
>> includes the poll map, so we should only set that if we actually
>> support poll queues.
>>
>> Fixes:  6544d229bf ("block: enable polling by default if a poll map is initalized")
> 
> What does it fix? is there a bug when setting 3 queue maps?

After the recent changes, blk_mq_init_allocated_queue() does this:

if (set->nr_maps > HCTX_TYPE_POLL)
	blk_queue_flag_set(QUEUE_FLAG_POLL, q);

since the core doesn't have any notion of how many queues are used for
what. We only support polling if you have explicit poll queues now,
hence the above is wrong if nvme says nr_maps is 3 and it doesn't have
any poll queues.

-- 
Jens Axboe