Commit 76c08bf4 authored Oct 25, 2016 by Samuel Jones Committed by Sagi Grimberg Dec 06, 2016

nvme-rdma: force queue size to respect controller capability



Queue size needs to respect the Maximum Queue Entries Supported advertised by
the controller in its Capability register.

Signed-off-by: Samuel Jones <sjones@kalray.eu>
Reviewed-by: Christoph Hellwig <hch@lst.de>
[sagig: fixed queue_size adjustment according to
Daniel Verkamp <daniel.verkamp@intel.com> comment]
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>

parent 70d4281c

drivers/nvme/host/rdma.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1904,6 +1904,14 @@ static struct nvme_ctrl nvme_rdma_create_ctrl(struct device dev,
		opts->queue_size = ctrl->ctrl.maxcmd;
		}

		if (opts->queue_size > ctrl->ctrl.sqsize + 1) {
		/* warn if sqsize is lower than queue_size */
		dev_warn(ctrl->ctrl.device,
		"queue_size %zu > ctrl sqsize %u, clamping down\n",
		opts->queue_size, ctrl->ctrl.sqsize + 1);
		opts->queue_size = ctrl->ctrl.sqsize + 1;
		}

		if (opts->nr_io_queues) {
		ret = nvme_rdma_create_io_queues(ctrl);
		if (ret)

Admin message