Skip to contentSkip to conversation

nvme: align io queue count with allocted nvme_queue in nvme_probe

PATCH Applied Weiping Zhang 4 participants 5 messages May 2, 2020 – May 6, 2020 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 nvme: align io queue count with allocted nvme_queue in nvme_probe

Since the commit 147b27e4bd0 "nvme-pci: allocate device queues storage space at probe" nvme_alloc_queue will not alloc struct nvme_queue any more.
If user change write/poll_queues to larger than the number of
allocated queue in nvme_probe, nvme_alloc_queue will touch
the memory out of boundary.

This patch add nr_allocated_queues for struct nvme_dev to record how many queues alloctaed in nvme_probe, then nvme driver will not use more queues than nr_allocated_queues when user update queue count and do a controller reset.

Since global module parameter can be changed at rumtime, so it's not safe to use these two parameter directly in the following functions:
nvme_dbbuf_dma_alloc
nvme_dbbuf_dma_free
nvme_calc_irq_sets
nvme_setup_io_queues

This patch also add nr_write_queues, nr_poll_queues for struct nvme_dev, that allow reload module parameter(write_queues and poll_queues) when reset controller.

By now, nvme pci driver allow user change io queue count for each type(write, read, poll) within nr_allocated_queue, that's to say, if user want to change queue dynamically by reset controller, they should setup io queues as many as possiable when load nvme module, and then tune io queue count for each type.

---
Changes since V3:
* drop sysfs interface and reload module parameter when reset controller
* convert int to unsigned int and place new added variable at the end of struct nvme_dev

Changes since V2:
* fix typo in commit message.
* don't show /sys/block/<nvme_disk>/device/io_queues_reload for fabric.

Changes since V1:
* don't use module parameter nvme_dbbuf_dma_free, nvme_dbbuf_dma_alloc and nvme_calc_irq_sets.
* add per-controller sysfs file io_queues_reload to enable/disable reload global module parameter.

 drivers/nvme/host/pci.c | 53 +++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 23 deletions(-)
drivers/nvme/host/pci.c +30 -23
index 4e79e412b276..5f5008b54687 100644
@@ -128,6 +128,9 @@ struct nvme_dev {
 	dma_addr_t host_mem_descs_dma;
 	struct nvme_host_mem_buf_desc *host_mem_descs;
 	void **host_mem_desc_bufs;
+	unsigned int nr_allocated_queue;
+	unsigned int nr_write_queues;
+	unsigned int nr_poll_queues;
 };
 
 static int io_queue_depth_set(const char *val, const struct kernel_param *kp)
@@ -209,25 +212,14 @@ struct nvme_iod {
 	struct scatterlist *sg;
 };
 
