kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

IB/srpt: Limit the send and receive queue sizes to what the HCA supports

Browse source 
Additionally, correct the comment about ch->rq_size.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Bart Van Assche 2017-10-11 10:27:23 -07:00 committed by Doug Ledford
parent c70ca38960
commit 7a01d05cd5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/infiniband/ulp/srpt/ib_srpt.c
View file

@ -1650,7 +1650,7 @@ retry:
* both both, as RDMA contexts will also post completions for the * both both, as RDMA contexts will also post completions for the
* RDMA READ case. * RDMA READ case.
*/ */
qp_init->cap.max_send_wr = srp_sq_size / 2; qp_init->cap.max_send_wr = min(srp_sq_size / 2, attrs->max_qp_wr + 0U);
qp_init->cap.max_rdma_ctxs = srp_sq_size / 2; qp_init->cap.max_rdma_ctxs = srp_sq_size / 2;
qp_init->cap.max_send_sge = min(attrs->max_sge, SRPT_MAX_SG_PER_WQE); qp_init->cap.max_send_sge = min(attrs->max_sge, SRPT_MAX_SG_PER_WQE);
qp_init->port_num = ch->sport->port; qp_init->port_num = ch->sport->port;
@ -1953,10 +1953,11 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
ch->cm_id = cm_id; ch->cm_id = cm_id;
cm_id->context = ch; cm_id->context = ch;
/* /*
* Avoid QUEUE_FULL conditions by limiting the number of buffers used * ch->rq_size should be at least as large as the initiator queue
* for the SRP protocol to the command queue size. * depth to avoid that the initiator driver has to report QUEUE_FULL
* to the SCSI mid-layer.
*/ */
ch->rq_size = SRPT_RQ_SIZE; ch->rq_size = min(SRPT_RQ_SIZE, sdev->device->attrs.max_qp_wr);
spin_lock_init(&ch->spinlock); spin_lock_init(&ch->spinlock);
ch->state = CH_CONNECTING; ch->state = CH_CONNECTING;
INIT_LIST_HEAD(&ch->cmd_wait_list); INIT_LIST_HEAD(&ch->cmd_wait_list);