mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-19 13:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

ib_srpt: Retry with a smaller send queue size if QP creation fails

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7001 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2016-10-10 18:10:13 +00:00
parent 9c466a504a
commit 95979e90cf
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
srpt/src/ib_srpt.c
+18 -8
View File
@@ -2209,7 +2209,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
{
struct ib_qp_init_attr *qp_init;
struct srpt_device *sdev = ch->sport->sdev;
int i, ret;
int sq_size = srpt_sq_size, i, ret;
EXTRACHECKS_WARN_ON(ch->rq_size < 1);
@@ -2218,20 +2218,21 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
if (!qp_init)
goto out;
retry:
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) && \
!defined(RHEL_RELEASE_CODE)
ch->cq = ib_create_cq(sdev->device, srpt_completion, NULL, ch,
ch->rq_size + srpt_sq_size);
ch->rq_size + sq_size);
#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) || \
defined(MOFED_MAJOR)) && \
!defined(IB_CREATE_CQ_HAS_INIT_ATTR)
ch->cq = ib_create_cq(sdev->device, srpt_completion, NULL, ch,
ch->rq_size + srpt_sq_size, ch->comp_vector);
ch->rq_size + sq_size, ch->comp_vector);
#else
{
struct ib_cq_init_attr ia = { };
ia.cqe = ch->rq_size + srpt_sq_size;
ia.cqe = ch->rq_size + sq_size;
ia.comp_vector = ch->comp_vector;
ch->cq = ib_create_cq(sdev->device, srpt_completion, NULL, ch, &ia);
}
@@ -2239,7 +2240,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
if (IS_ERR(ch->cq)) {
ret = PTR_ERR(ch->cq);
pr_err("failed to create CQ: cqe %d; c.v. %d; ret %d\n",
ch->rq_size + srpt_sq_size, ch->comp_vector, ret);
ch->rq_size + sq_size, ch->comp_vector, ret);
goto out;
}
@@ -2250,7 +2251,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
qp_init->recv_cq = ch->cq;
qp_init->sq_sig_type = IB_SIGNAL_REQ_WR;
qp_init->qp_type = IB_QPT_RC;
qp_init->cap.max_send_wr = srpt_sq_size;
qp_init->cap.max_send_wr = sq_size;
/*
* For max_sge values > 2 * max_sge_delta, subtract max_sge_delta. For
* max_sge values < max_sge_delta, use max_sge. For intermediate
@@ -2283,8 +2284,17 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
}
}
if (ret) {
pr_err("failed to create queue pair (%d)\n", ret);
goto err_destroy_cq;
bool retry = sq_size > MIN_SRPT_SQ_SIZE;
pr_err("failed to create queue pair with sq_size = %d (%d)%s\n",
sq_size, ret, retry ? " - retrying" : "");
if (retry) {
ib_destroy_cq(ch->cq);
sq_size = max(sq_size / 2, MIN_SRPT_SQ_SIZE);
goto retry;
} else {
goto err_destroy_cq;
}
}
pr_debug("qp_num = %#x\n", ch->qp->qp_num);