lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 21 Apr 2015 20:07:34 -0400 From: "ira.weiny" <ira.weiny@...el.com> To: Michael Wang <yun.wang@...fitbricks.com> Cc: Roland Dreier <roland@...nel.org>, Sean Hefty <sean.hefty@...el.com>, linux-rdma@...r.kernel.org, linux-kernel@...r.kernel.org, hal@....mellanox.co.il, Tom Tucker <tom@...ngridcomputing.com>, Steve Wise <swise@...ngridcomputing.com>, Hoang-Nam Nguyen <hnguyen@...ibm.com>, Christoph Raisch <raisch@...ibm.com>, Mike Marciniszyn <infinipath@...el.com>, Eli Cohen <eli@...lanox.com>, Faisal Latif <faisal.latif@...el.com>, Jack Morgenstein <jackm@....mellanox.co.il>, Or Gerlitz <ogerlitz@...lanox.com>, Haggai Eran <haggaie@...lanox.com>, Tom Talpey <tom@...pey.com>, Jason Gunthorpe <jgunthorpe@...idianresearch.com>, Doug Ledford <dledford@...hat.com> Subject: Re: [PATCH v5 12/27] IB/Verbs: Reform mcast related part in IB-core cma 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 <hal@....mellanox.co.il> > Cc: Steve Wise <swise@...ngridcomputing.com> > Cc: Tom Talpey <tom@...pey.com> > Cc: Jason Gunthorpe <jgunthorpe@...idianresearch.com> > Cc: Doug Ledford <dledford@...hat.com> > Cc: Ira Weiny <ira.weiny@...el.com> > Cc: Sean Hefty <sean.hefty@...el.com> > Signed-off-by: Michael Wang <yun.wang@...fitbricks.com> Reviewed-by: Ira Weiny <ira.weiny@...el.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 majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists