Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 057aec0d authored by Yishai Hadas's avatar Yishai Hadas Committed by Doug Ledford
Browse files

IB/uverbs: Explicitly pass ib_dev to uverbs commands 



Done in preparation for deploying RCU for the device removal
flow. Allows isolating the RCU handling to the uverb_main layer and
keeping the uverbs_cmd code as is.

Signed-off-by: default avatarYishai Hadas <yishaih@mellanox.com>
Signed-off-by: default avatarShachar Raindel <raindel@mellanox.com>
Reviewed-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 35d4a0b6

drivers/infiniband/core/uverbs.h

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ extern struct idr ib_uverbs_rule_idr; 
void idr_remove_uobj(struct idr *idp, struct ib_uobject *uobj);



struct file *ib_uverbs_alloc_event_file(struct ib_uverbs_file *uverbs_file,

					struct ib_device *ib_dev,

					int is_async);

void ib_uverbs_free_async_event_file(struct ib_uverbs_file *uverbs_file);

struct ib_uverbs_event_file *ib_uverbs_lookup_comp_file(int fd);
@@ -214,6 +215,7 @@ struct ib_uverbs_flow_spec { 


#define IB_UVERBS_DECLARE_CMD(name)					\

	ssize_t ib_uverbs_##name(struct ib_uverbs_file *file,		\

				 struct ib_device *ib_dev,              \

				 const char __user *buf, int in_len,	\

				 int out_len)
@@ -255,6 +257,7 @@ IB_UVERBS_DECLARE_CMD(close_xrcd); 


#define IB_UVERBS_DECLARE_EX_CMD(name)				\

	int ib_uverbs_ex_##name(struct ib_uverbs_file *file,	\

				struct ib_device *ib_dev,		\

				struct ib_udata *ucore,		\

				struct ib_udata *uhw)

drivers/infiniband/core/uverbs_cmd.c

+70 −33
Original line number Diff line number Diff line
@@ -282,13 +282,13 @@ static void put_xrcd_read(struct ib_uobject *uobj) 
}



ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file,

			      struct ib_device *ib_dev,

			      const char __user *buf,

			      int in_len, int out_len)

{

	struct ib_uverbs_get_context      cmd;

	struct ib_uverbs_get_context_resp resp;

	struct ib_udata                   udata;

	struct ib_device                 *ibdev = file->device->ib_dev;

#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING

	struct ib_device_attr		  dev_attr;

#endif
@@ -313,13 +313,13 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file, 
		   (unsigned long) cmd.response + sizeof resp,

		   in_len - sizeof cmd, out_len - sizeof resp);



	ucontext = ibdev->alloc_ucontext(ibdev, &udata);

	ucontext = ib_dev->alloc_ucontext(ib_dev, &udata);

	if (IS_ERR(ucontext)) {

		ret = PTR_ERR(ucontext);

		goto err;

	}



	ucontext->device = ibdev;

	ucontext->device = ib_dev;

	INIT_LIST_HEAD(&ucontext->pd_list);

	INIT_LIST_HEAD(&ucontext->mr_list);

	INIT_LIST_HEAD(&ucontext->mw_list);
@@ -340,7 +340,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(ibdev, &dev_attr);

	ret = ib_query_device(ib_dev, &dev_attr);

	if (ret)

		goto err_free;

	if (!(dev_attr.device_cap_flags & IB_DEVICE_ON_DEMAND_PAGING))
@@ -355,7 +355,7 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file, 
		goto err_free;

	resp.async_fd = ret;



	filp = ib_uverbs_alloc_event_file(file, 1);

	filp = ib_uverbs_alloc_event_file(file, ib_dev, 1);

	if (IS_ERR(filp)) {

		ret = PTR_ERR(filp);

		goto err_fd;
@@ -384,7 +384,7 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file, 


err_free:

	put_pid(ucontext->tgid);

	ibdev->dealloc_ucontext(ucontext);

	ib_dev->dealloc_ucontext(ucontext);



err:

	mutex_unlock(&file->mutex);
@@ -392,11 +392,12 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file, 
}



static void copy_query_dev_fields(struct ib_uverbs_file *file,

				  struct ib_device *ib_dev,

				  struct ib_uverbs_query_device_resp *resp,

				  struct ib_device_attr *attr)

