Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 062c4965 authored by Keith Busch's avatar Keith Busch Committed by Greg Kroah-Hartman
Browse files

nvme-pci: Remap CMB SQ entries on every controller reset 



commit 815c6704bf9f1c59f3a6be380a4032b9c57b12f1 upstream.

The controller memory buffer is remapped into a kernel address on each
reset, but the driver was setting the submission queue base address
only on the very first queue creation. The remapped address is likely to
change after a reset, so accessing the old address will hit a kernel bug.

This patch fixes that by setting the queue's CMB base address each time
the queue is created.

Fixes: f63572dff1421 ("nvme: unmap CMB and remove sysfs file in reset path")
Reported-by: default avatarChristian Black <christian.d.black@intel.com>
Cc: Jon Derrick <jonathan.derrick@intel.com>
Cc: <stable@vger.kernel.org> # 4.9+
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarScott Bauer <scott.bauer@intel.com>
Reviewed-by: default avatarJon Derrick <jonathan.derrick@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 70c89bcc

drivers/nvme/host/pci.c

+16 −11
Original line number Diff line number Diff line
@@ -1034,17 +1034,15 @@ static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues, 
static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq,

				int qid, int depth)

{

	if (qid && dev->cmb && use_cmb_sqes && NVME_CMB_SQS(dev->cmbsz)) {

		unsigned offset = (qid - 1) * roundup(SQ_SIZE(depth),

						      dev->ctrl.page_size);

		nvmeq->sq_dma_addr = dev->cmb_bus_addr + offset;

		nvmeq->sq_cmds_io = dev->cmb + offset;

	} else {



	/* CMB SQEs will be mapped before creation */

	if (qid && dev->cmb && use_cmb_sqes && NVME_CMB_SQS(dev->cmbsz))

		return 0;



	nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(depth),

					    &nvmeq->sq_dma_addr, GFP_KERNEL);

	if (!nvmeq->sq_cmds)

		return -ENOMEM;

	}



	return 0;

}
@@ -1117,6 +1115,13 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid) 
	struct nvme_dev *dev = nvmeq->dev;

	int result;



	if (qid && dev->cmb && use_cmb_sqes && NVME_CMB_SQS(dev->cmbsz)) {

		unsigned offset = (qid - 1) * roundup(SQ_SIZE(nvmeq->q_depth),

						      dev->ctrl.page_size);

		nvmeq->sq_dma_addr = dev->cmb_bus_addr + offset;

		nvmeq->sq_cmds_io = dev->cmb + offset;

	}



	nvmeq->cq_vector = qid - 1;

	result = adapter_alloc_cq(dev, qid, nvmeq);

	if (result < 0)