| Message ID | 552F6D67.1070509@profitbricks.com (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
On 4/16/2015 4:05 AM, Michael Wang wrote: > > Use raw management helpers to reform IB-core cm. > > Cc: Steve Wise <swise@opengridcomputing.com> > Cc: Tom Talpey <tom@talpey.com> > Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > Cc: Doug Ledford <dledford@redhat.com> > Cc: Ira Weiny <ira.weiny@intel.com> > Cc: Sean Hefty <sean.hefty@intel.com> > Signed-off-by: Michael Wang <yun.wang@profitbricks.com> > --- > drivers/infiniband/core/cm.c | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c > index e28a494..50321fe 100644 > --- a/drivers/infiniband/core/cm.c > +++ b/drivers/infiniband/core/cm.c > @@ -3761,9 +3761,7 @@ static void cm_add_one(struct ib_device *ib_device) > unsigned long flags; > int ret; > u8 i; > - > - if (rdma_node_get_transport(ib_device->node_type) != RDMA_TRANSPORT_IB) > - return; > + int count = 0; > > cm_dev = kzalloc(sizeof(*cm_dev) + sizeof(*port) * > ib_device->phys_port_cnt, GFP_KERNEL); > @@ -3783,6 +3781,9 @@ static void cm_add_one(struct ib_device *ib_device) > > set_bit(IB_MGMT_METHOD_SEND, reg_req.method_mask); > for (i = 1; i <= ib_device->phys_port_cnt; i++) { > + if (!rdma_ib_or_iboe(ib_device, i)) > + continue; > + > port = kzalloc(sizeof *port, GFP_KERNEL); > if (!port) > goto error1; > @@ -3809,7 +3810,16 @@ static void cm_add_one(struct ib_device *ib_device) > ret = ib_modify_port(ib_device, i, 0, &port_modify); > if (ret) > goto error3; > + > + count++; > } > + > + if (!count) { > + device_unregister(cm_dev->device); > + kfree(cm_dev); > + return; Nit: alternatively, this could be goto at end of this routine where there is same 2 calls. I think Jason made this comment on earlier set of these patches. -- Hal > + } > + > ib_set_client_data(ib_device, &cm_client, cm_dev); > > write_lock_irqsave(&cm.device_lock, flags); > @@ -3825,6 +3835,9 @@ error1: > port_modify.set_port_cap_mask = 0; > port_modify.clr_port_cap_mask = IB_PORT_CM_SUP; > while (--i) { > + if (!rdma_ib_or_iboe(ib_device, i)) > + continue; > + > port = cm_dev->port[i-1]; > ib_modify_port(ib_device, port->port_num, 0, &port_modify); > ib_unregister_mad_agent(port->mad_agent); > @@ -3853,6 +3866,9 @@ static void cm_remove_one(struct ib_device *ib_device) > write_unlock_irqrestore(&cm.device_lock, flags); > > for (i = 1; i <= ib_device->phys_port_cnt; i++) { > + if (!rdma_ib_or_iboe(ib_device, i)) > + continue; > + > port = cm_dev->port[i-1]; > ib_modify_port(ib_device, port->port_num, 0, &port_modify); > ib_unregister_mad_agent(port->mad_agent); -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/16/2015 02:43 PM, Hal Rosenstock wrote: [snip] >> + >> + count++; >> } >> + >> + if (!count) { >> + device_unregister(cm_dev->device); >> + kfree(cm_dev); >> + return; > > Nit: alternatively, this could be goto at end of this routine where > there is same 2 calls. I think Jason made this comment on earlier set of > these patches. Thanks for the notify, I guess I missed it, my bad :-P Will be "goto free" in next version. Regards, Michael Wang > > -- Hal > >> + } >> + >> ib_set_client_data(ib_device, &cm_client, cm_dev); >> >> write_lock_irqsave(&cm.device_lock, flags); >> @@ -3825,6 +3835,9 @@ error1: >> port_modify.set_port_cap_mask = 0; >> port_modify.clr_port_cap_mask = IB_PORT_CM_SUP; >> while (--i) { >> + if (!rdma_ib_or_iboe(ib_device, i)) >> + continue; >> + >> port = cm_dev->port[i-1]; >> ib_modify_port(ib_device, port->port_num, 0, &port_modify); >> ib_unregister_mad_agent(port->mad_agent); >> @@ -3853,6 +3866,9 @@ static void cm_remove_one(struct ib_device *ib_device) >> write_unlock_irqrestore(&cm.device_lock, flags); >> >> for (i = 1; i <= ib_device->phys_port_cnt; i++) { >> + if (!rdma_ib_or_iboe(ib_device, i)) >> + continue; >> + >> port = cm_dev->port[i-1]; >> ib_modify_port(ib_device, port->port_num, 0, &port_modify); >> ib_unregister_mad_agent(port->mad_agent); > -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index e28a494..50321fe 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -3761,9 +3761,7 @@ static void cm_add_one(struct ib_device *ib_device) unsigned long flags; int ret; u8 i; - - if (rdma_node_get_transport(ib_device->node_type) != RDMA_TRANSPORT_IB) - return; + int count = 0; cm_dev = kzalloc(sizeof(*cm_dev) + sizeof(*port) * ib_device->phys_port_cnt, GFP_KERNEL); @@ -3783,6 +3781,9 @@ static void cm_add_one(struct ib_device *ib_device) set_bit(IB_MGMT_METHOD_SEND, reg_req.method_mask); for (i = 1; i <= ib_device->phys_port_cnt; i++) { + if (!rdma_ib_or_iboe(ib_device, i)) + continue; + port = kzalloc(sizeof *port, GFP_KERNEL); if (!port) goto error1; @@ -3809,7 +3810,16 @@ static void cm_add_one(struct ib_device *ib_device) ret = ib_modify_port(ib_device, i, 0, &port_modify); if (ret) goto error3; + + count++; } + + if (!count) { + device_unregister(cm_dev->device); + kfree(cm_dev); + return; + } + ib_set_client_data(ib_device, &cm_client, cm_dev); write_lock_irqsave(&cm.device_lock, flags); @@ -3825,6 +3835,9 @@ error1: port_modify.set_port_cap_mask = 0; port_modify.clr_port_cap_mask = IB_PORT_CM_SUP; while (--i) { + if (!rdma_ib_or_iboe(ib_device, i)) + continue; + port = cm_dev->port[i-1]; ib_modify_port(ib_device, port->port_num, 0, &port_modify); ib_unregister_mad_agent(port->mad_agent); @@ -3853,6 +3866,9 @@ static void cm_remove_one(struct ib_device *ib_device) write_unlock_irqrestore(&cm.device_lock, flags); for (i = 1; i <= ib_device->phys_port_cnt; i++) { + if (!rdma_ib_or_iboe(ib_device, i)) + continue; + port = cm_dev->port[i-1]; ib_modify_port(ib_device, port->port_num, 0, &port_modify); ib_unregister_mad_agent(port->mad_agent);
Use raw management helpers to reform IB-core cm. Cc: Steve Wise <swise@opengridcomputing.com> Cc: Tom Talpey <tom@talpey.com> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Cc: Doug Ledford <dledford@redhat.com> Cc: Ira Weiny <ira.weiny@intel.com> Cc: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Michael Wang <yun.wang@profitbricks.com> --- drivers/infiniband/core/cm.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)