{

	resp->fw_ver		= attr->fw_ver;

	resp->node_guid		= file->device->ib_dev->node_guid;

	resp->node_guid		= ib_dev->node_guid;

	resp->sys_image_guid	= attr->sys_image_guid;

	resp->max_mr_size	= attr->max_mr_size;

	resp->page_size_cap	= attr->page_size_cap;
@@ -434,10 +435,11 @@ static void copy_query_dev_fields(struct ib_uverbs_file *file, 
	resp->max_srq_sge		= attr->max_srq_sge;

	resp->max_pkeys			= attr->max_pkeys;

	resp->local_ca_ack_delay	= attr->local_ca_ack_delay;

	resp->phys_port_cnt		= file->device->ib_dev->phys_port_cnt;

	resp->phys_port_cnt		= ib_dev->phys_port_cnt;

}



ssize_t ib_uverbs_query_device(struct ib_uverbs_file *file,

			       struct ib_device *ib_dev,

			       const char __user *buf,

			       int in_len, int out_len)

{
@@ -452,12 +454,12 @@ 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(file->device->ib_dev, &attr);

	ret = ib_query_device(ib_dev, &attr);

	if (ret)

		return ret;



	memset(&resp, 0, sizeof resp);

	copy_query_dev_fields(file, &resp, &attr);

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



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

			 &resp, sizeof resp))
