From: sagi@grimberg.me (Sagi Grimberg)
Subject: [PATCH v2 2/5] nvme-rdma: fix sqsize/hsqsize per spec
Date: Tue, 16 Aug 2016 11:57:26 +0300 [thread overview]
Message-ID: <b367c7dc-1c6f-b3d5-9492-2acbd8dad0da@grimberg.me> (raw)
In-Reply-To: <1471279659-25951-3-git-send-email-james_p_freyensee@linux.intel.com>
On 15/08/16 19:47, Jay Freyensee wrote:
> Per NVMe-over-Fabrics 1.0 spec, sqsize is represented as
> a 0-based value.
>
> Also per spec, the RDMA binding values shall be set
> to sqsize, which makes hsqsize 0-based values.
>
> Thus, the sqsize during NVMf connect() is now:
>
> [root at fedora23-fabrics-host1 for-48]# dmesg
> [ 318.720645] nvme_fabrics: nvmf_connect_admin_queue(): sqsize for
> admin queue: 31
> [ 318.720884] nvme nvme0: creating 16 I/O queues.
> [ 318.810114] nvme_fabrics: nvmf_connect_io_queue(): sqsize for i/o
> queue: 127
>
> Reported-by: Daniel Verkamp <daniel.verkamp at intel.com>
> Signed-off-by: Jay Freyensee <james_p_freyensee at linux.intel.com>
> ---
> drivers/nvme/host/rdma.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index 168cd23..6aa913e 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -649,7 +649,7 @@ static int nvme_rdma_init_io_queues(struct nvme_rdma_ctrl *ctrl)
> int i, ret;
>
> for (i = 1; i < ctrl->queue_count; i++) {
> - ret = nvme_rdma_init_queue(ctrl, i, ctrl->ctrl.sqsize);
> + ret = nvme_rdma_init_queue(ctrl, i, ctrl->ctrl.sqsize + 1);
Just use opts->queue_size here.
> if (ret) {
> dev_info(ctrl->ctrl.device,
> "failed to initialize i/o queue: %d\n", ret);
> @@ -1292,8 +1292,8 @@ static int nvme_rdma_route_resolved(struct nvme_rdma_queue *queue)
> priv.hrqsize = cpu_to_le16(NVMF_AQ_DEPTH - 1);
> priv.hsqsize = cpu_to_le16(NVMF_AQ_DEPTH - 1);
> } else {
> - priv.hrqsize = cpu_to_le16(queue->queue_size);
> - priv.hsqsize = cpu_to_le16(queue->queue_size);
> + priv.hrqsize = cpu_to_le16(queue->ctrl->ctrl.sqsize);
> + priv.hsqsize = cpu_to_le16(queue->ctrl->ctrl.sqsize);
> }
>
> ret = rdma_connect(queue->cm_id, ¶m);
> @@ -1818,7 +1818,7 @@ static int nvme_rdma_create_io_queues(struct nvme_rdma_ctrl *ctrl)
>
> memset(&ctrl->tag_set, 0, sizeof(ctrl->tag_set));
> ctrl->tag_set.ops = &nvme_rdma_mq_ops;
> - ctrl->tag_set.queue_depth = ctrl->ctrl.sqsize;
> + ctrl->tag_set.queue_depth = ctrl->ctrl.sqsize + 1;
Same here.
> ctrl->tag_set.reserved_tags = 1; /* fabric connect */
> ctrl->tag_set.numa_node = NUMA_NO_NODE;
> ctrl->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
> @@ -1916,7 +1916,7 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev,
> spin_lock_init(&ctrl->lock);
>
> ctrl->queue_count = opts->nr_io_queues + 1; /* +1 for admin queue */
> - ctrl->ctrl.sqsize = opts->queue_size;
> + ctrl->ctrl.sqsize = opts->queue_size - 1;
> ctrl->ctrl.kato = opts->kato;
>
> ret = -ENOMEM;
>
next prev parent reply other threads:[~2016-08-16 8:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-15 16:47 [PATCH v2 0/5] sqsize fixes Jay Freyensee
2016-08-15 16:47 ` [PATCH v2 1/5] fabrics: define admin sqsize min default, per spec Jay Freyensee
2016-08-16 8:59 ` Sagi Grimberg
2016-08-16 16:19 ` J Freyensee
2016-08-15 16:47 ` [PATCH v2 2/5] nvme-rdma: fix sqsize/hsqsize " Jay Freyensee
2016-08-16 8:57 ` Sagi Grimberg [this message]
2016-08-16 16:20 ` J Freyensee
2016-08-15 16:47 ` [PATCH v2 3/5] nvmet-rdma: +1 to *queue_size from hsqsize/hrqsize Jay Freyensee
2016-08-16 8:56 ` Sagi Grimberg
2016-08-16 16:22 ` J Freyensee
2016-08-15 16:47 ` [PATCH v2 4/5] nvme-loop: set sqsize to 0-based value, per spec Jay Freyensee
2016-08-16 8:59 ` Sagi Grimberg
2016-08-16 16:22 ` J Freyensee
2016-08-15 16:47 ` [PATCH v2 5/5] nvme-rdma: adjust hrqsize to plus 1 Jay Freyensee
2016-08-16 9:05 ` Sagi Grimberg
2016-08-16 16:34 ` J Freyensee
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=b367c7dc-1c6f-b3d5-9492-2acbd8dad0da@grimberg.me \
--to=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).