Commit b39ffa1d authored by Matan Barak's avatar Matan Barak Committed by Doug Ledford

IB/core: Add gid_type to gid attribute

In order to support multiple GID types, we need to store the gid_type
with each GID. This is also aligned with the RoCE v2 annex "RoCEv2 PORT
GID table entries shall have a "GID type" attribute that denotes the L3
Address type". The currently supported GID is IB_GID_TYPE_IB which is
also RoCE v1 GID type.

This implies that gid_type should be added to roce_gid_table meta-data.
Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent cee3c4d0
...@@ -64,6 +64,7 @@ enum gid_attr_find_mask { ...@@ -64,6 +64,7 @@ enum gid_attr_find_mask {
GID_ATTR_FIND_MASK_GID = 1UL << 0, GID_ATTR_FIND_MASK_GID = 1UL << 0,
GID_ATTR_FIND_MASK_NETDEV = 1UL << 1, GID_ATTR_FIND_MASK_NETDEV = 1UL << 1,
GID_ATTR_FIND_MASK_DEFAULT = 1UL << 2, GID_ATTR_FIND_MASK_DEFAULT = 1UL << 2,
GID_ATTR_FIND_MASK_GID_TYPE = 1UL << 3,
}; };
enum gid_table_entry_props { enum gid_table_entry_props {
...@@ -125,6 +126,19 @@ static void dispatch_gid_change_event(struct ib_device *ib_dev, u8 port) ...@@ -125,6 +126,19 @@ static void dispatch_gid_change_event(struct ib_device *ib_dev, u8 port)
} }
} }
static const char * const gid_type_str[] = {
[IB_GID_TYPE_IB] = "IB/RoCE v1",
};
const char *ib_cache_gid_type_str(enum ib_gid_type gid_type)
{
if (gid_type < ARRAY_SIZE(gid_type_str) && gid_type_str[gid_type])
return gid_type_str[gid_type];
return "Invalid GID type";
}
EXPORT_SYMBOL(ib_cache_gid_type_str);
/* This function expects that rwlock will be write locked in all /* This function expects that rwlock will be write locked in all
* scenarios and that lock will be locked in sleep-able (RoCE) * scenarios and that lock will be locked in sleep-able (RoCE)
* scenarios. * scenarios.
...@@ -233,6 +247,10 @@ static int find_gid(struct ib_gid_table *table, const union ib_gid *gid, ...@@ -233,6 +247,10 @@ static int find_gid(struct ib_gid_table *table, const union ib_gid *gid,
if (found >= 0) if (found >= 0)
continue; continue;
if (mask & GID_ATTR_FIND_MASK_GID_TYPE &&
attr->gid_type != val->gid_type)
continue;
if (mask & GID_ATTR_FIND_MASK_GID && if (mask & GID_ATTR_FIND_MASK_GID &&
memcmp(gid, &data->gid, sizeof(*gid))) memcmp(gid, &data->gid, sizeof(*gid)))
continue; continue;
...@@ -296,6 +314,7 @@ int ib_cache_gid_add(struct ib_device *ib_dev, u8 port, ...@@ -296,6 +314,7 @@ int ib_cache_gid_add(struct ib_device *ib_dev, u8 port,
write_lock_irq(&table->rwlock); write_lock_irq(&table->rwlock);
ix = find_gid(table, gid, attr, false, GID_ATTR_FIND_MASK_GID | ix = find_gid(table, gid, attr, false, GID_ATTR_FIND_MASK_GID |
GID_ATTR_FIND_MASK_GID_TYPE |
GID_ATTR_FIND_MASK_NETDEV, &empty); GID_ATTR_FIND_MASK_NETDEV, &empty);
if (ix >= 0) if (ix >= 0)
goto out_unlock; goto out_unlock;
...@@ -329,6 +348,7 @@ int ib_cache_gid_del(struct ib_device *ib_dev, u8 port, ...@@ -329,6 +348,7 @@ int ib_cache_gid_del(struct ib_device *ib_dev, u8 port,
ix = find_gid(table, gid, attr, false, ix = find_gid(table, gid, attr, false,
GID_ATTR_FIND_MASK_GID | GID_ATTR_FIND_MASK_GID |
GID_ATTR_FIND_MASK_GID_TYPE |
GID_ATTR_FIND_MASK_NETDEV | GID_ATTR_FIND_MASK_NETDEV |
GID_ATTR_FIND_MASK_DEFAULT, GID_ATTR_FIND_MASK_DEFAULT,
NULL); NULL);
...@@ -427,11 +447,13 @@ static int _ib_cache_gid_table_find(struct ib_device *ib_dev, ...@@ -427,11 +447,13 @@ static int _ib_cache_gid_table_find(struct ib_device *ib_dev,
static int ib_cache_gid_find(struct ib_device *ib_dev, static int ib_cache_gid_find(struct ib_device *ib_dev,
const union ib_gid *gid, const union ib_gid *gid,
enum ib_gid_type gid_type,
struct net_device *ndev, u8 *port, struct net_device *ndev, u8 *port,
u16 *index) u16 *index)
{ {
unsigned long mask = GID_ATTR_FIND_MASK_GID; unsigned long mask = GID_ATTR_FIND_MASK_GID |
struct ib_gid_attr gid_attr_val = {.ndev = ndev}; GID_ATTR_FIND_MASK_GID_TYPE;
struct ib_gid_attr gid_attr_val = {.ndev = ndev, .gid_type = gid_type};
if (ndev) if (ndev)
mask |= GID_ATTR_FIND_MASK_NETDEV; mask |= GID_ATTR_FIND_MASK_NETDEV;
...@@ -442,14 +464,16 @@ static int ib_cache_gid_find(struct ib_device *ib_dev, ...@@ -442,14 +464,16 @@ static int ib_cache_gid_find(struct ib_device *ib_dev,
int ib_find_cached_gid_by_port(struct ib_device *ib_dev, int ib_find_cached_gid_by_port(struct ib_device *ib_dev,
const union ib_gid *gid, const union ib_gid *gid,
enum ib_gid_type gid_type,
u8 port, struct net_device *ndev, u8 port, struct net_device *ndev,
u16 *index) u16 *index)
{ {
int local_index; int local_index;
struct ib_gid_table **ports_table = ib_dev->cache.gid_cache; struct ib_gid_table **ports_table = ib_dev->cache.gid_cache;
struct ib_gid_table *table; struct ib_gid_table *table;
unsigned long mask = GID_ATTR_FIND_MASK_GID; unsigned long mask = GID_ATTR_FIND_MASK_GID |
struct ib_gid_attr val = {.ndev = ndev}; GID_ATTR_FIND_MASK_GID_TYPE;
struct ib_gid_attr val = {.ndev = ndev, .gid_type = gid_type};
unsigned long flags; unsigned long flags;
if (port < rdma_start_port(ib_dev) || if (port < rdma_start_port(ib_dev) ||
...@@ -607,15 +631,15 @@ static void cleanup_gid_table_port(struct ib_device *ib_dev, u8 port, ...@@ -607,15 +631,15 @@ static void cleanup_gid_table_port(struct ib_device *ib_dev, u8 port,
void ib_cache_gid_set_default_gid(struct ib_device *ib_dev, u8 port, void ib_cache_gid_set_default_gid(struct ib_device *ib_dev, u8 port,
struct net_device *ndev, struct net_device *ndev,
unsigned long gid_type_mask,
enum ib_cache_gid_default_mode mode) enum ib_cache_gid_default_mode mode)
{ {
struct ib_gid_table **ports_table = ib_dev->cache.gid_cache; struct ib_gid_table **ports_table = ib_dev->cache.gid_cache;
union ib_gid gid; union ib_gid gid;
struct ib_gid_attr gid_attr; struct ib_gid_attr gid_attr;
struct ib_gid_attr zattr_type = zattr;
struct ib_gid_table *table; struct ib_gid_table *table;
int ix; unsigned int gid_type;
union ib_gid current_gid;
struct ib_gid_attr current_gid_attr = {};
table = ports_table[port - rdma_start_port(ib_dev)]; table = ports_table[port - rdma_start_port(ib_dev)];
...@@ -623,55 +647,82 @@ void ib_cache_gid_set_default_gid(struct ib_device *ib_dev, u8 port, ...@@ -623,55 +647,82 @@ void ib_cache_gid_set_default_gid(struct ib_device *ib_dev, u8 port,
memset(&gid_attr, 0, sizeof(gid_attr)); memset(&gid_attr, 0, sizeof(gid_attr));
gid_attr.ndev = ndev; gid_attr.ndev = ndev;
for (gid_type = 0; gid_type < IB_GID_TYPE_SIZE; ++gid_type) {
int ix;
union ib_gid current_gid;
struct ib_gid_attr current_gid_attr = {};
if (1UL << gid_type & ~gid_type_mask)
continue;
gid_attr.gid_type = gid_type;
mutex_lock(&table->lock); mutex_lock(&table->lock);
write_lock_irq(&table->rwlock); write_lock_irq(&table->rwlock);
ix = find_gid(table, NULL, NULL, true, GID_ATTR_FIND_MASK_DEFAULT, NULL); ix = find_gid(table, NULL, &gid_attr, true,
GID_ATTR_FIND_MASK_GID_TYPE |
GID_ATTR_FIND_MASK_DEFAULT,
NULL);
/* Coudn't find default GID location */ /* Coudn't find default GID location */
WARN_ON(ix < 0); WARN_ON(ix < 0);
zattr_type.gid_type = gid_type;
if (!__ib_cache_gid_get(ib_dev, port, ix, if (!__ib_cache_gid_get(ib_dev, port, ix,
&current_gid, &current_gid_attr) && &current_gid, &current_gid_attr) &&
mode == IB_CACHE_GID_DEFAULT_MODE_SET && mode == IB_CACHE_GID_DEFAULT_MODE_SET &&
!memcmp(&gid, &current_gid, sizeof(gid)) && !memcmp(&gid, &current_gid, sizeof(gid)) &&
!memcmp(&gid_attr, &current_gid_attr, sizeof(gid_attr))) !memcmp(&gid_attr, &current_gid_attr, sizeof(gid_attr)))
goto unlock; goto release;
if (memcmp(&current_gid, &zgid, sizeof(current_gid)) || if (memcmp(&current_gid, &zgid, sizeof(current_gid)) ||
memcmp(&current_gid_attr, &zattr, memcmp(&current_gid_attr, &zattr_type,
sizeof(current_gid_attr))) { sizeof(current_gid_attr))) {
if (del_gid(ib_dev, port, table, ix, true)) { if (del_gid(ib_dev, port, table, ix, true)) {
pr_warn("ib_cache_gid: can't delete index %d for default gid %pI6\n", pr_warn("ib_cache_gid: can't delete index %d for default gid %pI6\n",
ix, gid.raw); ix, gid.raw);
goto unlock; goto release;
} else { } else {
dispatch_gid_change_event(ib_dev, port); dispatch_gid_change_event(ib_dev, port);
} }
} }
if (mode == IB_CACHE_GID_DEFAULT_MODE_SET) { if (mode == IB_CACHE_GID_DEFAULT_MODE_SET) {
if (add_gid(ib_dev, port, table, ix, &gid, &gid_attr, true)) { if (add_gid(ib_dev, port, table, ix, &gid, &gid_attr, true))
pr_warn("ib_cache_gid: unable to add default gid %pI6\n", pr_warn("ib_cache_gid: unable to add default gid %pI6\n",
gid.raw); gid.raw);
} else { else
dispatch_gid_change_event(ib_dev, port); dispatch_gid_change_event(ib_dev, port);
} }
}
unlock: release:
if (current_gid_attr.ndev) if (current_gid_attr.ndev)
dev_put(current_gid_attr.ndev); dev_put(current_gid_attr.ndev);
write_unlock_irq(&table->rwlock); write_unlock_irq(&table->rwlock);
mutex_unlock(&table->lock); mutex_unlock(&table->lock);
}
} }
static int gid_table_reserve_default(struct ib_device *ib_dev, u8 port, static int gid_table_reserve_default(struct ib_device *ib_dev, u8 port,
struct ib_gid_table *table) struct ib_gid_table *table)
{ {
if (rdma_protocol_roce(ib_dev, port)) { unsigned int i;
struct ib_gid_table_entry *entry = &table->data_vec[0]; unsigned long roce_gid_type_mask;
unsigned int num_default_gids;
unsigned int current_gid = 0;
roce_gid_type_mask = roce_gid_type_mask_support(ib_dev, port);
num_default_gids = hweight_long(roce_gid_type_mask);
for (i = 0; i < num_default_gids && i < table->sz; i++) {
struct ib_gid_table_entry *entry =
&table->data_vec[i];
entry->props |= GID_TABLE_ENTRY_DEFAULT; entry->props |= GID_TABLE_ENTRY_DEFAULT;
current_gid = find_next_bit(&roce_gid_type_mask,
BITS_PER_LONG,
current_gid);
entry->attr.gid_type = current_gid++;
} }
return 0; return 0;
...@@ -794,11 +845,12 @@ EXPORT_SYMBOL(ib_get_cached_gid); ...@@ -794,11 +845,12 @@ EXPORT_SYMBOL(ib_get_cached_gid);
int ib_find_cached_gid(struct ib_device *device, int ib_find_cached_gid(struct ib_device *device,
const union ib_gid *gid, const union ib_gid *gid,
enum ib_gid_type gid_type,
struct net_device *ndev, struct net_device *ndev,
u8 *port_num, u8 *port_num,
u16 *index) u16 *index)
{ {
return ib_cache_gid_find(device, gid, ndev, port_num, index); return ib_cache_gid_find(device, gid, gid_type, ndev, port_num, index);
} }
EXPORT_SYMBOL(ib_find_cached_gid); EXPORT_SYMBOL(ib_find_cached_gid);
......
...@@ -364,7 +364,7 @@ static int cm_init_av_by_path(struct ib_sa_path_rec *path, struct cm_av *av) ...@@ -364,7 +364,7 @@ static int cm_init_av_by_path(struct ib_sa_path_rec *path, struct cm_av *av)
read_lock_irqsave(&cm.device_lock, flags); read_lock_irqsave(&cm.device_lock, flags);
list_for_each_entry(cm_dev, &cm.device_list, list) { list_for_each_entry(cm_dev, &cm.device_list, list) {
if (!ib_find_cached_gid(cm_dev->ib_device, &path->sgid, if (!ib_find_cached_gid(cm_dev->ib_device, &path->sgid,
ndev, &p, NULL)) { IB_GID_TYPE_IB, ndev, &p, NULL)) {
port = cm_dev->port[p-1]; port = cm_dev->port[p-1];
break; break;
} }
......
...@@ -456,7 +456,8 @@ static inline int cma_validate_port(struct ib_device *device, u8 port, ...@@ -456,7 +456,8 @@ static inline int cma_validate_port(struct ib_device *device, u8 port,
if (dev_type == ARPHRD_ETHER) if (dev_type == ARPHRD_ETHER)
ndev = dev_get_by_index(&init_net, bound_if_index); ndev = dev_get_by_index(&init_net, bound_if_index);
ret = ib_find_cached_gid_by_port(device, gid, port, ndev, NULL); ret = ib_find_cached_gid_by_port(device, gid, IB_GID_TYPE_IB, port,
ndev, NULL);
if (ndev) if (ndev)
dev_put(ndev); dev_put(ndev);
......
...@@ -70,8 +70,11 @@ enum ib_cache_gid_default_mode { ...@@ -70,8 +70,11 @@ enum ib_cache_gid_default_mode {
IB_CACHE_GID_DEFAULT_MODE_DELETE IB_CACHE_GID_DEFAULT_MODE_DELETE
}; };
const char *ib_cache_gid_type_str(enum ib_gid_type gid_type);
void ib_cache_gid_set_default_gid(struct ib_device *ib_dev, u8 port, void ib_cache_gid_set_default_gid(struct ib_device *ib_dev, u8 port,
struct net_device *ndev, struct net_device *ndev,
unsigned long gid_type_mask,
enum ib_cache_gid_default_mode mode); enum ib_cache_gid_default_mode mode);
int ib_cache_gid_add(struct ib_device *ib_dev, u8 port, int ib_cache_gid_add(struct ib_device *ib_dev, u8 port,
...@@ -87,6 +90,7 @@ int roce_gid_mgmt_init(void); ...@@ -87,6 +90,7 @@ int roce_gid_mgmt_init(void);
void roce_gid_mgmt_cleanup(void); void roce_gid_mgmt_cleanup(void);
int roce_rescan_device(struct ib_device *ib_dev); int roce_rescan_device(struct ib_device *ib_dev);
unsigned long roce_gid_type_mask_support(struct ib_device *ib_dev, u8 port);
int ib_cache_setup_one(struct ib_device *device); int ib_cache_setup_one(struct ib_device *device);
void ib_cache_cleanup_one(struct ib_device *device); void ib_cache_cleanup_one(struct ib_device *device);
......
...@@ -815,26 +815,31 @@ EXPORT_SYMBOL(ib_modify_port); ...@@ -815,26 +815,31 @@ EXPORT_SYMBOL(ib_modify_port);
* a specified GID value occurs. * a specified GID value occurs.
* @device: The device to query. * @device: The device to query.
* @gid: The GID value to search for. * @gid: The GID value to search for.
* @gid_type: Type of GID.
* @ndev: The ndev related to the GID to search for. * @ndev: The ndev related to the GID to search for.
* @port_num: The port number of the device where the GID value was found. * @port_num: The port number of the device where the GID value was found.
* @index: The index into the GID table where the GID was found. This * @index: The index into the GID table where the GID was found. This
* parameter may be NULL. * parameter may be NULL.
*/ */
int ib_find_gid(struct ib_device *device, union ib_gid *gid, int ib_find_gid(struct ib_device *device, union ib_gid *gid,
struct net_device *ndev, u8 *port_num, u16 *index) enum ib_gid_type gid_type, struct net_device *ndev,
u8 *port_num, u16 *index)
{ {
union ib_gid tmp_gid; union ib_gid tmp_gid;
int ret, port, i; int ret, port, i;
for (port = rdma_start_port(device); port <= rdma_end_port(device); ++port) { for (port = rdma_start_port(device); port <= rdma_end_port(device); ++port) {
if (rdma_cap_roce_gid_table(device, port)) { if (rdma_cap_roce_gid_table(device, port)) {
if (!ib_find_cached_gid_by_port(device, gid, port, if (!ib_find_cached_gid_by_port(device, gid, gid_type, port,
ndev, index)) { ndev, index)) {
*port_num = port; *port_num = port;
return 0; return 0;
} }
} }
if (gid_type != IB_GID_TYPE_IB)
continue;
for (i = 0; i < device->port_immutable[port].gid_tbl_len; ++i) { for (i = 0; i < device->port_immutable[port].gid_tbl_len; ++i) {
ret = ib_query_gid(device, port, i, &tmp_gid, NULL); ret = ib_query_gid(device, port, i, &tmp_gid, NULL);
if (ret) if (ret)
......
...@@ -729,7 +729,7 @@ int ib_init_ah_from_mcmember(struct ib_device *device, u8 port_num, ...@@ -729,7 +729,7 @@ int ib_init_ah_from_mcmember(struct ib_device *device, u8 port_num,
u16 gid_index; u16 gid_index;
u8 p; u8 p;
ret = ib_find_cached_gid(device, &rec->port_gid, ret = ib_find_cached_gid(device, &rec->port_gid, IB_GID_TYPE_IB,
NULL, &p, &gid_index); NULL, &p, &gid_index);
if (ret) if (ret)
return ret; return ret;
......
...@@ -67,18 +67,53 @@ struct netdev_event_work { ...@@ -67,18 +67,53 @@ struct netdev_event_work {
struct netdev_event_work_cmd cmds[ROCE_NETDEV_CALLBACK_SZ]; struct netdev_event_work_cmd cmds[ROCE_NETDEV_CALLBACK_SZ];
}; };
static const struct {
bool (*is_supported)(const struct ib_device *device, u8 port_num);
enum ib_gid_type gid_type;
} PORT_CAP_TO_GID_TYPE[] = {
{rdma_protocol_roce, IB_GID_TYPE_ROCE},
};
#define CAP_TO_GID_TABLE_SIZE ARRAY_SIZE(PORT_CAP_TO_GID_TYPE)
unsigned long roce_gid_type_mask_support(struct ib_device *ib_dev, u8 port)
{
int i;
unsigned int ret_flags = 0;
if (!rdma_protocol_roce(ib_dev, port))
return 1UL << IB_GID_TYPE_IB;
for (i = 0; i < CAP_TO_GID_TABLE_SIZE; i++)
if (PORT_CAP_TO_GID_TYPE[i].is_supported(ib_dev, port))
ret_flags |= 1UL << PORT_CAP_TO_GID_TYPE[i].gid_type;
return ret_flags;
}
EXPORT_SYMBOL(roce_gid_type_mask_support);
static void update_gid(enum gid_op_type gid_op, struct ib_device *ib_dev, static void update_gid(enum gid_op_type gid_op, struct ib_device *ib_dev,
u8 port, union ib_gid *gid, u8 port, union ib_gid *gid,
struct ib_gid_attr *gid_attr) struct ib_gid_attr *gid_attr)
{ {
int i;
unsigned long gid_type_mask = roce_gid_type_mask_support(ib_dev, port);
for (i = 0; i < IB_GID_TYPE_SIZE; i++) {
if ((1UL << i) & gid_type_mask) {
gid_attr->gid_type = i;
switch (gid_op) { switch (gid_op) {
case GID_ADD: case GID_ADD:
ib_cache_gid_add(ib_dev, port, gid, gid_attr); ib_cache_gid_add(ib_dev, port,
gid, gid_attr);
break; break;
case GID_DEL: case GID_DEL:
ib_cache_gid_del(ib_dev, port, gid, gid_attr); ib_cache_gid_del(ib_dev, port,
gid, gid_attr);
break; break;
} }
}
}
} }
enum bonding_slave_state { enum bonding_slave_state {
...@@ -203,6 +238,8 @@ static void enum_netdev_default_gids(struct ib_device *ib_dev, ...@@ -203,6 +238,8 @@ static void enum_netdev_default_gids(struct ib_device *ib_dev,
u8 port, struct net_device *event_ndev, u8 port, struct net_device *event_ndev,
struct net_device *rdma_ndev) struct net_device *rdma_ndev)
{ {
unsigned long gid_type_mask;
rcu_read_lock(); rcu_read_lock();
if (!rdma_ndev || if (!rdma_ndev ||
((rdma_ndev != event_ndev && ((rdma_ndev != event_ndev &&
...@@ -215,7 +252,9 @@ static void enum_netdev_default_gids(struct ib_device *ib_dev, ...@@ -215,7 +252,9 @@ static void enum_netdev_default_gids(struct ib_device *ib_dev,
} }
rcu_read_unlock(); rcu_read_unlock();
ib_cache_gid_set_default_gid(ib_dev, port, rdma_ndev, gid_type_mask = roce_gid_type_mask_support(ib_dev, port);
ib_cache_gid_set_default_gid(ib_dev, port, rdma_ndev, gid_type_mask,
IB_CACHE_GID_DEFAULT_MODE_SET); IB_CACHE_GID_DEFAULT_MODE_SET);
} }
...@@ -237,9 +276,14 @@ static void bond_delete_netdev_default_gids(struct ib_device *ib_dev, ...@@ -237,9 +276,14 @@ static void bond_delete_netdev_default_gids(struct ib_device *ib_dev,
if (is_upper_dev_rcu(rdma_ndev, event_ndev) && if (is_upper_dev_rcu(rdma_ndev, event_ndev) &&
is_eth_active_slave_of_bonding_rcu(rdma_ndev, real_dev) == is_eth_active_slave_of_bonding_rcu(rdma_ndev, real_dev) ==
BONDING_SLAVE_STATE_INACTIVE) { BONDING_SLAVE_STATE_INACTIVE) {
unsigned long gid_type_mask;
rcu_read_unlock(); rcu_read_unlock();
gid_type_mask = roce_gid_type_mask_support(ib_dev, port);
ib_cache_gid_set_default_gid(ib_dev, port, rdma_ndev, ib_cache_gid_set_default_gid(ib_dev, port, rdma_ndev,
gid_type_mask,
IB_CACHE_GID_DEFAULT_MODE_DELETE); IB_CACHE_GID_DEFAULT_MODE_DELETE);
} else { } else {
rcu_read_unlock(); rcu_read_unlock();
......
...@@ -1014,8 +1014,8 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num, ...@@ -1014,8 +1014,8 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
ah_attr->ah_flags = IB_AH_GRH; ah_attr->ah_flags = IB_AH_GRH;
ah_attr->grh.dgid = rec->dgid; ah_attr->grh.dgid = rec->dgid;
ret = ib_find_cached_gid(device, &rec->sgid, ndev, &port_num, ret = ib_find_cached_gid(device, &rec->sgid, rec->gid_type, ndev,
&gid_index); &port_num, &gid_index);
if (ret) { if (ret) {
if (ndev) if (ndev)
dev_put(ndev); dev_put(ndev);
...@@ -1157,6 +1157,7 @@ static void ib_sa_path_rec_callback(struct ib_sa_query *sa_query, ...@@ -1157,6 +1157,7 @@ static void ib_sa_path_rec_callback(struct ib_sa_query *sa_query,
mad->data, &rec); mad->data, &rec);
rec.net = NULL; rec.net = NULL;
rec.ifindex = 0; rec.ifindex = 0;
rec.gid_type = IB_GID_TYPE_IB;
memset(rec.dmac, 0, ETH_ALEN); memset(rec.dmac, 0, ETH_ALEN);
query->callback(status, &rec, query->context); query->callback(status, &rec, query->context);
} else } else
......
...@@ -144,5 +144,6 @@ void ib_copy_path_rec_from_user(struct ib_sa_path_rec *dst, ...@@ -144,5 +144,6 @@ void ib_copy_path_rec_from_user(struct ib_sa_path_rec *dst,
memset(dst->dmac, 0, sizeof(dst->dmac)); memset(dst->dmac, 0, sizeof(dst->dmac));
dst->net = NULL; dst->net = NULL;
dst->ifindex = 0; dst->ifindex = 0;
dst->gid_type = IB_GID_TYPE_IB;
} }
EXPORT_SYMBOL(ib_copy_path_rec_from_user); EXPORT_SYMBOL(ib_copy_path_rec_from_user);
...@@ -381,6 +381,7 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num, ...@@ -381,6 +381,7 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num,
if (!rdma_cap_eth_ah(device, port_num)) { if (!rdma_cap_eth_ah(device, port_num)) {
ret = ib_find_cached_gid_by_port(device, &grh->dgid, ret = ib_find_cached_gid_by_port(device, &grh->dgid,
IB_GID_TYPE_IB,
port_num, NULL, port_num, NULL,
&gid_index); &gid_index);
if (ret) if (ret)
......
...@@ -60,6 +60,7 @@ int ib_get_cached_gid(struct ib_device *device, ...@@ -60,6 +60,7 @@ int ib_get_cached_gid(struct ib_device *device,
* a specified GID value occurs. * a specified GID value occurs.
* @device: The device to query. * @device: The device to query.
* @gid: The GID value to search for. * @gid: The GID value to search for.
* @gid_type: The GID type to search for.
* @ndev: In RoCE, the net device of the device. NULL means ignore. * @ndev: In RoCE, the net device of the device. NULL means ignore.
* @port_num: The port number of the device where the GID value was found. * @port_num: The port number of the device where the GID value was found.
* @index: The index into the cached GID table where the GID was found. This * @index: The index into the cached GID table where the GID was found. This
...@@ -70,6 +71,7 @@ int ib_get_cached_gid(struct ib_device *device, ...@@ -70,6 +71,7 @@ int ib_get_cached_gid(struct ib_device *device,
*/ */
int ib_find_cached_gid(struct ib_device *device, int ib_find_cached_gid(struct ib_device *device,
const union ib_gid *gid, const union ib_gid *gid,
enum ib_gid_type gid_type,
struct net_device *ndev, struct net_device *ndev,
u8 *port_num, u8 *port_num,
u16 *index); u16 *index);
...@@ -79,6 +81,7 @@ int ib_find_cached_gid(struct ib_device *device, ...@@ -79,6 +81,7 @@ int ib_find_cached_gid(struct ib_device *device,
* GID value occurs * GID value occurs
* @device: The device to query. * @device: The device to query.
* @gid: The GID value to search for. * @gid: The GID value to search for.
* @gid_type: The GID type to search for.
* @port_num: The port number of the device where the GID value sould be * @port_num: The port number of the device where the GID value sould be
* searched. * searched.
* @ndev: In RoCE, the net device of the device. Null means ignore. * @ndev: In RoCE, the net device of the device. Null means ignore.
...@@ -90,6 +93,7 @@ int ib_find_cached_gid(struct ib_device *device, ...@@ -90,6 +93,7 @@ int ib_find_cached_gid(struct ib_device *device,
*/ */
int ib_find_cached_gid_by_port(struct ib_device *device, int ib_find_cached_gid_by_port(struct ib_device *device,
const union ib_gid *gid, const union ib_gid *gid,
enum ib_gid_type gid_type,
u8 port_num, u8 port_num,
struct net_device *ndev, struct net_device *ndev,
u16 *index); u16 *index);
......
...@@ -160,6 +160,7 @@ struct ib_sa_path_rec { ...@@ -160,6 +160,7 @@ struct ib_sa_path_rec {
int ifindex; int ifindex;
/* ignored in IB */ /* ignored in IB */
struct net *net; struct net *net;
enum ib_gid_type gid_type;
}; };
static inline struct net_device *ib_get_ndev_from_path(struct ib_sa_path_rec *rec) static inline struct net_device *ib_get_ndev_from_path(struct ib_sa_path_rec *rec)
......
...@@ -69,7 +69,15 @@ union ib_gid { ...@@ -69,7 +69,15 @@ union ib_gid {
extern union ib_gid zgid; extern union ib_gid zgid;
enum ib_gid_type {
/* If link layer is Ethernet, this is RoCE V1 */
IB_GID_TYPE_IB = 0,
IB_GID_TYPE_ROCE = 0,
IB_GID_TYPE_SIZE
};
struct ib_gid_attr { struct ib_gid_attr {
enum ib_gid_type gid_type;
struct net_device *ndev; struct net_device *ndev;
}; };
...@@ -2245,7 +2253,8 @@ int ib_modify_port(struct ib_device *device, ...@@ -2245,7 +2253,8 @@ int ib_modify_port(struct ib_device *device,
struct ib_port_modify *port_modify); struct ib_port_modify *port_modify);
int ib_find_gid(struct ib_device *device, union ib_gid *gid, int ib_find_gid(struct ib_device *device, union ib_gid *gid,
struct net_device *ndev, u8 *port_num, u16 *index); enum ib_gid_type gid_type, struct net_device *ndev,
u8 *port_num, u16 *index);
int ib_find_pkey(struct ib_device *device, int ib_find_pkey(struct ib_device *device,
u8 port_num, u16 pkey, u16 *index); u8 port_num, u16 pkey, u16 *index);
......
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