@@ -467,6 +469,7 @@ ssize_t ib_uverbs_query_device(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_query_port(struct ib_uverbs_file *file,

			     struct ib_device *ib_dev,

			     const char __user *buf,

			     int in_len, int out_len)

{
@@ -481,7 +484,7 @@ ssize_t ib_uverbs_query_port(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	ret = ib_query_port(file->device->ib_dev, cmd.port_num, &attr);

	ret = ib_query_port(ib_dev, cmd.port_num, &attr);

	if (ret)

		return ret;
@@ -506,7 +509,7 @@ ssize_t ib_uverbs_query_port(struct ib_uverbs_file *file, 
	resp.active_width    = attr.active_width;

	resp.active_speed    = attr.active_speed;

	resp.phys_state      = attr.phys_state;

	resp.link_layer      = rdma_port_get_link_layer(file->device->ib_dev,

	resp.link_layer      = rdma_port_get_link_layer(ib_dev,

							cmd.port_num);



	if (copy_to_user((void __user *) (unsigned long) cmd.response,
@@ -517,6 +520,7 @@ ssize_t ib_uverbs_query_port(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file,

			   struct ib_device *ib_dev,

			   const char __user *buf,

			   int in_len, int out_len)

{
@@ -544,14 +548,13 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file, 
	init_uobj(uobj, 0, file->ucontext, &pd_lock_class);

	down_write(&uobj->mutex);



	pd = file->device->ib_dev->alloc_pd(file->device->ib_dev,

					    file->ucontext, &udata);

	pd = ib_dev->alloc_pd(ib_dev, file->ucontext, &udata);

	if (IS_ERR(pd)) {

		ret = PTR_ERR(pd);

		goto err;

	}



	pd->device  = file->device->ib_dev;

	pd->device  = ib_dev;

	pd->uobject = uobj;

	pd->local_mr = NULL;

	atomic_set(&pd->usecnt, 0);
@@ -592,6 +595,7 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_dealloc_pd(struct ib_uverbs_file *file,

			     struct ib_device *ib_dev,

			     const char __user *buf,

			     int in_len, int out_len)

{
@@ -722,6 +726,7 @@ static void xrcd_table_delete(struct ib_uverbs_device *dev, 
}



ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file,

			    struct ib_device *ib_dev,

			    const char __user *buf, int in_len,

			    int out_len)

{
@@ -780,15 +785,14 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file, 
	down_write(&obj->uobject.mutex);



	if (!xrcd) {

		xrcd = file->device->ib_dev->alloc_xrcd(file->device->ib_dev,

							file->ucontext, &udata);

		xrcd = ib_dev->alloc_xrcd(ib_dev, file->ucontext, &udata);

		if (IS_ERR(xrcd)) {

			ret = PTR_ERR(xrcd);

			goto err;

		}



		xrcd->inode   = inode;

		xrcd->device  = file->device->ib_dev;

		xrcd->device  = ib_dev;

		atomic_set(&xrcd->usecnt, 0);

		mutex_init(&xrcd->tgt_qp_mutex);

		INIT_LIST_HEAD(&xrcd->tgt_qp_list);
@@ -859,6 +863,7 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_close_xrcd(struct ib_uverbs_file *file,

			     struct ib_device *ib_dev,

			     const char __user *buf, int in_len,

			     int out_len)

{
@@ -936,6 +941,7 @@ void ib_uverbs_dealloc_xrcd(struct ib_uverbs_device *dev, 
}



ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,

			 struct ib_device *ib_dev,

			 const char __user *buf, int in_len,

			 int out_len)

{
@@ -1045,6 +1051,7 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_rereg_mr(struct ib_uverbs_file *file,

			   struct ib_device *ib_dev,

			   const char __user *buf, int in_len,

			   int out_len)

{
@@ -1138,6 +1145,7 @@ ssize_t ib_uverbs_rereg_mr(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_dereg_mr(struct ib_uverbs_file *file,

			   struct ib_device *ib_dev,

			   const char __user *buf, int in_len,

			   int out_len)

{
@@ -1176,6 +1184,7 @@ ssize_t ib_uverbs_dereg_mr(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_alloc_mw(struct ib_uverbs_file *file,

			   struct ib_device *ib_dev,

			   const char __user *buf, int in_len,

			   int out_len)

{
@@ -1258,6 +1267,7 @@ ssize_t ib_uverbs_alloc_mw(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_dealloc_mw(struct ib_uverbs_file *file,

			     struct ib_device *ib_dev,

			     const char __user *buf, int in_len,

			     int out_len)

{
@@ -1296,6 +1306,7 @@ ssize_t ib_uverbs_dealloc_mw(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_create_comp_channel(struct ib_uverbs_file *file,

				      struct ib_device *ib_dev,

				      const char __user *buf, int in_len,

				      int out_len)

{
@@ -1315,7 +1326,7 @@ ssize_t ib_uverbs_create_comp_channel(struct ib_uverbs_file *file, 
		return ret;

	resp.fd = ret;



	filp = ib_uverbs_alloc_event_file(file, 0);

	filp = ib_uverbs_alloc_event_file(file, ib_dev, 0);

	if (IS_ERR(filp)) {

		put_unused_fd(resp.fd);

		return PTR_ERR(filp);
@@ -1333,6 +1344,7 @@ ssize_t ib_uverbs_create_comp_channel(struct ib_uverbs_file *file, 
}



static struct ib_ucq_object *create_cq(struct ib_uverbs_file *file,

					struct ib_device *ib_dev,

				       struct ib_udata *ucore,

				       struct ib_udata *uhw,

				       struct ib_uverbs_ex_create_cq *cmd,
@@ -1381,14 +1393,14 @@ static struct ib_ucq_object *create_cq(struct ib_uverbs_file *file, 
	if (cmd_sz > offsetof(typeof(*cmd), flags) + sizeof(cmd->flags))

		attr.flags = cmd->flags;



	cq = file->device->ib_dev->create_cq(file->device->ib_dev, &attr,

	cq = ib_dev->create_cq(ib_dev, &attr,

					     file->ucontext, uhw);

	if (IS_ERR(cq)) {

		ret = PTR_ERR(cq);

		goto err_file;

	}



	cq->device        = file->device->ib_dev;

	cq->device        = ib_dev;

	cq->uobject       = &obj->uobject;

	cq->comp_handler  = ib_uverbs_comp_handler;

	cq->event_handler = ib_uverbs_cq_event_handler;
@@ -1449,6 +1461,7 @@ static int ib_uverbs_create_cq_cb(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file,

			    struct ib_device *ib_dev,

			    const char __user *buf, int in_len,

			    int out_len)

{
@@ -1477,7 +1490,7 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file, 
	cmd_ex.comp_vector = cmd.comp_vector;

	cmd_ex.comp_channel = cmd.comp_channel;



	obj = create_cq(file, &ucore, &uhw, &cmd_ex,

	obj = create_cq(file, ib_dev, &ucore, &uhw, &cmd_ex,

			offsetof(typeof(cmd_ex), comp_channel) +

			sizeof(cmd.comp_channel), ib_uverbs_create_cq_cb,

			NULL);
@@ -1500,6 +1513,7 @@ static int ib_uverbs_ex_create_cq_cb(struct ib_uverbs_file *file, 
}



int ib_uverbs_ex_create_cq(struct ib_uverbs_file *file,

			 struct ib_device *ib_dev,

			   struct ib_udata *ucore,

			   struct ib_udata *uhw)

{
@@ -1525,7 +1539,7 @@ int ib_uverbs_ex_create_cq(struct ib_uverbs_file *file, 
			     sizeof(resp.response_length)))

		return -ENOSPC;



	obj = create_cq(file, ucore, uhw, &cmd,

	obj = create_cq(file, ib_dev, ucore, uhw, &cmd,

			min(ucore->inlen, sizeof(cmd)),

			ib_uverbs_ex_create_cq_cb, NULL);
@@ -1536,6 +1550,7 @@ int ib_uverbs_ex_create_cq(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_resize_cq(struct ib_uverbs_file *file,

			    struct ib_device *ib_dev,

			    const char __user *buf, int in_len,

			    int out_len)

{
@@ -1599,6 +1614,7 @@ static int copy_wc_to_user(void __user *dest, struct ib_wc *wc) 
}



ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file,

			  struct ib_device *ib_dev,

			  const char __user *buf, int in_len,

			  int out_len)

{
@@ -1650,6 +1666,7 @@ ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_req_notify_cq(struct ib_uverbs_file *file,

				struct ib_device *ib_dev,

				const char __user *buf, int in_len,

				int out_len)

{
@@ -1672,6 +1689,7 @@ ssize_t ib_uverbs_req_notify_cq(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file,

			     struct ib_device *ib_dev,

			     const char __user *buf, int in_len,

			     int out_len)

{
@@ -1724,6 +1742,7 @@ ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,

			    struct ib_device *ib_dev,

			    const char __user *buf, int in_len,

			    int out_len)

{
@@ -1919,6 +1938,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_open_qp(struct ib_uverbs_file *file,

			  struct ib_device *ib_dev,

			  const char __user *buf, int in_len, int out_len)

{

	struct ib_uverbs_open_qp        cmd;
@@ -2013,6 +2033,7 @@ ssize_t ib_uverbs_open_qp(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_query_qp(struct ib_uverbs_file *file,

			   struct ib_device *ib_dev,

			   const char __user *buf, int in_len,

			   int out_len)

{
@@ -2127,6 +2148,7 @@ static int modify_qp_mask(enum ib_qp_type qp_type, int mask) 
}



ssize_t ib_uverbs_modify_qp(struct ib_uverbs_file *file,

			    struct ib_device *ib_dev,

			    const char __user *buf, int in_len,

			    int out_len)

{
@@ -2223,6 +2245,7 @@ ssize_t ib_uverbs_modify_qp(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file,

			     struct ib_device *ib_dev,

			     const char __user *buf, int in_len,

			     int out_len)

{
@@ -2281,6 +2304,7 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,

			    struct ib_device *ib_dev,

			    const char __user *buf, int in_len,

			    int out_len)

{
@@ -2525,6 +2549,7 @@ static struct ib_recv_wr *ib_uverbs_unmarshall_recv(const char __user *buf, 
}



ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file,

			    struct ib_device *ib_dev,

			    const char __user *buf, int in_len,

			    int out_len)

{
@@ -2574,6 +2599,7 @@ ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_post_srq_recv(struct ib_uverbs_file *file,

				struct ib_device *ib_dev,

				const char __user *buf, int in_len,

				int out_len)

{
@@ -2623,6 +2649,7 @@ ssize_t ib_uverbs_post_srq_recv(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file,

			    struct ib_device *ib_dev,

			    const char __user *buf, int in_len,

			    int out_len)

{
@@ -2715,6 +2742,7 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_destroy_ah(struct ib_uverbs_file *file,

			     struct ib_device *ib_dev,

			     const char __user *buf, int in_len, int out_len)

{

	struct ib_uverbs_destroy_ah cmd;
@@ -2751,6 +2779,7 @@ ssize_t ib_uverbs_destroy_ah(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file,

			       struct ib_device *ib_dev,

			       const char __user *buf, int in_len,

			       int out_len)

{
@@ -2798,6 +2827,7 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file,

			       struct ib_device *ib_dev,

			       const char __user *buf, int in_len,

			       int out_len)

{
@@ -2878,6 +2908,7 @@ static int kern_spec_to_ib_spec(struct ib_uverbs_flow_spec *kern_spec, 
}



int ib_uverbs_ex_create_flow(struct ib_uverbs_file *file,

			     struct ib_device *ib_dev,

			     struct ib_udata *ucore,

			     struct ib_udata *uhw)

{
@@ -3038,6 +3069,7 @@ int ib_uverbs_ex_create_flow(struct ib_uverbs_file *file, 
}



int ib_uverbs_ex_destroy_flow(struct ib_uverbs_file *file,

			      struct ib_device *ib_dev,

			      struct ib_udata *ucore,

			      struct ib_udata *uhw)

{
@@ -3080,6 +3112,7 @@ int ib_uverbs_ex_destroy_flow(struct ib_uverbs_file *file, 
}



static int __uverbs_create_xsrq(struct ib_uverbs_file *file,

				struct ib_device *ib_dev,

				struct ib_uverbs_create_xsrq *cmd,

				struct ib_udata *udata)

{
@@ -3213,6 +3246,7 @@ static int __uverbs_create_xsrq(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file,

			     struct ib_device *ib_dev,

			     const char __user *buf, int in_len,

			     int out_len)

{
@@ -3240,7 +3274,7 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file, 
		   (unsigned long) cmd.response + sizeof resp,

		   in_len - sizeof cmd, out_len - sizeof resp);



	ret = __uverbs_create_xsrq(file, &xcmd, &udata);

	ret = __uverbs_create_xsrq(file, ib_dev, &xcmd, &udata);

	if (ret)

		return ret;
@@ -3248,6 +3282,7 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_create_xsrq(struct ib_uverbs_file *file,

			      struct ib_device *ib_dev,

			      const char __user *buf, int in_len, int out_len)

{

	struct ib_uverbs_create_xsrq     cmd;
@@ -3265,7 +3300,7 @@ ssize_t ib_uverbs_create_xsrq(struct ib_uverbs_file *file, 
		   (unsigned long) cmd.response + sizeof resp,

		   in_len - sizeof cmd, out_len - sizeof resp);



	ret = __uverbs_create_xsrq(file, &cmd, &udata);

	ret = __uverbs_create_xsrq(file, ib_dev, &cmd, &udata);

	if (ret)

		return ret;
@@ -3273,6 +3308,7 @@ ssize_t ib_uverbs_create_xsrq(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_modify_srq(struct ib_uverbs_file *file,

			     struct ib_device *ib_dev,

			     const char __user *buf, int in_len,

			     int out_len)

{
@@ -3303,6 +3339,7 @@ ssize_t ib_uverbs_modify_srq(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_query_srq(struct ib_uverbs_file *file,

			    struct ib_device *ib_dev,

			    const char __user *buf,

			    int in_len, int out_len)

{
@@ -3343,6 +3380,7 @@ ssize_t ib_uverbs_query_srq(struct ib_uverbs_file *file, 
}



ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file,

			      struct ib_device *ib_dev,

			      const char __user *buf, int in_len,

			      int out_len)

{
@@ -3400,16 +3438,15 @@ ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file, 
}



int ib_uverbs_ex_query_device(struct ib_uverbs_file *file,

			      struct ib_device *ib_dev,

			      struct ib_udata *ucore,

			      struct ib_udata *uhw)

{

	struct ib_uverbs_ex_query_device_resp resp;

	struct ib_uverbs_ex_query_device  cmd;

	struct ib_device_attr attr;

	struct ib_device *device;

	int err;



	device = file->device->ib_dev;

	if (ucore->inlen < sizeof(cmd))

		return -EINVAL;
@@ -3430,11 +3467,11 @@ int ib_uverbs_ex_query_device(struct ib_uverbs_file *file, 


	memset(&attr, 0, sizeof(attr));



	err = device->query_device(device, &attr, uhw);

	err = ib_dev->query_device(ib_dev, &attr, uhw);

	if (err)

		return err;



	copy_query_dev_fields(file, &resp.base, &attr);

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

	resp.comp_mask = 0;



	if (ucore->outlen < resp.response_length + sizeof(resp.odp_caps))

drivers/infiniband/core/uverbs_main.c

+15 −6
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ static DEFINE_SPINLOCK(map_lock); 
static DECLARE_BITMAP(dev_map, IB_UVERBS_MAX_DEVICES);



static ssize_t (*uverbs_cmd_table[])(struct ib_uverbs_file *file,

				     struct ib_device *ib_dev,

				     const char __user *buf, int in_len,

				     int out_len) = {

	[IB_USER_VERBS_CMD_GET_CONTEXT]		= ib_uverbs_get_context,
@@ -119,6 +120,7 @@ static ssize_t (*uverbs_cmd_table[])(struct ib_uverbs_file *file, 
};



static int (*uverbs_ex_cmd_table[])(struct ib_uverbs_file *file,

				    struct ib_device *ib_dev,

				    struct ib_udata *ucore,

				    struct ib_udata *uhw) = {

	[IB_USER_VERBS_EX_CMD_CREATE_FLOW]	= ib_uverbs_ex_create_flow,
@@ -557,6 +559,7 @@ void ib_uverbs_free_async_event_file(struct ib_uverbs_file *file) 
}



struct file *ib_uverbs_alloc_event_file(struct ib_uverbs_file *uverbs_file,

					struct ib_device	*ib_dev,

					int is_async)

{

	struct ib_uverbs_event_file *ev_file;
@@ -586,7 +589,7 @@ struct file *ib_uverbs_alloc_event_file(struct ib_uverbs_file *uverbs_file, 
		uverbs_file->async_file = ev_file;

		kref_get(&uverbs_file->async_file->ref);

		INIT_IB_EVENT_HANDLER(&uverbs_file->event_handler,

				      uverbs_file->device->ib_dev,

				      ib_dev,

				      ib_uverbs_event_handler);

		ret = ib_register_event_handler(&uverbs_file->event_handler);

		if (ret)
@@ -643,9 +646,13 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
			     size_t count, loff_t *pos)

{

	struct ib_uverbs_file *file = filp->private_data;

	struct ib_device *ib_dev = file->device->ib_dev;

	struct ib_uverbs_cmd_hdr hdr;

	__u32 flags;



	if (!ib_dev)

		return -ENODEV;



	if (count < sizeof hdr)

		return -EINVAL;
@@ -672,13 +679,13 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
		    command != IB_USER_VERBS_CMD_GET_CONTEXT)

			return -EINVAL;



		if (!(file->device->ib_dev->uverbs_cmd_mask & (1ull << command)))

		if (!(ib_dev->uverbs_cmd_mask & (1ull << command)))

			return -ENOSYS;



		if (hdr.in_words * 4 != count)

			return -EINVAL;



		return uverbs_cmd_table[command](file,

		return uverbs_cmd_table[command](file, ib_dev,

						 buf + sizeof(hdr),

						 hdr.in_words * 4,

						 hdr.out_words * 4);
@@ -705,7 +712,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
		if (!file->ucontext)

			return -EINVAL;



		if (!(file->device->ib_dev->uverbs_ex_cmd_mask & (1ull << command)))

		if (!(ib_dev->uverbs_ex_cmd_mask & (1ull << command)))

			return -ENOSYS;



		if (count < (sizeof(hdr) + sizeof(ex_hdr)))
@@ -746,6 +753,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
				       ex_hdr.provider_out_words * 8);



		err = uverbs_ex_cmd_table[command](file,

						   ib_dev,

						   &ucore,

						   &uhw);
@@ -761,11 +769,12 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
static int ib_uverbs_mmap(struct file *filp, struct vm_area_struct *vma)

{

	struct ib_uverbs_file *file = filp->private_data;

	struct ib_device *ib_dev = file->device->ib_dev;



	if (!file->ucontext)

	if (!ib_dev || !file->ucontext)

		return -ENODEV;

	else

		return file->device->ib_dev->mmap(file->ucontext, vma);

		return ib_dev->mmap(file->ucontext, vma);

}



/*