Commit 62314e40 authored Jan 23, 2018 by Keith Busch Committed by Christoph Hellwig Jan 23, 2018

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: 147b27e4 ("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>

parent 475a055e

drivers/nvme/host/pci.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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)