openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

IB/core: Make rdma_find_gid_by_filter support all protocols 

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>
This commit is contained in:
Jason Gunthorpe 2018-06-05 08:40:21 +03:00
parent c3d71b69a7
commit 83f6f8d29d
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/infiniband/core/cache.c
View File

@ -715,7 +715,6 @@ EXPORT_SYMBOL(rdma_find_gid_by_port);
* *
* rdma_find_gid_by_filter() searches for the specified GID value * rdma_find_gid_by_filter() searches for the specified GID value
* of which the filter function returns true in the port's GID table. * 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( 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 long flags;
unsigned int i; unsigned int i;
if (!rdma_is_port_valid(ib_dev, port) || if (!rdma_is_port_valid(ib_dev, port))
!rdma_protocol_roce(ib_dev, port)) return ERR_PTR(-EINVAL);
return ERR_PTR(-EPROTONOSUPPORT);
table = rdma_gid_table(ib_dev, port); table = rdma_gid_table(ib_dev, port);
read_lock_irqsave(&table->rwlock, flags); read_lock_irqsave(&table->rwlock, flags);
for (i = 0; i < table->sz; i++) { 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; continue;
if (memcmp(gid, &table->data_vec[i]->attr.gid, if (memcmp(gid, &entry->attr.gid, sizeof(*gid)))
sizeof(*gid)))
continue; continue;
memcpy(&attr, &table->data_vec[i]->attr, sizeof(attr)); if (filter(gid, &entry->attr, context)) {
get_gid_entry(entry);
if (filter(gid, &attr, context)) { res = &entry->attr;
get_gid_entry(table->data_vec[i]);
res = &table->data_vec[i]->attr;
break; break;
} }
} }
@ -1099,10 +1094,6 @@ int ib_find_gid_by_filter(struct ib_device *device,
{ {
const struct ib_gid_attr *res; 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, res = rdma_find_gid_by_filter(device, gid, port_num, filter,
context); context);
if (IS_ERR(res)) if (IS_ERR(res))