Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c9a5282 authored by Michael Wang's avatar Michael Wang Committed by Doug Ledford
Browse files

IB/Verbs: Reform mcast related part in IB-core cma 



Use raw management helpers to reform mcast related part in IB-core cma.

Signed-off-by: default avatarMichael Wang <yun.wang@profitbricks.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Tested-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarSean Hefty <sean.hefty@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Tested-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent c72f2189

drivers/infiniband/core/cma.c

+18 −38
Original line number Diff line number Diff line
@@ -1004,17 +1004,12 @@ static void cma_leave_mc_groups(struct rdma_id_private *id_priv) 
		mc = container_of(id_priv->mc_list.next,

				  struct cma_multicast, list);

		list_del(&mc->list);

		switch (rdma_port_get_link_layer(id_priv->cma_dev->device, id_priv->id.port_num)) {

		case IB_LINK_LAYER_INFINIBAND:

		if (rdma_protocol_ib(id_priv->cma_dev->device,

				      id_priv->id.port_num)) {

			ib_sa_free_multicast(mc->multicast.ib);

			kfree(mc);

			break;

		case IB_LINK_LAYER_ETHERNET:

		} else

			kref_put(&mc->mcref, release_mc);

			break;

		default:

			break;

		}

	}

}
@@ -3321,24 +3316,13 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr, 
	list_add(&mc->list, &id_priv->mc_list);

	spin_unlock(&id_priv->lock);



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

	case RDMA_TRANSPORT_IB:

		switch (rdma_port_get_link_layer(id->device, id->port_num)) {

		case IB_LINK_LAYER_INFINIBAND:

			ret = cma_join_ib_multicast(id_priv, mc);

			break;

		case IB_LINK_LAYER_ETHERNET:

	if (rdma_protocol_iboe(id->device, id->port_num)) {

		kref_init(&mc->mcref);

		ret = cma_iboe_join_multicast(id_priv, mc);

			break;

		default:

			ret = -EINVAL;

		}

		break;

	default:

	} else if (rdma_protocol_ib(id->device, id->port_num))

		ret = cma_join_ib_multicast(id_priv, mc);

	else

		ret = -ENOSYS;

		break;

	}



	if (ret) {

		spin_lock_irq(&id_priv->lock);
@@ -3366,19 +3350,15 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr) 
				ib_detach_mcast(id->qp,

						&mc->multicast.ib->rec.mgid,

						be16_to_cpu(mc->multicast.ib->rec.mlid));

			if (rdma_node_get_transport(id_priv->cma_dev->device->node_type) == RDMA_TRANSPORT_IB) {

				switch (rdma_port_get_link_layer(id->device, id->port_num)) {

				case IB_LINK_LAYER_INFINIBAND:



			BUG_ON(id_priv->cma_dev->device != id->device);



			if (rdma_protocol_ib(id->device, id->port_num)) {

				ib_sa_free_multicast(mc->multicast.ib);

				kfree(mc);

					break;

				case IB_LINK_LAYER_ETHERNET:

			} else if (rdma_protocol_iboe(id->device, id->port_num))

				kref_put(&mc->mcref, release_mc);

					break;

				default:

					break;

				}

			}



			return;

		}

	}