Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 72281
b: refs/heads/master
c: c548338
h: refs/heads/master
i:
  72279: 9d9973f
v: v3
  • Loading branch information
Sean Hefty authored and Roland Dreier committed Oct 16, 2007
1 parent 9724cbc commit 82c63fb
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 31 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ab8403c424a35364a3a2c753f7c5917fcbb4d809
refs/heads/master: c5483388bb4d771007ef36478db038e07922a020
90 changes: 60 additions & 30 deletions trunk/drivers/infiniband/core/cma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ struct rdma_id_private {

enum cma_state state;
spinlock_t lock;
struct mutex qp_mutex;

struct completion comp;
atomic_t refcount;
wait_queue_head_t wait_remove;
Expand Down Expand Up @@ -389,6 +391,7 @@ struct rdma_cm_id *rdma_create_id(rdma_cm_event_handler event_handler,
id_priv->id.event_handler = event_handler;
id_priv->id.ps = ps;
spin_lock_init(&id_priv->lock);
mutex_init(&id_priv->qp_mutex);
init_completion(&id_priv->comp);
atomic_set(&id_priv->refcount, 1);
init_waitqueue_head(&id_priv->wait_remove);
Expand Down Expand Up @@ -474,61 +477,86 @@ EXPORT_SYMBOL(rdma_create_qp);

void rdma_destroy_qp(struct rdma_cm_id *id)
{
ib_destroy_qp(id->qp);
struct rdma_id_private *id_priv;

id_priv = container_of(id, struct rdma_id_private, id);
mutex_lock(&id_priv->qp_mutex);
ib_destroy_qp(id_priv->id.qp);
id_priv->id.qp = NULL;
mutex_unlock(&id_priv->qp_mutex);
}
EXPORT_SYMBOL(rdma_destroy_qp);

static int cma_modify_qp_rtr(struct rdma_cm_id *id)
static int cma_modify_qp_rtr(struct rdma_id_private *id_priv)
{
struct ib_qp_attr qp_attr;
int qp_attr_mask, ret;

if (!id->qp)
return 0;
mutex_lock(&id_priv->qp_mutex);
if (!id_priv->id.qp) {
ret = 0;
goto out;
}

/* Need to update QP attributes from default values. */
qp_attr.qp_state = IB_QPS_INIT;
ret = rdma_init_qp_attr(id, &qp_attr, &qp_attr_mask);
ret = rdma_init_qp_attr(&id_priv->id, &qp_attr, &qp_attr_mask);
if (ret)
return ret;
goto out;

ret = ib_modify_qp(id->qp, &qp_attr, qp_attr_mask);
ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask);
if (ret)
return ret;
goto out;

qp_attr.qp_state = IB_QPS_RTR;
ret = rdma_init_qp_attr(id, &qp_attr, &qp_attr_mask);
ret = rdma_init_qp_attr(&id_priv->id, &qp_attr, &qp_attr_mask);
if (ret)
return ret;
goto out;

return ib_modify_qp(id->qp, &qp_attr, qp_attr_mask);
ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask);
out:
mutex_unlock(&id_priv->qp_mutex);
return ret;
}

static int cma_modify_qp_rts(struct rdma_cm_id *id)
static int cma_modify_qp_rts(struct rdma_id_private *id_priv)
{
struct ib_qp_attr qp_attr;
int qp_attr_mask, ret;

if (!id->qp)
return 0;
mutex_lock(&id_priv->qp_mutex);
if (!id_priv->id.qp) {
ret = 0;
goto out;
}

qp_attr.qp_state = IB_QPS_RTS;
ret = rdma_init_qp_attr(id, &qp_attr, &qp_attr_mask);
ret = rdma_init_qp_attr(&id_priv->id, &qp_attr, &qp_attr_mask);
if (ret)
return ret;
goto out;

return ib_modify_qp(id->qp, &qp_attr, qp_attr_mask);
ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask);
out:
mutex_unlock(&id_priv->qp_mutex);
return ret;
}