-static unsigned int max_io_queues(void)
+static inline unsigned int nvme_dbbuf_size(struct nvme_dev *dev)
 {
-	return num_possible_cpus() + write_queues + poll_queues;
-}
-
-static unsigned int max_queue_count(void)
-{
-	/* IO queues + admin queue */
-	return 1 + max_io_queues();
-}
-
-static inline unsigned int nvme_dbbuf_size(u32 stride)
-{
-	return (max_queue_count() * 8 * stride);
+	return (dev->nr_allocated_queue * 8 * dev->db_stride);
 }
 
 static int nvme_dbbuf_dma_alloc(struct nvme_dev *dev)
 {
-	unsigned int mem_size = nvme_dbbuf_size(dev->db_stride);
+	unsigned int mem_size = nvme_dbbuf_size(dev);
 
 	if (dev->dbbuf_dbs)
 		return 0;
@@ -252,7 +244,7 @@ static int nvme_dbbuf_dma_alloc(struct nvme_dev *dev)
 
 static void nvme_dbbuf_dma_free(struct nvme_dev *dev)
 {
-	unsigned int mem_size = nvme_dbbuf_size(dev->db_stride);
+	unsigned int mem_size = nvme_dbbuf_size(dev);
 
 	if (dev->dbbuf_dbs) {
 		dma_free_coherent(dev->dev, mem_size,
@@ -1991,7 +1983,7 @@ static int nvme_setup_host_mem(struct nvme_dev *dev)
 static void nvme_calc_irq_sets(struct irq_affinity *affd, unsigned int nrirqs)
 {
 	struct nvme_dev *dev = affd->priv;
-	unsigned int nr_read_queues;
+	unsigned int nr_read_queues, nr_write_queues = dev->nr_write_queues;
 
 	/*
 	 * If there is no interupt available for queues, ensure that
@@ -2007,12 +1999,12 @@ static void nvme_calc_irq_sets(struct irq_affinity *affd, unsigned int nrirqs)
 	if (!nrirqs) {
 		nrirqs = 1;
 		nr_read_queues = 0;
-	} else if (nrirqs == 1 || !write_queues) {
+	} else if (nrirqs == 1 || !nr_write_queues) {
 		nr_read_queues = 0;
-	} else if (write_queues >= nrirqs) {
+	} else if (nr_write_queues >= nrirqs) {
 		nr_read_queues = 1;
 	} else {
-		nr_read_queues = nrirqs - write_queues;
+		nr_read_queues = nrirqs - nr_write_queues;
 	}
 
 	dev->io_queues[HCTX_TYPE_DEFAULT] = nrirqs - nr_read_queues;
@@ -2036,7 +2028,7 @@ static int nvme_setup_irqs(struct nvme_dev *dev, unsigned int nr_io_queues)
 	 * Poll queues don't need interrupts, but we need at least one IO
 	 * queue left over for non-polled IO.
 	 */
-	this_p_queues = poll_queues;
+	this_p_queues = dev->nr_poll_queues;
 	if (this_p_queues >= nr_io_queues) {
 		this_p_queues = nr_io_queues - 1;
 		irq_queues = 1;
@@ -2070,10 +2062,17 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
 {
 	struct nvme_queue *adminq = &dev->queues[0];
 	struct pci_dev *pdev = to_pci_dev(dev->dev);
-	int result, nr_io_queues;
+	int result;
+	unsigned int nr_io_queues;
 	unsigned long size;
 
-	nr_io_queues = max_io_queues();
+	/* reload io queue count from module paramters write/poll_queues */
+	dev->nr_write_queues = write_queues;
+	dev->nr_poll_queues = poll_queues;
+	nr_io_queues = num_possible_cpus() + dev->nr_write_queues +
+			dev->nr_poll_queues;
+	if (nr_io_queues > dev->nr_allocated_queue - 1)
+		nr_io_queues = dev->nr_allocated_queue - 1;
 
 	/*
 	 * If tags are shared with admin queue (Apple bug), then
@@ -2743,6 +2742,7 @@ static void nvme_async_probe(void *data, async_cookie_t cookie)
 static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
 	int node, result = -ENOMEM;
+	unsigned int nr_queue;
 	struct nvme_dev *dev;
 	unsigned long quirks = id->driver_data;
 	size_t alloc_size;
@@ -2755,11 +2755,18 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	if (!dev)
 		return -ENOMEM;
 
-	dev->queues = kcalloc_node(max_queue_count(), sizeof(struct nvme_queue),
+	dev->nr_write_queues = write_queues;
+	dev->nr_poll_queues = poll_queues;
+	/* IO queues + admin queue */
+	nr_queue = dev->nr_write_queues + dev->nr_poll_queues +
+		num_possible_cpus() + 1;
+	dev->queues = kcalloc_node(nr_queue, sizeof(struct nvme_queue),
 					GFP_KERNEL, node);
 	if (!dev->queues)
 		goto free;
 
+	dev->nr_allocated_queue = nr_queue;
+
 	dev->dev = get_device(&pdev->dev);
 	pci_set_drvdata(pdev, dev);
 
Signature · 7 lines
2.18.1


_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Reviewed-by on v4 1/1
#2 lore raw
In reply to Weiping Zhang
Quoted 39 lines · Weiping Zhang

Since the commit 147b27e4bd0 "nvme-pci: allocate device queues storage space at probe" nvme_alloc_queue will not alloc struct nvme_queue any more.
If user change write/poll_queues to larger than the number of
allocated queue in nvme_probe, nvme_alloc_queue will touch
the memory out of boundary.

This patch add nr_allocated_queues for struct nvme_dev to record how many queues alloctaed in nvme_probe, then nvme driver will not use more queues than nr_allocated_queues when user update queue count and do a controller reset.

Since global module parameter can be changed at rumtime, so it's not safe to use these two parameter directly in the following functions:
nvme_dbbuf_dma_alloc
nvme_dbbuf_dma_free
nvme_calc_irq_sets
nvme_setup_io_queues

This patch also add nr_write_queues, nr_poll_queues for struct nvme_dev, that allow reload module parameter(write_queues and poll_queues) when reset controller.

By now, nvme pci driver allow user change io queue count for each type(write, read, poll) within nr_allocated_queue, that's to say, if user want to change queue dynamically by reset controller, they should setup io queues as many as possiable when load nvme module, and then tune io queue count for each type.

---
Changes since V3:
* drop sysfs interface and reload module parameter when reset controller
* convert int to unsigned int and place new added variable at the end of struct nvme_dev

Changes since V2:
* fix typo in commit message.
* don't show /sys/block/<nvme_disk>/device/io_queues_reload for fabric.

Quoted 8 lines

Changes since V1:
* don't use module parameter nvme_dbbuf_dma_free, nvme_dbbuf_dma_alloc and nvme_calc_irq_sets.
* add per-controller sysfs file io_queues_reload to enable/disable reload global module parameter.

  drivers/nvme/host/pci.c | 53 +++++++++++++++++++++++------------------
  1 file changed, 30 insertions(+), 23 deletions(-)

Looks good,

_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme