diff options
| author | Keith Busch <keith.busch@intel.com> | 2018-01-23 09:16:19 -0700 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-01-23 20:15:34 +0100 |
| commit | 62314e405fa101dbb82563394f9dfc225e3f1167 (patch) | |
| tree | 6996c5dba29363a50f5c1295c78a1f3052a6f8b8 /drivers/nvme/host/pci.c | |
| parent | 475a055e62a1eb92f4358ad8a9059df973c190ac (diff) | |
| download | linux-stable-62314e405fa101dbb82563394f9dfc225e3f1167.tar.gz linux-stable-62314e405fa101dbb82563394f9dfc225e3f1167.tar.bz2 linux-stable-62314e405fa101dbb82563394f9dfc225e3f1167.zip | |
nvme-pci: Fix queue double allocations
The queue count says the highest queue that's been allocated, so don't
reallocate a queue lower than that.
Fixes: 147b27e4bd0 ("nvme-pci: allocate device queues storage space at probe")
Signed-off-by: Keith Busch <keith.busch@intel.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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index a2ffb557b616..c46c239cc1ff 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1384,6 +1384,9 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, { struct nvme_queue *nvmeq = &dev->queues[qid]; + if (dev->ctrl.queue_count > qid) + return 0; + nvmeq->cqes = dma_zalloc_coherent(dev->dev, CQ_SIZE(depth), &nvmeq->cq_dma_addr, GFP_KERNEL); if (!nvmeq->cqes) |