Skip to content

Commit

Permalink
RDMA/cma: Add check to validate that cm_id is bound to a device
Browse files Browse the repository at this point in the history
Several checks in the rdma_cm check against the state of the
cm_id, but only to validate that the cm_id is bound to an underlying
transport specific CM and an RDMA device.  Make the check explicit
in what we're trying to check for, since we're not synchronizing
against the cm_id state.

This will allow a user to disconnect a cm_id or reject a connection
after receiving a device removal event.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
  • Loading branch information
Sean Hefty authored and Roland Dreier committed May 14, 2007
1 parent be65f08 commit 6c719f5
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions drivers/infiniband/core/cma.c
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,11 @@ static void cma_enable_remove(struct rdma_id_private *id_priv)
wake_up(&id_priv->wait_remove);
}

static int cma_has_cm_dev(struct rdma_id_private *id_priv)
{
return (id_priv->id.device && id_priv->cm_id.ib);
}

struct rdma_cm_id *rdma_create_id(rdma_cm_event_handler event_handler,
void *context, enum rdma_port_space ps)
{
Expand Down Expand Up @@ -2422,7 +2427,7 @@ int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event)
int ret;

id_priv = container_of(id, struct rdma_id_private, id);
if (!cma_comp(id_priv, CMA_CONNECT))
if (!cma_has_cm_dev(id_priv))
return -EINVAL;

switch (id->device->node_type) {
Expand All @@ -2444,7 +2449,7 @@ int rdma_reject(struct rdma_cm_id *id, const void *private_data,
int ret;

id_priv = container_of(id, struct rdma_id_private, id);
if (!cma_comp(id_priv, CMA_CONNECT))
if (!cma_has_cm_dev(id_priv))
return -EINVAL;

switch (rdma_node_get_transport(id->device->node_type)) {
Expand Down Expand Up @@ -2475,8 +2480,7 @@ int rdma_disconnect(struct rdma_cm_id *id)
int ret;

id_priv = container_of(id, struct rdma_id_private, id);
if (!cma_comp(id_priv, CMA_CONNECT) &&
!cma_comp(id_priv, CMA_DISCONNECT))
if (!cma_has_cm_dev(id_priv))
return -EINVAL;

switch (rdma_node_get_transport(id->device->node_type)) {
Expand Down

0 comments on commit 6c719f5

Please sign in to comment.