lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RDMA/cma: Override default responder_resources with user value

Browse Source 
By default, the responder_resources parameter is set to that received
in a connection request.  The passive side may override this value
when accepting the connection.  Use the value provided by the passive
side when transitioning the QP to RTR state, rather than the value
given in the connect request.  Without this change, the RTR transition
may fail if the passive side supports fewer responder_resources than
that in the request.

For code consistency and to protect against QP destruction, restructure
overriding initiator_depth to match how responder_resources is set.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Sean Hefty
2008-01-04 10:47:12 -08:00
committed by Roland Dreier
parent 1f813ca830
commit 5851bb893e
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/infiniband/core/cma.c
View File

@@ -488,7 +488,8 @@ void rdma_destroy_qp(struct rdma_cm_id *id)
} }
EXPORT_SYMBOL(rdma_destroy_qp); EXPORT_SYMBOL(rdma_destroy_qp);
static int cma_modify_qp_rtr(struct rdma_id_private *id_priv) static int cma_modify_qp_rtr(struct rdma_id_private *id_priv,
struct rdma_conn_param *conn_param)
{ {
struct ib_qp_attr qp_attr; struct ib_qp_attr qp_attr;
int qp_attr_mask, ret; int qp_attr_mask, ret;
@@ -514,13 +515,16 @@ static int cma_modify_qp_rtr(struct rdma_id_private *id_priv)
if (ret) if (ret)
goto out; goto out;
if (conn_param)
qp_attr.max_dest_rd_atomic = conn_param->responder_resources;
ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask); ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask);
out: out:
mutex_unlock(&id_priv->qp_mutex); mutex_unlock(&id_priv->qp_mutex);
return ret; return ret;
} }
static int cma_modify_qp_rts(struct rdma_id_private *id_priv) static int cma_modify_qp_rts(struct rdma_id_private *id_priv,
struct rdma_conn_param *conn_param)
{ {
struct ib_qp_attr qp_attr; struct ib_qp_attr qp_attr;
int qp_attr_mask, ret; int qp_attr_mask, ret;
@@ -536,6 +540,8 @@ static int cma_modify_qp_rts(struct rdma_id_private *id_priv)
if (ret) if (ret)
goto out; goto out;
if (conn_param)
qp_attr.max_rd_atomic = conn_param->initiator_depth;
ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask); ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask);
out: out:
mutex_unlock(&id_priv->qp_mutex); mutex_unlock(&id_priv->qp_mutex);
@@ -866,11 +872,11 @@ static int cma_rep_recv(struct rdma_id_private *id_priv)
{ {
int ret; int ret;
ret = cma_modify_qp_rtr(id_priv); ret = cma_modify_qp_rtr(id_priv, NULL);
if (ret) if (ret)
goto reject; goto reject;
ret = cma_modify_qp_rts(id_priv); ret = cma_modify_qp_rts(id_priv, NULL);
if (ret) if (ret)
goto reject; goto reject;
@@ -2284,7 +2290,7 @@ static int cma_connect_iw(struct rdma_id_private *id_priv,
sin = (struct sockaddr_in*) &id_priv->id.route.addr.dst_addr; sin = (struct sockaddr_in*) &id_priv->id.route.addr.dst_addr;
cm_id->remote_addr = *sin; cm_id->remote_addr = *sin;
ret = cma_modify_qp_rtr(id_priv); ret = cma_modify_qp_rtr(id_priv, conn_param);
if (ret) if (ret)
goto out; goto out;
@@ -2347,25 +2353,15 @@ static int cma_accept_ib(struct rdma_id_private *id_priv,
struct rdma_conn_param *conn_param) struct rdma_conn_param *conn_param)
{ {
struct ib_cm_rep_param rep; struct ib_cm_rep_param rep;
struct ib_qp_attr qp_attr; int ret;
int qp_attr_mask, ret;
if (id_priv->id.qp) { ret = cma_modify_qp_rtr(id_priv, conn_param);
ret = cma_modify_qp_rtr(id_priv); if (ret)
if (ret) goto out;
goto out;
qp_attr.qp_state = IB_QPS_RTS; ret = cma_modify_qp_rts(id_priv, conn_param);
ret = ib_cm_init_qp_attr(id_priv->cm_id.ib, &qp_attr, if (ret)
&qp_attr_mask); goto out;
if (ret)
goto out;
qp_attr.max_rd_atomic = conn_param->initiator_depth;
ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask);
if (ret)
goto out;
}
memset(&rep, 0, sizeof rep); memset(&rep, 0, sizeof rep);
rep.qp_num = id_priv->qp_num; rep.qp_num = id_priv->qp_num;
@@ -2390,7 +2386,7 @@ static int cma_accept_iw(struct rdma_id_private *id_priv,
struct iw_cm_conn_param iw_param; struct iw_cm_conn_param iw_param;
int ret; int ret;
ret = cma_modify_qp_rtr(id_priv); ret = cma_modify_qp_rtr(id_priv, conn_param);
if (ret) if (ret)
return ret; return ret;