Skip to content

L
linux
Commit 0cf18d77 authored by Ira Weiny's avatar Ira Weiny Committed by Doug Ledford
Browse files
Options

IB/core: Create common start/end port functions 

Previously start_port and end_port were defined in 2 places, cache.c and
device.c and this prevented their use in other modules.

Make these common functions, change the name to reflect the rdma
name space, and update existing users.
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 296ec009
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 55 deletions
drivers/infiniband/core/cache.c
View file @ 0cf18d77
...@@ -58,17 +58,6 @@ struct ib_update_work { ...@@ -58,17 +58,6 @@ struct ib_update_work {
u8 port_num; u8 port_num;
}; };
static inline int start_port(struct ib_device *device)
{
return (device->node_type == RDMA_NODE_IB_SWITCH) ? 0 : 1;
}
static inline int end_port(struct ib_device *device)
{
return (device->node_type == RDMA_NODE_IB_SWITCH) ?
0 : device->phys_port_cnt;
}
int ib_get_cached_gid(struct ib_device *device, int ib_get_cached_gid(struct ib_device *device,
u8 port_num, u8 port_num,
int index, int index,
...@@ -78,12 +67,12 @@ int ib_get_cached_gid(struct ib_device *device, ...@@ -78,12 +67,12 @@ int ib_get_cached_gid(struct ib_device *device,
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
if (port_num < start_port(device) || port_num > end_port(device)) if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))
return -EINVAL; return -EINVAL;
read_lock_irqsave(&device->cache.lock, flags); read_lock_irqsave(&device->cache.lock, flags);
cache = device->cache.gid_cache[port_num - start_port(device)]; cache = device->cache.gid_cache[port_num - rdma_start_port(device)];
if (index < 0 || index >= cache->table_len) if (index < 0 || index >= cache->table_len)
ret = -EINVAL; ret = -EINVAL;
...@@ -112,11 +101,11 @@ int ib_find_cached_gid(struct ib_device *device, ...@@ -112,11 +101,11 @@ int ib_find_cached_gid(struct ib_device *device,
read_lock_irqsave(&device->cache.lock, flags); read_lock_irqsave(&device->cache.lock, flags);
for (p = 0; p <= end_port(device) - start_port(device); ++p) { for (p = 0; p <= rdma_end_port(device) - rdma_start_port(device); ++p) {
cache = device->cache.gid_cache[p]; cache = device->cache.gid_cache[p];
for (i = 0; i < cache->table_len; ++i) { for (i = 0; i < cache->table_len; ++i) {
if (!memcmp(gid, &cache->table[i], sizeof *gid)) { if (!memcmp(gid, &cache->table[i], sizeof *gid)) {
*port_num = p + start_port(device); *port_num = p + rdma_start_port(device);
if (index) if (index)
*index = i; *index = i;
ret = 0; ret = 0;
...@@ -140,12 +129,12 @@ int ib_get_cached_pkey(struct ib_device *device, ...@@ -140,12 +129,12 @@ int ib_get_cached_pkey(struct ib_device *device,
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
if (port_num < start_port(device) || port_num > end_port(device)) if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))
return -EINVAL; return -EINVAL;
read_lock_irqsave(&device->cache.lock, flags); read_lock_irqsave(&device->cache.lock, flags);
cache = device->cache.pkey_cache[port_num - start_port(device)]; cache = device->cache.pkey_cache[port_num - rdma_start_port(device)];
if (index < 0 || index >= cache->table_len) if (index < 0 || index >= cache->table_len)
ret = -EINVAL; ret = -EINVAL;
...@@ -169,12 +158,12 @@ int ib_find_cached_pkey(struct ib_device *device, ...@@ -169,12 +158,12 @@ int ib_find_cached_pkey(struct ib_device *device,
int ret = -ENOENT; int ret = -ENOENT;
int partial_ix = -1; int partial_ix = -1;
if (port_num < start_port(device) || port_num > end_port(device)) if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))
return -EINVAL; return -EINVAL;
read_lock_irqsave(&device->cache.lock, flags); read_lock_irqsave(&device->cache.lock, flags);
cache = device->cache.pkey_cache[port_num - start_port(device)]; cache = device->cache.pkey_cache[port_num - rdma_start_port(device)];
*index = -1; *index = -1;
...@@ -209,12 +198,12 @@ int ib_find_exact_cached_pkey(struct ib_device *device, ...@@ -209,12 +198,12 @@ int ib_find_exact_cached_pkey(struct ib_device *device,
int i; int i;
int ret = -ENOENT; int ret = -ENOENT;
if (port_num < start_port(device) || port_num > end_port(device)) if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))
return -EINVAL; return -EINVAL;
read_lock_irqsave(&device->cache.lock, flags); read_lock_irqsave(&device->cache.lock, flags);
cache = device->cache.pkey_cache[port_num - start_port(device)]; cache = device->cache.pkey_cache[port_num - rdma_start_port(device)];
*index = -1; *index = -1;
...@@ -238,11 +227,11 @@ int ib_get_cached_lmc(struct ib_device *device, ...@@ -238,11 +227,11 @@ int ib_get_cached_lmc(struct ib_device *device,
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
if (port_num < start_port(device) || port_num > end_port(device)) if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))
return -EINVAL; return -EINVAL;
read_lock_irqsave(&device->cache.lock, flags); read_lock_irqsave(&device->cache.lock, flags);
*lmc = device->cache.lmc_cache[port_num - start_port(device)]; *lmc = device->cache.lmc_cache[port_num - rdma_start_port(device)];
read_unlock_irqrestore(&device->cache.lock, flags); read_unlock_irqrestore(&device->cache.lock, flags);
return ret; return ret;
...@@ -303,13 +292,13 @@ static void ib_cache_update(struct ib_device *device, ...@@ -303,13 +292,13 @@ static void ib_cache_update(struct ib_device *device,
write_lock_irq(&device->cache.lock); write_lock_irq(&device->cache.lock);
old_pkey_cache = device->cache.pkey_cache[port - start_port(device)]; old_pkey_cache = device->cache.pkey_cache[port - rdma_start_port(device)];
old_gid_cache = device->cache.gid_cache [port - start_port(device)]; old_gid_cache = device->cache.gid_cache [port - rdma_start_port(device)];
device->cache.pkey_cache[port - start_port(device)] = pkey_cache; device->cache.pkey_cache[port - rdma_start_port(device)] = pkey_cache;
device->cache.gid_cache [port - start_port(device)] = gid_cache; device->cache.gid_cache [port - rdma_start_port(device)] = gid_cache;
device->cache.lmc_cache[port - start_port(device)] = tprops->lmc; device->cache.lmc_cache[port - rdma_start_port(device)] = tprops->lmc;
write_unlock_irq(&device->cache.lock); write_unlock_irq(&device->cache.lock);
...@@ -363,14 +352,14 @@ static void ib_cache_setup_one(struct ib_device *device) ...@@ -363,14 +352,14 @@ static void ib_cache_setup_one(struct ib_device *device)
device->cache.pkey_cache = device->cache.pkey_cache =
kmalloc(sizeof *device->cache.pkey_cache * kmalloc(sizeof *device->cache.pkey_cache *
(end_port(device) - start_port(device) + 1), GFP_KERNEL); (rdma_end_port(device) - rdma_start_port(device) + 1), GFP_KERNEL);
device->cache.gid_cache = device->cache.gid_cache =
kmalloc(sizeof *device->cache.gid_cache * kmalloc(sizeof *device->cache.gid_cache *
(end_port(device) - start_port(device) + 1), GFP_KERNEL); (rdma_end_port(device) - rdma_start_port(device) + 1), GFP_KERNEL);
device->cache.lmc_cache = kmalloc(sizeof *device->cache.lmc_cache * device->cache.lmc_cache = kmalloc(sizeof *device->cache.lmc_cache *
(end_port(device) - (rdma_end_port(device) -
start_port(device) + 1), rdma_start_port(device) + 1),
GFP_KERNEL); GFP_KERNEL);
if (!device->cache.pkey_cache || !device->cache.gid_cache || if (!device->cache.pkey_cache || !device->cache.gid_cache ||
...@@ -380,10 +369,10 @@ static void ib_cache_setup_one(struct ib_device *device) ...@@ -380,10 +369,10 @@ static void ib_cache_setup_one(struct ib_device *device)
goto err; goto err;
} }
for (p = 0; p <= end_port(device) - start_port(device); ++p) { for (p = 0; p <= rdma_end_port(device) - rdma_start_port(device); ++p) {
device->cache.pkey_cache[p] = NULL; device->cache.pkey_cache[p] = NULL;
device->cache.gid_cache [p] = NULL; device->cache.gid_cache [p] = NULL;
ib_cache_update(device, p + start_port(device)); ib_cache_update(device, p + rdma_start_port(device));
} }
INIT_IB_EVENT_HANDLER(&device->cache.event_handler, INIT_IB_EVENT_HANDLER(&device->cache.event_handler,
...@@ -394,7 +383,7 @@ static void ib_cache_setup_one(struct ib_device *device) ...@@ -394,7 +383,7 @@ static void ib_cache_setup_one(struct ib_device *device)
return; return;
err_cache: err_cache:
for (p = 0; p <= end_port(device) - start_port(device); ++p) { for (p = 0; p <= rdma_end_port(device) - rdma_start_port(device); ++p) {
kfree(device->cache.pkey_cache[p]); kfree(device->cache.pkey_cache[p]);
kfree(device->cache.gid_cache[p]); kfree(device->cache.gid_cache[p]);
} }
...@@ -412,7 +401,7 @@ static void ib_cache_cleanup_one(struct ib_device *device) ...@@ -412,7 +401,7 @@ static void ib_cache_cleanup_one(struct ib_device *device)
ib_unregister_event_handler(&device->cache.event_handler); ib_unregister_event_handler(&device->cache.event_handler);
flush_workqueue(ib_wq); flush_workqueue(ib_wq);
for (p = 0; p <= end_port(device) - start_port(device); ++p) { for (p = 0; p <= rdma_end_port(device) - rdma_start_port(device); ++p) {
kfree(device->cache.pkey_cache[p]); kfree(device->cache.pkey_cache[p]);
kfree(device->cache.gid_cache[p]); kfree(device->cache.gid_cache[p]);
} }
......
drivers/infiniband/core/device.c
View file @ 0cf18d77
...@@ -152,18 +152,6 @@ static int alloc_name(char *name) ...@@ -152,18 +152,6 @@ static int alloc_name(char *name)
return 0; return 0;
} }
static int start_port(struct ib_device *device)
{
return (device->node_type == RDMA_NODE_IB_SWITCH) ? 0 : 1;
}
static int end_port(struct ib_device *device)
{
return (device->node_type == RDMA_NODE_IB_SWITCH) ?
0 : device->phys_port_cnt;
}
/** /**
* ib_alloc_device - allocate an IB device struct * ib_alloc_device - allocate an IB device struct
* @size:size of structure to allocate * @size:size of structure to allocate
...@@ -233,7 +221,7 @@ static int read_port_table_lengths(struct ib_device *device) ...@@ -233,7 +221,7 @@ static int read_port_table_lengths(struct ib_device *device)
if (!tprops) if (!tprops)
goto out; goto out;
num_ports = end_port(device) - start_port(device) + 1; num_ports = rdma_end_port(device) - rdma_start_port(device) + 1;
device->pkey_tbl_len = kmalloc(sizeof *device->pkey_tbl_len * num_ports, device->pkey_tbl_len = kmalloc(sizeof *device->pkey_tbl_len * num_ports,
GFP_KERNEL); GFP_KERNEL);
...@@ -243,7 +231,7 @@ static int read_port_table_lengths(struct ib_device *device) ...@@ -243,7 +231,7 @@ static int read_port_table_lengths(struct ib_device *device)
goto err; goto err;
for (port_index = 0; port_index < num_ports; ++port_index) { for (port_index = 0; port_index < num_ports; ++port_index) {
ret = ib_query_port(device, port_index + start_port(device), ret = ib_query_port(device, port_index + rdma_start_port(device),
tprops); tprops);
if (ret) if (ret)
goto err; goto err;
...@@ -576,7 +564,7 @@ int ib_query_port(struct ib_device *device, ...@@ -576,7 +564,7 @@ int ib_query_port(struct ib_device *device,
u8 port_num, u8 port_num,
struct ib_port_attr *port_attr) struct ib_port_attr *port_attr)
{ {
if (port_num < start_port(device) || port_num > end_port(device)) if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))
return -EINVAL; return -EINVAL;
return device->query_port(device, port_num, port_attr); return device->query_port(device, port_num, port_attr);
...@@ -654,7 +642,7 @@ int ib_modify_port(struct ib_device *device, ...@@ -654,7 +642,7 @@ int ib_modify_port(struct ib_device *device,
if (!device->modify_port) if (!device->modify_port)
return -ENOSYS; return -ENOSYS;
if (port_num < start_port(device) || port_num > end_port(device)) if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))
return -EINVAL; return -EINVAL;
return device->modify_port(device, port_num, port_modify_mask, return device->modify_port(device, port_num, port_modify_mask,
...@@ -677,8 +665,8 @@ int ib_find_gid(struct ib_device *device, union ib_gid *gid, ...@@ -677,8 +665,8 @@ int ib_find_gid(struct ib_device *device, union ib_gid *gid,
union ib_gid tmp_gid; union ib_gid tmp_gid;
int ret, port, i; int ret, port, i;
for (port = start_port(device); port <= end_port(device); ++port) { for (port = rdma_start_port(device); port <= rdma_end_port(device); ++port) {
for (i = 0; i < device->gid_tbl_len[port - start_port(device)]; ++i) { for (i = 0; i < device->gid_tbl_len[port - rdma_start_port(device)]; ++i) {
ret = ib_query_gid(device, port, i, &tmp_gid); ret = ib_query_gid(device, port, i, &tmp_gid);
if (ret) if (ret)
return ret; return ret;
...@@ -710,7 +698,7 @@ int ib_find_pkey(struct ib_device *device, ...@@ -710,7 +698,7 @@ int ib_find_pkey(struct ib_device *device,
u16 tmp_pkey; u16 tmp_pkey;
int partial_ix = -1; int partial_ix = -1;
for (i = 0; i < device->pkey_tbl_len[port_num - start_port(device)]; ++i) { for (i = 0; i < device->pkey_tbl_len[port_num - rdma_start_port(device)]; ++i) {
ret = ib_query_pkey(device, port_num, i, &tmp_pkey); ret = ib_query_pkey(device, port_num, i, &tmp_pkey);
if (ret) if (ret)
return ret; return ret;
......
include/rdma/ib_verbs.h
View file @ 0cf18d77
...@@ -1752,6 +1752,33 @@ int ib_query_port(struct ib_device *device, ...@@ -1752,6 +1752,33 @@ int ib_query_port(struct ib_device *device,
enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device, enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device,
u8 port_num); u8 port_num);
/**
* rdma_start_port - Return the first valid port number for the device
* specified
*
* @device: Device to be checked
*
* Return start port number
*/
static inline u8 rdma_start_port(const struct ib_device *device)
{
return (device->node_type == RDMA_NODE_IB_SWITCH) ? 0 : 1;
}
/**
* rdma_end_port - Return the last valid port number for the device
* specified
*
* @device: Device to be checked
*
* Return last port number
*/
static inline u8 rdma_end_port(const struct ib_device *device)
{
return (device->node_type == RDMA_NODE_IB_SWITCH) ?
0 : device->phys_port_cnt;
}
static inline bool rdma_protocol_ib(struct ib_device *device, u8 port_num) static inline bool rdma_protocol_ib(struct ib_device *device, u8 port_num)
{ {
return device->query_protocol(device, port_num) == RDMA_PROTOCOL_IB; return device->query_protocol(device, port_num) == RDMA_PROTOCOL_IB;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7