static int cma_modify_qp_err(struct rdma_cm_id *id)
static int cma_modify_qp_err(struct rdma_id_private *id_priv)
{
struct ib_qp_attr qp_attr;
int ret;

if (!id->qp)
return 0;
mutex_lock(&id_priv->qp_mutex);
if (!id_priv->id.qp) {
ret = 0;
goto out;
}

qp_attr.qp_state = IB_QPS_ERR;
return ib_modify_qp(id->qp, &qp_attr, IB_QP_STATE);
ret = ib_modify_qp(id_priv->id.qp, &qp_attr, IB_QP_STATE);
out:
mutex_unlock(&id_priv->qp_mutex);
return ret;
}

static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv,
Expand Down Expand Up @@ -857,11 +885,11 @@ static int cma_rep_recv(struct rdma_id_private *id_priv)
{
int ret;

ret = cma_modify_qp_rtr(&id_priv->id);
ret = cma_modify_qp_rtr(id_priv);
if (ret)
goto reject;

ret = cma_modify_qp_rts(&id_priv->id);
ret = cma_modify_qp_rts(id_priv);
if (ret)
goto reject;

Expand All @@ -871,7 +899,7 @@ static int cma_rep_recv(struct rdma_id_private *id_priv)

return 0;
reject:
cma_modify_qp_err(&id_priv->id);
cma_modify_qp_err(id_priv);
ib_send_cm_rej(id_priv->cm_id.ib, IB_CM_REJ_CONSUMER_DEFINED,
NULL, 0, NULL, 0);
return ret;
Expand Down Expand Up @@ -947,7 +975,7 @@ static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
/* ignore event */
goto out;
case IB_CM_REJ_RECEIVED:
cma_modify_qp_err(&id_priv->id);
cma_modify_qp_err(id_priv);
event.status = ib_event->param.rej_rcvd.reason;
event.event = RDMA_CM_EVENT_REJECTED;
event.param.conn.private_data = ib_event->private_data;
Expand Down Expand Up @@ -2264,7 +2292,7 @@ static int cma_connect_iw(struct rdma_id_private *id_priv,
sin = (struct sockaddr_in*) &id_priv->id.route.addr.dst_addr;
cm_id->remote_addr = *sin;

ret = cma_modify_qp_rtr(&id_priv->id);
ret = cma_modify_qp_rtr(id_priv);
if (ret)
goto out;

Expand Down Expand Up @@ -2331,7 +2359,7 @@ static int cma_accept_ib(struct rdma_id_private *id_priv,
int qp_attr_mask, ret;

if (id_priv->id.qp) {
ret = cma_modify_qp_rtr(&id_priv->id);
ret = cma_modify_qp_rtr(id_priv);
if (ret)
goto out;

Expand Down Expand Up @@ -2370,7 +2398,7 @@ static int cma_accept_iw(struct rdma_id_private *id_priv,
struct iw_cm_conn_param iw_param;
int ret;

ret = cma_modify_qp_rtr(&id_priv->id);
ret = cma_modify_qp_rtr(id_priv);
if (ret)
return ret;

Expand Down Expand Up @@ -2442,7 +2470,7 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)

return 0;
reject:
cma_modify_qp_err(id);
cma_modify_qp_err(id_priv);
rdma_reject(id, NULL, 0);
return ret;
}
Expand Down Expand Up @@ -2512,7 +2540,7 @@ int rdma_disconnect(struct rdma_cm_id *id)

switch (rdma_node_get_transport(id->device->node_type)) {
case RDMA_TRANSPORT_IB:
ret = cma_modify_qp_err(id);
ret = cma_modify_qp_err(id_priv);
if (ret)
goto out;
/* Initiate or respond to a disconnect. */
Expand Down Expand Up @@ -2543,9 +2571,11 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
cma_disable_remove(id_priv, CMA_ADDR_RESOLVED))
return 0;

mutex_lock(&id_priv->qp_mutex);
if (!status && id_priv->id.qp)
status = ib_attach_mcast(id_priv->id.qp, &multicast->rec.mgid,
multicast->rec.mlid);
mutex_unlock(&id_priv->qp_mutex);

memset(&event, 0, sizeof event);
event.status = status;
Expand Down

0 comments on commit 82c63fb

Please sign in to comment.