[PATCH RFC] nvmet-rdma: +1 to *queue_size from hsqsize/hrqsize

[PATCH RFC] nvmet-rdma: +1 to *queue_size from hsqsize/hrqsize

[Jay Freyensee]

Now that the host will be sending hsqsize/hrqsize 0-based
values, the target may need to be adjusted as well.

I am not 100% clear this is the only spot on the target.
Lightly testing host+target I haven't noticed any difference
with this change but my target went down so
I cannot do anything else for now so just make this an RFC...

Signed-off-by: Jay Freyensee <james_p_freyensee at linux.intel.com>
---
 drivers/nvme/target/rdma.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
index e06d504..e710c46 100644
--- a/drivers/nvme/target/rdma.c
+++ b/drivers/nvme/target/rdma.c
@@ -1004,11 +1004,11 @@ nvmet_rdma_parse_cm_connect_req(struct rdma_conn_param *conn,
 	queue->host_qid = le16_to_cpu(req->qid);
 
 	/*
-	 * req->hsqsize corresponds to our recv queue size
-	 * req->hrqsize corresponds to our send queue size
+	 * req->hsqsize corresponds to our recv queue size, plus 1
+	 * req->hrqsize corresponds to our send queue size, plus 1
 	 */
-	queue->recv_queue_size = le16_to_cpu(req->hsqsize);
-	queue->send_queue_size = le16_to_cpu(req->hrqsize);
+	queue->recv_queue_size = le16_to_cpu(req->hsqsize)+1;
+	queue->send_queue_size = le16_to_cpu(req->hrqsize)+1;
 
 	if (!queue->host_qid && queue->recv_queue_size > NVMF_AQ_DEPTH)
 		return NVME_RDMA_CM_INVALID_HSQSIZE;
-- 
2.7.4

[PATCH RFC] nvmet-rdma: +1 to *queue_size from hsqsize/hrqsize

[Verkamp, Daniel]

Hi Jay,

On Fri, 2016-08-05@20:00 -0700, Jay Freyensee wrote:
> -	queue->recv_queue_size = le16_to_cpu(req->hsqsize);
> -	queue->send_queue_size = le16_to_cpu(req->hrqsize);
> +	queue->recv_queue_size = le16_to_cpu(req->hsqsize)+1;
> +	queue->send_queue_size = le16_to_cpu(req->hrqsize)+1;

I think the +1 needs to be inside the le16_to_cpu() in both cases.

-- Daniel

[PATCH RFC] nvmet-rdma: +1 to *queue_size from hsqsize/hrqsize

[J Freyensee]

On Mon, 2016-08-08@16:09 +0000, Verkamp, Daniel wrote:
> Hi Jay,
> 
> On Fri, 2016-08-05@20:00 -0700, Jay Freyensee wrote:
> > 
> > -	queue->recv_queue_size = le16_to_cpu(req->hsqsize);
> > -	queue->send_queue_size = le16_to_cpu(req->hrqsize);
> > +	queue->recv_queue_size = le16_to_cpu(req->hsqsize)+1;
> > +	queue->send_queue_size = le16_to_cpu(req->hrqsize)+1;
> 
> I think the +1 needs to be inside the le16_to_cpu() in both cases.

Thanks.

This patch will be dependent on the "nvme-rdma: sqsize/hsqsize/hrqsize
is 0-based val" patch, which reading the spec again I still think it's
0-based.

> 
> -- Daniel