diff options
| author | yangerkun <yangerkun@huawei.com> | 2019-07-23 11:23:13 +0800 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-07-23 17:47:02 +0200 |
| commit | 8fe34be14ecb5eb0ef8d8d44aa7ab62d9e2911ca (patch) | |
| tree | 6d40e7bbb4398d875eace9f04234caa9a03da35c /drivers/nvme/host/pci.c | |
| parent | 66b20ac0a1a10769d059d6903202f53494e3d902 (diff) | |
Revert "nvme-pci: don't create a read hctx mapping without read queues"
This reverts commit 0298d5435276e7795b0b939d74827f6e775e7009.
With this patch, set 'poll_queues > hard queues' will lead to 'nr_read_queues = 0'
in nvme_calc_irq_sets. Then poll_queues setting can fail since dev->tagset.nr_maps
equals to 2 and nvme_pci_map_queues will not do map for poll queues.
Signed-off-by: yangerkun <yangerkun@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/host/pci.c')
| -rw-r--r-- | drivers/nvme/host/pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index dd10cf78f2d3..db160cee42ad 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2254,9 +2254,7 @@ static int nvme_dev_add(struct nvme_dev *dev) if (!dev->ctrl.tagset) { dev->tagset.ops = &nvme_mq_ops; dev->tagset.nr_hw_queues = dev->online_queues - 1; - dev->tagset.nr_maps = 1; /* default */ - if (dev->io_queues[HCTX_TYPE_READ]) - dev->tagset.nr_maps++; + dev->tagset.nr_maps = 2; /* default + read */ if (dev->io_queues[HCTX_TYPE_POLL]) dev->tagset.nr_maps++; dev->tagset.timeout = NVME_IO_TIMEOUT; |