2020-11-12 08:25:31

by Niklas Schnelle

Subject: [PATCH 1/2] nvme-pci: drop min() from nr_io_queues assignment

in nvme_setup_io_queues() the number of I/O queues is set to either 1 in
case of a quirky Apple device or to the min of nvme_max_io_queues() or
dev->nr_allocated_queues - 1.
This is unnecessarily complicated as dev->nr_allocated_queues is only
assigned once and is nvme_max_io_queues() + 1.

Signed-off-by: Niklas Schnelle <[email protected]>
---
drivers/nvme/host/pci.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 0578ff253c47..b56250b83bdf 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2114,8 +2114,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
if (dev->ctrl.quirks & NVME_QUIRK_SHARED_TAGS)
nr_io_queues = 1;
else
- nr_io_queues = min(nvme_max_io_queues(dev),
- dev->nr_allocated_queues - 1);
+ nr_io_queues = dev->nr_allocated_queues - 1;

result = nvme_set_queue_count(&dev->ctrl, &nr_io_queues);
if (result < 0)
--
2.17.1

2020-11-14 09:08:44

by Christoph Hellwig

Subject: Re: [PATCH 1/2] nvme-pci: drop min() from nr_io_queues assignment

Thanks,

applied both patches to nvme-5.11.