nvme/pci: Fix read queue count (7e4c6b9a) · Commits · 戴 / test

If nvme.write_queues equals the number of CPUs, the driver had decreased the number of interrupts available such that there could only be one read queue even if the controller could support more. Remove the interrupt count reduction in this case. The driver wouldn't request more IRQs than it wants queues anyway. Reviewed-by:

Jens Axboe <axboe@kernel.dk> Signed-off-by:

Keith Busch <kbusch@kernel.org>

drivers/nvme/host/pci.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -2054,7 +2054,6 @@ static int nvme_setup_irqs(struct nvme_dev *dev, unsigned int nr_io_queues)
		.priv = dev,
		};
		unsigned int irq_queues, this_p_queues;
		unsigned int nr_cpus = num_possible_cpus();

		/*
		* Poll queues don't need interrupts, but we need at least one IO
		@@ -2065,9 +2064,6 @@ static int nvme_setup_irqs(struct nvme_dev *dev, unsigned int nr_io_queues)
		this_p_queues = nr_io_queues - 1;
		irq_queues = 1;
		} else {
		if (nr_cpus < nr_io_queues - this_p_queues)
		irq_queues = nr_cpus + 1;
		else
		irq_queues = nr_io_queues - this_p_queues + 1;
		}
		dev->io_queues[HCTX_TYPE_POLL] = this_p_queues;

Admin message