Commit 091e6a4c authored by Michael Wang's avatar Michael Wang Committed by Doug Ledford

IB/Verbs: Reform IB-core cm

Use raw management helpers to reform IB-core cm.
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 827f2a8b
...@@ -3759,11 +3759,9 @@ static void cm_add_one(struct ib_device *ib_device) ...@@ -3759,11 +3759,9 @@ static void cm_add_one(struct ib_device *ib_device)
}; };
unsigned long flags; unsigned long flags;
int ret; int ret;
int count = 0;
u8 i; u8 i;
if (rdma_node_get_transport(ib_device->node_type) != RDMA_TRANSPORT_IB)
return;
cm_dev = kzalloc(sizeof(*cm_dev) + sizeof(*port) * cm_dev = kzalloc(sizeof(*cm_dev) + sizeof(*port) *
ib_device->phys_port_cnt, GFP_KERNEL); ib_device->phys_port_cnt, GFP_KERNEL);
if (!cm_dev) if (!cm_dev)
...@@ -3782,6 +3780,9 @@ static void cm_add_one(struct ib_device *ib_device) ...@@ -3782,6 +3780,9 @@ static void cm_add_one(struct ib_device *ib_device)
set_bit(IB_MGMT_METHOD_SEND, reg_req.method_mask); set_bit(IB_MGMT_METHOD_SEND, reg_req.method_mask);
for (i = 1; i <= ib_device->phys_port_cnt; i++) { 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); port = kzalloc(sizeof *port, GFP_KERNEL);
if (!port) if (!port)
goto error1; goto error1;
...@@ -3808,7 +3809,13 @@ static void cm_add_one(struct ib_device *ib_device) ...@@ -3808,7 +3809,13 @@ static void cm_add_one(struct ib_device *ib_device)
ret = ib_modify_port(ib_device, i, 0, &port_modify); ret = ib_modify_port(ib_device, i, 0, &port_modify);
if (ret) if (ret)
goto error3; goto error3;
count++;
} }
if (!count)
goto free;
ib_set_client_data(ib_device, &cm_client, cm_dev); ib_set_client_data(ib_device, &cm_client, cm_dev);
write_lock_irqsave(&cm.device_lock, flags); write_lock_irqsave(&cm.device_lock, flags);
...@@ -3824,11 +3831,15 @@ static void cm_add_one(struct ib_device *ib_device) ...@@ -3824,11 +3831,15 @@ static void cm_add_one(struct ib_device *ib_device)
port_modify.set_port_cap_mask = 0; port_modify.set_port_cap_mask = 0;
port_modify.clr_port_cap_mask = IB_PORT_CM_SUP; port_modify.clr_port_cap_mask = IB_PORT_CM_SUP;
while (--i) { while (--i) {
if (!rdma_ib_or_iboe(ib_device, i))
continue;
port = cm_dev->port[i-1]; port = cm_dev->port[i-1];
ib_modify_port(ib_device, port->port_num, 0, &port_modify); ib_modify_port(ib_device, port->port_num, 0, &port_modify);
ib_unregister_mad_agent(port->mad_agent); ib_unregister_mad_agent(port->mad_agent);
cm_remove_port_fs(port); cm_remove_port_fs(port);
} }
free:
device_unregister(cm_dev->device); device_unregister(cm_dev->device);
kfree(cm_dev); kfree(cm_dev);
} }
...@@ -3852,6 +3863,9 @@ static void cm_remove_one(struct ib_device *ib_device) ...@@ -3852,6 +3863,9 @@ static void cm_remove_one(struct ib_device *ib_device)
write_unlock_irqrestore(&cm.device_lock, flags); write_unlock_irqrestore(&cm.device_lock, flags);
for (i = 1; i <= ib_device->phys_port_cnt; i++) { 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]; port = cm_dev->port[i-1];
ib_modify_port(ib_device, port->port_num, 0, &port_modify); ib_modify_port(ib_device, port->port_num, 0, &port_modify);
ib_unregister_mad_agent(port->mad_agent); ib_unregister_mad_agent(port->mad_agent);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment