]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
IB/core: Make rdma_find_gid_by_filter support all protocols
authorJason Gunthorpe <jgg@mellanox.com>
Tue, 5 Jun 2018 05:40:21 +0000 (08:40 +0300)
committerJason Gunthorpe <jgg@mellanox.com>
Mon, 18 Jun 2018 17:09:05 +0000 (11:09 -0600)
There is no reason to restrict this function to roce only these days,
allow the filter function to be called on any protocol.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
drivers/infiniband/core/cache.c

index 8a06e743c2dd79a892b1dadc4c55bd219ef95391..9846373c5cbc15b88032d56ab6cbd0e417252f94 100644 (file)
@@ -715,7 +715,6 @@ EXPORT_SYMBOL(rdma_find_gid_by_port);
  *
  * rdma_find_gid_by_filter() searches for the specified GID value
  * of which the filter function returns true in the port's GID table.
- * This function is only supported on RoCE ports.
  *
  */
 const struct ib_gid_attr *rdma_find_gid_by_filter(
@@ -729,28 +728,24 @@ const struct ib_gid_attr *rdma_find_gid_by_filter(
        unsigned long flags;
        unsigned int i;
 
-       if (!rdma_is_port_valid(ib_dev, port) ||
-           !rdma_protocol_roce(ib_dev, port))
-               return ERR_PTR(-EPROTONOSUPPORT);
+       if (!rdma_is_port_valid(ib_dev, port))
+               return ERR_PTR(-EINVAL);
 
        table = rdma_gid_table(ib_dev, port);
 
        read_lock_irqsave(&table->rwlock, flags);
        for (i = 0; i < table->sz; i++) {
-               struct ib_gid_attr attr;
+               struct ib_gid_table_entry *entry = table->data_vec[i];
 
-               if (!is_gid_entry_valid(table->data_vec[i]))
+               if (!is_gid_entry_valid(entry))
                        continue;
 
-               if (memcmp(gid, &table->data_vec[i]->attr.gid,
-                          sizeof(*gid)))
+               if (memcmp(gid, &entry->attr.gid, sizeof(*gid)))
                        continue;
 
-               memcpy(&attr, &table->data_vec[i]->attr, sizeof(attr));
-
-               if (filter(gid, &attr, context)) {
-                       get_gid_entry(table->data_vec[i]);
-                       res = &table->data_vec[i]->attr;
+               if (filter(gid, &entry->attr, context)) {
+                       get_gid_entry(entry);
+                       res = &entry->attr;
                        break;
                }
        }
@@ -1099,10 +1094,6 @@ int ib_find_gid_by_filter(struct ib_device *device,
 {
        const struct ib_gid_attr *res;
 
-       /* Only RoCE GID table supports filter function */
-       if (!rdma_protocol_roce(device, port_num) && filter)
-               return -EPROTONOSUPPORT;
-
        res = rdma_find_gid_by_filter(device, gid, port_num, filter,
                                      context);
        if (IS_ERR(res))