On Mon, Apr 20, 2015 at 10:37:35AM +0200, Michael Wang wrote:
>
> Use raw management helpers to reform mcast related part in IB-core cma.
>
> Cc: Hal Rosenstock <h...@dev.mellanox.co.il>
> Cc: Steve Wise <sw...@opengridcomputing.com>
> Cc: Tom Talpey <t...@talpey.com>
> Cc: Jason Gunthorpe <jguntho...@obsidianresearch.com>
> Cc: Doug Ledford <dledf...@redhat.com>
> Cc: Ira Weiny <ira.we...@intel.com>
> Cc: Sean Hefty <sean.he...@intel.com>
> Signed-off-by: Michael Wang <yun.w...@profitbricks.com>
Reviewed-by: Ira Weiny <ira.we...@intel.com>
> ---
> drivers/infiniband/core/cma.c | 56
> ++++++++++++++-----------------------------
> 1 file changed, 18 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
> index fa69f34..a89c246 100644
> --- a/drivers/infiniband/core/cma.c
> +++ b/drivers/infiniband/core/cma.c
> @@ -997,17 +997,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_tech_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;
> - }
> }
> }
>
> @@ -3314,24 +3309,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:
> - kref_init(&mc->mcref);
> - ret = cma_iboe_join_multicast(id_priv, mc);
> - break;
> - default:
> - ret = -EINVAL;
> - }
> - break;
> - default:
> + if (rdma_tech_iboe(id->device, id->port_num)) {
> + kref_init(&mc->mcref);
> + ret = cma_iboe_join_multicast(id_priv, mc);
> + } else if (rdma_tech_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);
> @@ -3359,19 +3343,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:
> - ib_sa_free_multicast(mc->multicast.ib);
> - kfree(mc);
> - break;
> - case IB_LINK_LAYER_ETHERNET:
> - kref_put(&mc->mcref, release_mc);
> - break;
> - default:
> - break;
> - }
> - }
> +
> + BUG_ON(id_priv->cma_dev->device != id->device);
> +
> + if (rdma_tech_ib(id->device, id->port_num)) {
> + ib_sa_free_multicast(mc->multicast.ib);
> + kfree(mc);
> + } else if (rdma_tech_iboe(id->device, id->port_num))
> + kref_put(&mc->mcref, release_mc);
> +
> return;
> }
> }
> --
> 2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
