|
@@ -1981,26 +1981,38 @@ static void cma_set_loopback(struct sockaddr *addr)
|
|
|
|
|
|
static int cma_bind_loopback(struct rdma_id_private *id_priv)
|
|
|
{
|
|
|
- struct cma_device *cma_dev;
|
|
|
+ struct cma_device *cma_dev, *cur_dev;
|
|
|
struct ib_port_attr port_attr;
|
|
|
union ib_gid gid;
|
|
|
u16 pkey;
|
|
|
int ret;
|
|
|
u8 p;
|
|
|
|
|
|
+ cma_dev = NULL;
|
|
|
mutex_lock(&lock);
|
|
|
- if (list_empty(&dev_list)) {
|
|
|
+ list_for_each_entry(cur_dev, &dev_list, list) {
|
|
|
+ if (cma_family(id_priv) == AF_IB &&
|
|
|
+ rdma_node_get_transport(cur_dev->device->node_type) != RDMA_TRANSPORT_IB)
|
|
|
+ continue;
|
|
|
+
|
|
|
+ if (!cma_dev)
|
|
|
+ cma_dev = cur_dev;
|
|
|
+
|
|
|
+ for (p = 1; p <= cur_dev->device->phys_port_cnt; ++p) {
|
|
|
+ if (!ib_query_port(cur_dev->device, p, &port_attr) &&
|
|
|
+ port_attr.state == IB_PORT_ACTIVE) {
|
|
|
+ cma_dev = cur_dev;
|
|
|
+ goto port_found;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!cma_dev) {
|
|
|
ret = -ENODEV;
|
|
|
goto out;
|
|
|
}
|
|
|
- list_for_each_entry(cma_dev, &dev_list, list)
|
|
|
- for (p = 1; p <= cma_dev->device->phys_port_cnt; ++p)
|
|
|
- if (!ib_query_port(cma_dev->device, p, &port_attr) &&
|
|
|
- port_attr.state == IB_PORT_ACTIVE)
|
|
|
- goto port_found;
|
|
|
|
|
|
p = 1;
|
|
|
- cma_dev = list_entry(dev_list.next, struct cma_device, list);
|
|
|
|
|
|
port_found:
|
|
|
ret = ib_get_cached_gid(cma_dev->device, p, 0, &gid);
|