All of lore.kernel.org
 help / color / mirror / Atom feed
From: Niklas Schnelle <schnelle@linux.ibm.com>
To: linux-nvme@lists.infradead.org
Cc: Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
	Sagi Grimberg <sagi@grimberg.me>,
	linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>
Subject: [PATCH 1/2] nvme-pci: drop min() from nr_io_queues assignment
Date: Thu, 12 Nov 2020 09:23:01 +0100	[thread overview]
Message-ID: <20201112082302.82441-2-schnelle@linux.ibm.com> (raw)
In-Reply-To: <20201112082302.82441-1-schnelle@linux.ibm.com>

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 <schnelle@linux.ibm.com>
---
 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


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

WARNING: multiple messages have this Message-ID (diff)
From: Niklas Schnelle <schnelle@linux.ibm.com>
To: linux-nvme@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, Keith Busch <kbusch@kernel.org>,
	Jens Axboe <axboe@fb.com>, Christoph Hellwig <hch@lst.de>,
	Sagi Grimberg <sagi@grimberg.me>
Subject: [PATCH 1/2] nvme-pci: drop min() from nr_io_queues assignment
Date: Thu, 12 Nov 2020 09:23:01 +0100	[thread overview]
Message-ID: <20201112082302.82441-2-schnelle@linux.ibm.com> (raw)
In-Reply-To: <20201112082302.82441-1-schnelle@linux.ibm.com>

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 <schnelle@linux.ibm.com>
---
 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


  reply	other threads:[~2020-11-12  8:23 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-12  8:23 [PATCH 0/2] nvme-pic: improve max I/O queue handling Niklas Schnelle
2020-11-12  8:23 ` Niklas Schnelle
2020-11-12  8:23 ` Niklas Schnelle [this message]
2020-11-12  8:23   ` [PATCH 1/2] nvme-pci: drop min() from nr_io_queues assignment Niklas Schnelle
2020-11-14  9:06   ` Christoph Hellwig
2020-11-14  9:06     ` Christoph Hellwig
2020-11-12  8:23 ` [PATCH 2/2] nvme-pci: don't allocate unused I/O queues Niklas Schnelle
2020-11-12  8:23   ` Niklas Schnelle
2020-11-12 14:53 ` [PATCH 0/2] nvme-pic: improve max I/O queue handling Keith Busch
2020-11-12 14:53   ` Keith Busch
2020-11-12 15:45   ` Niklas Schnelle
2020-11-12 15:45     ` Niklas Schnelle
2020-11-12 17:36     ` Keith Busch
2020-11-12 17:36       ` Keith Busch
2020-11-13 13:15       ` Niklas Schnelle
2020-11-13 13:15         ` Niklas Schnelle
2020-11-13 16:25         ` Christoph Hellwig
2020-11-13 16:25           ` Christoph Hellwig
2020-11-13 16:52           ` Niklas Schnelle
2020-11-13 16:52             ` Niklas Schnelle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201112082302.82441-2-schnelle@linux.ibm.com \
    --to=schnelle@linux.ibm.com \
    --cc=axboe@fb.com \
    --cc=hch@lst.de \
    --cc=kbusch@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=sagi@grimberg.me \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.