Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-microblaze.git] / drivers / infiniband / core / cma.c

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 9891c7d..c343edf 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -686,30 +686,52 @@ cma_validate_port(struct ib_device *device, u32 port,
                  struct rdma_id_private *id_priv)
 {
        struct rdma_dev_addr *dev_addr = &id_priv->id.route.addr.dev_addr;
+       const struct ib_gid_attr *sgid_attr = ERR_PTR(-ENODEV);
        int bound_if_index = dev_addr->bound_dev_if;
-       const struct ib_gid_attr *sgid_attr;
        int dev_type = dev_addr->dev_type;
        struct net_device *ndev = NULL;
 
        if (!rdma_dev_access_netns(device, id_priv->id.route.addr.dev_addr.net))
-               return ERR_PTR(-ENODEV);
+               goto out;
 
        if ((dev_type == ARPHRD_INFINIBAND) && !rdma_protocol_ib(device, port))
-               return ERR_PTR(-ENODEV);
+               goto out;
 
        if ((dev_type != ARPHRD_INFINIBAND) && rdma_protocol_ib(device, port))
-               return ERR_PTR(-ENODEV);
+               goto out;
+
+       /*
+        * For drivers that do not associate more than one net device with
+        * their gid tables, such as iWARP drivers, it is sufficient to
+        * return the first table entry.
+        *
+        * Other driver classes might be included in the future.
+        */
+       if (rdma_protocol_iwarp(device, port)) {
+               sgid_attr = rdma_get_gid_attr(device, port, 0);
+               if (IS_ERR(sgid_attr))
+                       goto out;
+
+               rcu_read_lock();
+               ndev = rcu_dereference(sgid_attr->ndev);
+               if (!net_eq(dev_net(ndev), dev_addr->net) ||
+                   ndev->ifindex != bound_if_index)
+                       sgid_attr = ERR_PTR(-ENODEV);
+               rcu_read_unlock();
+               goto out;
+       }
 
        if (dev_type == ARPHRD_ETHER && rdma_protocol_roce(device, port)) {
                ndev = dev_get_by_index(dev_addr->net, bound_if_index);
                if (!ndev)
-                       return ERR_PTR(-ENODEV);
+                       goto out;
        } else {
                gid_type = IB_GID_TYPE_IB;
        }
 
        sgid_attr = rdma_find_gid_by_port(device, gid, gid_type, port, ndev);
        dev_put(ndev);
+out:
        return sgid_attr;
 }