Commit 86bee4c9 authored by Or Gerlitz's avatar Or Gerlitz Committed by Doug Ledford
Browse files

IB/core: Avoid calling ib_query_device 



Use the cached copy of the attributes present on the device, except for
the case of a query originating from user-space, where we have to invoke
the driver query_device entry, so they can fill in their udata.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 3e153a93

drivers/infiniband/core/cm.c

+1 −11
Original line number Diff line number Diff line
@@ -3731,16 +3731,6 @@ int ib_cm_init_qp_attr(struct ib_cm_id *cm_id, 
}

EXPORT_SYMBOL(ib_cm_init_qp_attr);



static void cm_get_ack_delay(struct cm_device *cm_dev)

{

	struct ib_device_attr attr;



	if (ib_query_device(cm_dev->ib_device, &attr))

		cm_dev->ack_delay = 0; /* acks will rely on packet life time */

	else

		cm_dev->ack_delay = attr.local_ca_ack_delay;

}



static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,

			       char *buf)

{
@@ -3852,7 +3842,7 @@ static void cm_add_one(struct ib_device *ib_device) 
		return;



	cm_dev->ib_device = ib_device;

	cm_get_ack_delay(cm_dev);

	cm_dev->ack_delay = ib_device->attrs.local_ca_ack_delay;

	cm_dev->going_down = 0;

	cm_dev->device = device_create(&cm_class, &ib_device->dev,

				       MKDEV(0, 0), NULL,

drivers/infiniband/core/cma.c

+0 −8
Original line number Diff line number Diff line
@@ -1894,7 +1894,6 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id, 
	struct rdma_id_private *listen_id, *conn_id;

	struct rdma_cm_event event;

	int ret;

	struct ib_device_attr attr;

	struct sockaddr *laddr = (struct sockaddr *)&iw_event->local_addr;

	struct sockaddr *raddr = (struct sockaddr *)&iw_event->remote_addr;
@@ -1936,13 +1935,6 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id, 
	memcpy(cma_src_addr(conn_id), laddr, rdma_addr_size(laddr));

	memcpy(cma_dst_addr(conn_id), raddr, rdma_addr_size(raddr));



	ret = ib_query_device(conn_id->id.device, &attr);

	if (ret) {

		mutex_unlock(&conn_id->handler_mutex);

		rdma_destroy_id(new_cm_id);

		goto out;

	}



	memset(&event, 0, sizeof event);

	event.event = RDMA_CM_EVENT_CONNECT_REQUEST;

	event.param.conn.private_data = iw_event->private_data;

drivers/infiniband/core/fmr_pool.c

+2 −18
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd, 
{

	struct ib_device   *device;

	struct ib_fmr_pool *pool;

	struct ib_device_attr *attr;

	int i;

	int ret;

	int max_remaps;
@@ -228,25 +227,10 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd, 
		return ERR_PTR(-ENOSYS);

	}



	attr = kmalloc(sizeof *attr, GFP_KERNEL);

	if (!attr) {

		printk(KERN_WARNING PFX "couldn't allocate device attr struct\n");

		return ERR_PTR(-ENOMEM);

	}



	ret = ib_query_device(device, attr);

	if (ret) {

		printk(KERN_WARNING PFX "couldn't query device: %d\n", ret);

		kfree(attr);

		return ERR_PTR(ret);

	}



	if (!attr->max_map_per_fmr)

	if (!device->attrs.max_map_per_fmr)

		max_remaps = IB_FMR_MAX_REMAPS;

	else

		max_remaps = attr->max_map_per_fmr;



	kfree(attr);

		max_remaps = device->attrs.max_map_per_fmr;



	pool = kmalloc(sizeof *pool, GFP_KERNEL);

	if (!pool) {

drivers/infiniband/core/sysfs.c

+4 −10
Original line number Diff line number Diff line
@@ -614,18 +614,12 @@ static ssize_t show_sys_image_guid(struct device *device, 
				   struct device_attribute *dev_attr, char *buf)

{

	struct ib_device *dev = container_of(device, struct ib_device, dev);

	struct ib_device_attr attr;

	ssize_t ret;



	ret = ib_query_device(dev, &attr);

	if (ret)

		return ret;



	return sprintf(buf, "%04x:%04x:%04x:%04x\n",

		       be16_to_cpu(((__be16 *) &attr.sys_image_guid)[0]),

		       be16_to_cpu(((__be16 *) &attr.sys_image_guid)[1]),

		       be16_to_cpu(((__be16 *) &attr.sys_image_guid)[2]),

		       be16_to_cpu(((__be16 *) &attr.sys_image_guid)[3]));

		       be16_to_cpu(((__be16 *) &dev->attrs.sys_image_guid)[0]),

		       be16_to_cpu(((__be16 *) &dev->attrs.sys_image_guid)[1]),

		       be16_to_cpu(((__be16 *) &dev->attrs.sys_image_guid)[2]),

		       be16_to_cpu(((__be16 *) &dev->attrs.sys_image_guid)[3]));

}



static ssize_t show_node_guid(struct device *device,

drivers/infiniband/core/uverbs_cmd.c

+4 −19
Original line number Diff line number Diff line
@@ -291,9 +291,6 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file, 
	struct ib_uverbs_get_context      cmd;

	struct ib_uverbs_get_context_resp resp;

	struct ib_udata                   udata;

#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING

	struct ib_device_attr		  dev_attr;

#endif

	struct ib_ucontext		 *ucontext;

	struct file			 *filp;

	int ret;
@@ -342,10 +339,7 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file, 
	ucontext->odp_mrs_count = 0;

	INIT_LIST_HEAD(&ucontext->no_private_counters);



	ret = ib_query_device(ib_dev, &dev_attr);

	if (ret)

		goto err_free;

	if (!(dev_attr.device_cap_flags & IB_DEVICE_ON_DEMAND_PAGING))

	if (!(ib_dev->attrs.device_cap_flags & IB_DEVICE_ON_DEMAND_PAGING))

		ucontext->invalidate_range = NULL;



#endif
@@ -447,8 +441,6 @@ ssize_t ib_uverbs_query_device(struct ib_uverbs_file *file, 
{

	struct ib_uverbs_query_device      cmd;

	struct ib_uverbs_query_device_resp resp;

	struct ib_device_attr              attr;

	int                                ret;



	if (out_len < sizeof resp)

		return -ENOSPC;
@@ -456,12 +448,8 @@ ssize_t ib_uverbs_query_device(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	ret = ib_query_device(ib_dev, &attr);

	if (ret)

		return ret;



	memset(&resp, 0, sizeof resp);

	copy_query_dev_fields(file, ib_dev, &resp, &attr);

	copy_query_dev_fields(file, ib_dev, &resp, &ib_dev->attrs);



	if (copy_to_user((void __user *) (unsigned long) cmd.response,

			 &resp, sizeof resp))
@@ -986,10 +974,7 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file, 
	}



	if (cmd.access_flags & IB_ACCESS_ON_DEMAND) {

		struct ib_device_attr attr;



		ret = ib_query_device(pd->device, &attr);

		if (ret || !(attr.device_cap_flags &

		if (!(pd->device->attrs.device_cap_flags &

		      IB_DEVICE_ON_DEMAND_PAGING)) {

			pr_debug("ODP support not available\n");

			ret = -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE