commit 62314e405fa101dbb82563394f9dfc225e3f1167 upstream 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") CC: Sagi Grimberg <sagi@xxxxxxxxxxx> CC: Keith Busch <keith.busch@xxxxxxxxx> CC: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Jon Derrick <jonathan.derrick@xxxxxxxxx> --- drivers/nvme/host/pci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 51e8589..bfc42f2 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1246,6 +1246,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) -- 1.8.3.1