Commit 5eb620c8 authored by Yosef Etigin's avatar Yosef Etigin Committed by Roland Dreier
Browse files

IB/core: Add helpers for uncached GID and P_Key searches 



Add ib_find_gid() and ib_find_pkey() functions that use uncached device
queries.  The calls might block but the returns are always up-to-date.
Cache P_Key and GID table lengths in core to avoid extra port info queries.

Signed-off-by: default avatarYosef Etigin <yosefe@voltaire.com>
Acked-by: default avatarMichael S. Tsirkin <mst@dev.mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 8b8c8bca

drivers/infiniband/core/device.c

+125 −0
Original line number Diff line number Diff line
@@ -149,6 +149,18 @@ static int alloc_name(char *name) 
	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

 * @size:size of structure to allocate
@@ -208,6 +220,45 @@ static int add_client_context(struct ib_device *device, struct ib_client *client 
	return 0;

}



static int read_port_table_lengths(struct ib_device *device)

{

	struct ib_port_attr *tprops = NULL;

	int num_ports, ret = -ENOMEM;

	u8 port_index;



	tprops = kmalloc(sizeof *tprops, GFP_KERNEL);

	if (!tprops)

		goto out;



	num_ports = end_port(device) - start_port(device) + 1;



	device->pkey_tbl_len = kmalloc(sizeof *device->pkey_tbl_len * num_ports,

				       GFP_KERNEL);

	device->gid_tbl_len = kmalloc(sizeof *device->gid_tbl_len * num_ports,

				      GFP_KERNEL);

	if (!device->pkey_tbl_len || !device->gid_tbl_len)

		goto err;



	for (port_index = 0; port_index < num_ports; ++port_index) {

		ret = ib_query_port(device, port_index + start_port(device),

					tprops);

		if (ret)

			goto err;

		device->pkey_tbl_len[port_index] = tprops->pkey_tbl_len;

		device->gid_tbl_len[port_index]  = tprops->gid_tbl_len;

	}



	ret = 0;

	goto out;



err:

	kfree(device->gid_tbl_len);

	kfree(device->pkey_tbl_len);

out:

	kfree(tprops);

	return ret;

}



/**

 * ib_register_device - Register an IB device with IB core

 * @device:Device to register
@@ -239,10 +290,19 @@ int ib_register_device(struct ib_device *device) 
	spin_lock_init(&device->event_handler_lock);

	spin_lock_init(&device->client_data_lock);



	ret = read_port_table_lengths(device);

	if (ret) {

		printk(KERN_WARNING "Couldn't create table lengths cache for device %s\n",

		       device->name);

		goto out;

	}



	ret = ib_device_register_sysfs(device);

	if (ret) {

		printk(KERN_WARNING "Couldn't register device %s with driver model\n",

		       device->name);

		kfree(device->gid_tbl_len);

		kfree(device->pkey_tbl_len);

		goto out;

	}
@@ -284,6 +344,9 @@ void ib_unregister_device(struct ib_device *device) 


	list_del(&device->core_list);



	kfree(device->gid_tbl_len);

	kfree(device->pkey_tbl_len);



	mutex_unlock(&device_mutex);



	spin_lock_irqsave(&device->client_data_lock, flags);
@@ -592,6 +655,68 @@ int ib_modify_port(struct ib_device *device, 
}

EXPORT_SYMBOL(ib_modify_port);



/**

 * ib_find_gid - Returns the port number and GID table index where

 *   a specified GID value occurs.

 * @device: The device to query.

 * @gid: The GID value to search for.

 * @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

 *   parameter may be NULL.

 */

int ib_find_gid(struct ib_device *device, union ib_gid *gid,

		u8 *port_num, u16 *index)

{

	union ib_gid tmp_gid;

	int ret, port, i;



	for (port = start_port(device); port <= end_port(device); ++port) {

		for (i = 0; i < device->gid_tbl_len[port - start_port(device)]; ++i) {

			ret = ib_query_gid(device, port, i, &tmp_gid);

			if (ret)

				return ret;

			if (!memcmp(&tmp_gid, gid, sizeof *gid)) {

				*port_num = port;

				if (index)

					*index = i;

				return 0;

			}

		}

	}



	return -ENOENT;

}

EXPORT_SYMBOL(ib_find_gid);



/**

 * ib_find_pkey - Returns the PKey table index where a specified

 *   PKey value occurs.

 * @device: The device to query.

 * @port_num: The port number of the device to search for the PKey.

 * @pkey: The PKey value to search for.

 * @index: The index into the PKey table where the PKey was found.

 */

int ib_find_pkey(struct ib_device *device,

		 u8 port_num, u16 pkey, u16 *index)

{

	int ret, i;

	u16 tmp_pkey;



	for (i = 0; i < device->pkey_tbl_len[port_num - start_port(device)]; ++i) {

		ret = ib_query_pkey(device, port_num, i, &tmp_pkey);

		if (ret)

			return ret;



		if (pkey == tmp_pkey) {

			*index = i;

			return 0;

		}

	}



	return -ENOENT;

}

EXPORT_SYMBOL(ib_find_pkey);



static int __init ib_core_init(void)

{

	int ret;

include/rdma/ib_verbs.h

+8 −0
Original line number Diff line number Diff line
@@ -890,6 +890,8 @@ struct ib_device { 
	spinlock_t                    client_data_lock;



	struct ib_cache               cache;

	int                          *pkey_tbl_len;

	int                          *gid_tbl_len;



	u32                           flags;
@@ -1118,6 +1120,12 @@ int ib_modify_port(struct ib_device *device, 
		   u8 port_num, int port_modify_mask,

		   struct ib_port_modify *port_modify);



int ib_find_gid(struct ib_device *device, union ib_gid *gid,

		u8 *port_num, u16 *index);



int ib_find_pkey(struct ib_device *device,

		 u8 port_num, u16 pkey, u16 *index);



/**

 * ib_alloc_pd - Allocates an unused protection domain.

 * @device: The device on which to allocate the protection domain.

CRA Git | Maintained and supported by SUSTech CRA and CCSE