Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-14 09:25:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

RDMA/cma: Simplify device removal handling code

Browse Source 
Add a new routine and rename another to encapsulate common code for
synchronizing with device removal.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Sean Hefty 2007-05-07 11:49:00 -07:00 committed by Roland Dreier
parent 4e430dcb7b
commit 8aa08602bd
1 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,7 +346,23 @@ static void cma_deref_id(struct rdma_id_private *id_priv)
complete(&id_priv->comp); complete(&id_priv->comp);
} }
static void cma_release_remove(struct rdma_id_private *id_priv) static int cma_disable_remove(struct rdma_id_private *id_priv,
enum cma_state state)
{
unsigned long flags;
int ret;
spin_lock_irqsave(&id_priv->lock, flags);
if (id_priv->state == state) {
atomic_inc(&id_priv->dev_remove);
ret = 0;
} else
ret = -EINVAL;
spin_unlock_irqrestore(&id_priv->lock, flags);
return ret;
}
static void cma_enable_remove(struct rdma_id_private *id_priv)
{ {
if (atomic_dec_and_test(&id_priv->dev_remove)) if (atomic_dec_and_test(&id_priv->dev_remove))
wake_up(&id_priv->wait_remove); wake_up(&id_priv->wait_remove);
@ -884,9 +900,8 @@ static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
struct rdma_cm_event event; struct rdma_cm_event event;
int ret = 0; int ret = 0;
atomic_inc(&id_priv->dev_remove); if (cma_disable_remove(id_priv, CMA_CONNECT))
if (!cma_comp(id_priv, CMA_CONNECT)) return 0;
goto out;
memset(&event, 0, sizeof event); memset(&event, 0, sizeof event);
switch (ib_event->event) { switch (ib_event->event) {
@ -942,12 +957,12 @@ static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
/* Destroy the CM ID by returning a non-zero value. */ /* Destroy the CM ID by returning a non-zero value. */
id_priv->cm_id.ib = NULL; id_priv->cm_id.ib = NULL;
cma_exch(id_priv, CMA_DESTROYING); cma_exch(id_priv, CMA_DESTROYING);
cma_release_remove(id_priv); cma_enable_remove(id_priv);
rdma_destroy_id(&id_priv->id); rdma_destroy_id(&id_priv->id);
return ret; return ret;
} }
out: out:
cma_release_remove(id_priv); cma_enable_remove(id_priv);
return ret; return ret;
} }
@ -1057,11 +1072,8 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
int offset, ret; int offset, ret;
listen_id = cm_id->context; listen_id = cm_id->context;
atomic_inc(&listen_id->dev_remove); if (cma_disable_remove(listen_id, CMA_LISTEN))
if (!cma_comp(listen_id, CMA_LISTEN)) { return -ECONNABORTED;
ret = -ECONNABORTED;
goto out;
}
memset(&event, 0, sizeof event); memset(&event, 0, sizeof event);
offset = cma_user_data_offset(listen_id->id.ps); offset = cma_user_data_offset(listen_id->id.ps);
@ -1101,11 +1113,11 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
release_conn_id: release_conn_id:
cma_exch(conn_id, CMA_DESTROYING); cma_exch(conn_id, CMA_DESTROYING);
cma_release_remove(conn_id); cma_enable_remove(conn_id);
rdma_destroy_id(&conn_id->id); rdma_destroy_id(&conn_id->id);
out: out:
cma_release_remove(listen_id); cma_enable_remove(listen_id);
return ret; return ret;
} }
@ -1214,12 +1226,12 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event)
/* Destroy the CM ID by returning a non-zero value. */ /* Destroy the CM ID by returning a non-zero value. */
id_priv->cm_id.iw = NULL; id_priv->cm_id.iw = NULL;
cma_exch(id_priv, CMA_DESTROYING); cma_exch(id_priv, CMA_DESTROYING);
cma_release_remove(id_priv); cma_enable_remove(id_priv);
rdma_destroy_id(&id_priv->id); rdma_destroy_id(&id_priv->id);
return ret; return ret;
} }
cma_release_remove(id_priv); cma_enable_remove(id_priv);
return ret; return ret;
} }
@ -1234,11 +1246,8 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
int ret; int ret;
listen_id = cm_id->context; listen_id = cm_id->context;
atomic_inc(&listen_id->dev_remove); if (cma_disable_remove(listen_id, CMA_LISTEN))
if (!cma_comp(listen_id, CMA_LISTEN)) { return -ECONNABORTED;
ret = -ECONNABORTED;
goto out;
}
/* Create a new RDMA id for the new IW CM ID */ /* Create a new RDMA id for the new IW CM ID */
new_cm_id = rdma_create_id(listen_id->id.event_handler, new_cm_id = rdma_create_id(listen_id->id.event_handler,
@ -1255,13 +1264,13 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
dev = ip_dev_find(iw_event->local_addr.sin_addr.s_addr); dev = ip_dev_find(iw_event->local_addr.sin_addr.s_addr);
if (!dev) { if (!dev) {
ret = -EADDRNOTAVAIL; ret = -EADDRNOTAVAIL;
cma_release_remove(conn_id); cma_enable_remove(conn_id);
rdma_destroy_id(new_cm_id); rdma_destroy_id(new_cm_id);
goto out; goto out;
} }
ret = rdma_copy_addr(&conn_id->id.route.addr.dev_addr, dev, NULL); ret = rdma_copy_addr(&conn_id->id.route.addr.dev_addr, dev, NULL);
if (ret) { if (ret) {
cma_release_remove(conn_id); cma_enable_remove(conn_id);
rdma_destroy_id(new_cm_id); rdma_destroy_id(new_cm_id);
goto out; goto out;
} }
@ -1270,7 +1279,7 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
ret = cma_acquire_dev(conn_id); ret = cma_acquire_dev(conn_id);
mutex_unlock(&lock); mutex_unlock(&lock);
if (ret) { if (ret) {
cma_release_remove(conn_id); cma_enable_remove(conn_id);
rdma_destroy_id(new_cm_id); rdma_destroy_id(new_cm_id);
goto out; goto out;
} }
@ -1293,14 +1302,14 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
/* User wants to destroy the CM ID */ /* User wants to destroy the CM ID */
conn_id->cm_id.iw = NULL; conn_id->cm_id.iw = NULL;
cma_exch(conn_id, CMA_DESTROYING); cma_exch(conn_id, CMA_DESTROYING);
cma_release_remove(conn_id); cma_enable_remove(conn_id);
rdma_destroy_id(&conn_id->id); rdma_destroy_id(&conn_id->id);
} }
out: out:
if (dev) if (dev)
dev_put(dev); dev_put(dev);
cma_release_remove(listen_id); cma_enable_remove(listen_id);
return ret; return ret;
} }
@ -1519,7 +1528,7 @@ static void cma_work_handler(struct work_struct *_work)
destroy = 1; destroy = 1;
} }
out: out:
cma_release_remove(id_priv); cma_enable_remove(id_priv);
cma_deref_id(id_priv); cma_deref_id(id_priv);
if (destroy) if (destroy)
rdma_destroy_id(&id_priv->id); rdma_destroy_id(&id_priv->id);
@ -1711,13 +1720,13 @@ static void addr_handler(int status, struct sockaddr *src_addr,
if (id_priv->id.event_handler(&id_priv->id, &event)) { if (id_priv->id.event_handler(&id_priv->id, &event)) {
cma_exch(id_priv, CMA_DESTROYING); cma_exch(id_priv, CMA_DESTROYING);
cma_release_remove(id_priv); cma_enable_remove(id_priv);
cma_deref_id(id_priv); cma_deref_id(id_priv);
rdma_destroy_id(&id_priv->id); rdma_destroy_id(&id_priv->id);
return; return;
} }
out: out:
cma_release_remove(id_priv); cma_enable_remove(id_priv);
cma_deref_id(id_priv); cma_deref_id(id_priv);
} }
@ -2042,11 +2051,10 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
struct ib_cm_sidr_rep_event_param *rep = &ib_event->param.sidr_rep_rcvd; struct ib_cm_sidr_rep_event_param *rep = &ib_event->param.sidr_rep_rcvd;
int ret = 0; int ret = 0;
memset(&event, 0, sizeof event); if (cma_disable_remove(id_priv, CMA_CONNECT))
atomic_inc(&id_priv->dev_remove); return 0;
if (!cma_comp(id_priv, CMA_CONNECT))
goto out;
memset(&event, 0, sizeof event);
switch (ib_event->event) { switch (ib_event->event) {
case IB_CM_SIDR_REQ_ERROR: case IB_CM_SIDR_REQ_ERROR:
event.event = RDMA_CM_EVENT_UNREACHABLE; event.event = RDMA_CM_EVENT_UNREACHABLE;
@ -2084,12 +2092,12 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
/* Destroy the CM ID by returning a non-zero value. */ /* Destroy the CM ID by returning a non-zero value. */
id_priv->cm_id.ib = NULL; id_priv->cm_id.ib = NULL;
cma_exch(id_priv, CMA_DESTROYING); cma_exch(id_priv, CMA_DESTROYING);
cma_release_remove(id_priv); cma_enable_remove(id_priv);
rdma_destroy_id(&id_priv->id); rdma_destroy_id(&id_priv->id);
return ret; return ret;
} }
out: out:
cma_release_remove(id_priv); cma_enable_remove(id_priv);
return ret; return ret;
} }
@ -2499,10 +2507,9 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
int ret; int ret;
id_priv = mc->id_priv; id_priv = mc->id_priv;
atomic_inc(&id_priv->dev_remove); if (cma_disable_remove(id_priv, CMA_ADDR_BOUND) &&
if (!cma_comp(id_priv, CMA_ADDR_BOUND) && cma_disable_remove(id_priv, CMA_ADDR_RESOLVED))
!cma_comp(id_priv, CMA_ADDR_RESOLVED)) return 0;
goto out;
if (!status && id_priv->id.qp) if (!status && id_priv->id.qp)
status = ib_attach_mcast(id_priv->id.qp, &multicast->rec.mgid, status = ib_attach_mcast(id_priv->id.qp, &multicast->rec.mgid,
@ -2524,12 +2531,12 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
ret = id_priv->id.event_handler(&id_priv->id, &event); ret = id_priv->id.event_handler(&id_priv->id, &event);
if (ret) { if (ret) {
cma_exch(id_priv, CMA_DESTROYING); cma_exch(id_priv, CMA_DESTROYING);
cma_release_remove(id_priv); cma_enable_remove(id_priv);
rdma_destroy_id(&id_priv->id); rdma_destroy_id(&id_priv->id);
return 0; return 0;
} }
out:
cma_release_remove(id_priv); cma_enable_remove(id_priv);
return 0; return 0;
} }