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

Commit 1f7ff9d5 authored by Matan Barak's avatar Matan Barak Committed by Jason Gunthorpe
Browse files

IB/uverbs: Move to new headers and make naming consistent 



Use macros to make names consistent in ioctl() uAPI:
The ioctl() uAPI works with object-method hierarchy. The method part
also states which handler should be executed when this method is called
from user-space. Therefore, we need to tie method, method's id, method's
handler and the object owning this method together.
Previously, this was done through explicit developer chosen names.
This makes grepping the code harder. Changing the method's name,
method's handler and object's name to be automatically generated based
on the ids.

The headers are split in a way so they be included and used by
user-space. One header strictly contains structures that are used
directly by user-space applications, where another header is used for
internal library (i.e. libibverbs) to form the ioctl() commands.
Other header simply contains the required general command structure.

Reviewed-by: default avatarYishai Hadas <yishaih@mellanox.com>
Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent b470c154

drivers/infiniband/core/uverbs.h

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ 
#include <rdma/ib_umem.h>

#include <rdma/ib_user_verbs.h>



#define UVERBS_MODULE_NAME ib_uverbs

#include <rdma/uverbs_named_ioctl.h>



static inline void

ib_uverbs_init_udata(struct ib_udata *udata,

		     const void __user *ibuf,

drivers/infiniband/core/uverbs_cmd.c

+59 −59
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
static struct ib_uverbs_completion_event_file *

ib_uverbs_lookup_comp_file(int fd, struct ib_ucontext *context)

{

	struct ib_uobject *uobj = uobj_get_read(uobj_get_type(comp_channel),

	struct ib_uobject *uobj = uobj_get_read(UVERBS_OBJECT_COMP_CHANNEL,

						fd, context);

	struct ib_uobject_file *uobj_file;
@@ -322,7 +322,7 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file, 
                   in_len - sizeof(cmd) - sizeof(struct ib_uverbs_cmd_hdr),

                   out_len - sizeof(resp));



	uobj  = uobj_alloc(uobj_get_type(pd), file->ucontext);

	uobj  = uobj_alloc(UVERBS_OBJECT_PD, file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -372,7 +372,7 @@ ssize_t ib_uverbs_dealloc_pd(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	uobj  = uobj_get_write(uobj_get_type(pd), cmd.pd_handle,

	uobj  = uobj_get_write(UVERBS_OBJECT_PD, cmd.pd_handle,

			       file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -517,7 +517,7 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file, 
		}

	}



	obj  = (struct ib_uxrcd_object *)uobj_alloc(uobj_get_type(xrcd),

	obj  = (struct ib_uxrcd_object *)uobj_alloc(UVERBS_OBJECT_XRCD,

						    file->ucontext);

	if (IS_ERR(obj)) {

		ret = PTR_ERR(obj);
@@ -602,7 +602,7 @@ ssize_t ib_uverbs_close_xrcd(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	uobj  = uobj_get_write(uobj_get_type(xrcd), cmd.xrcd_handle,

	uobj  = uobj_get_write(UVERBS_OBJECT_XRCD, cmd.xrcd_handle,

			       file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -663,11 +663,11 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file, 
	if (ret)

		return ret;



	uobj  = uobj_alloc(uobj_get_type(mr), file->ucontext);

	uobj  = uobj_alloc(UVERBS_OBJECT_MR, file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);



	pd = uobj_get_obj_read(pd, cmd.pd_handle, file->ucontext);

	pd = uobj_get_obj_read(pd, UVERBS_OBJECT_PD, cmd.pd_handle, file->ucontext);

	if (!pd) {

		ret = -EINVAL;

		goto err_free;
@@ -758,7 +758,7 @@ ssize_t ib_uverbs_rereg_mr(struct ib_uverbs_file *file, 
	     (cmd.start & ~PAGE_MASK) != (cmd.hca_va & ~PAGE_MASK)))

			return -EINVAL;



	uobj  = uobj_get_write(uobj_get_type(mr), cmd.mr_handle,

	uobj  = uobj_get_write(UVERBS_OBJECT_MR, cmd.mr_handle,

			       file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -772,7 +772,7 @@ ssize_t ib_uverbs_rereg_mr(struct ib_uverbs_file *file, 
	}



	if (cmd.flags & IB_MR_REREG_PD) {

		pd = uobj_get_obj_read(pd, cmd.pd_handle, file->ucontext);

		pd = uobj_get_obj_read(pd, UVERBS_OBJECT_PD, cmd.pd_handle, file->ucontext);

		if (!pd) {

			ret = -EINVAL;

			goto put_uobjs;
@@ -824,7 +824,7 @@ ssize_t ib_uverbs_dereg_mr(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	uobj  = uobj_get_write(uobj_get_type(mr), cmd.mr_handle,

	uobj  = uobj_get_write(UVERBS_OBJECT_MR, cmd.mr_handle,

			       file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -853,11 +853,11 @@ ssize_t ib_uverbs_alloc_mw(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof(cmd)))

		return -EFAULT;



	uobj  = uobj_alloc(uobj_get_type(mw), file->ucontext);

	uobj  = uobj_alloc(UVERBS_OBJECT_MW, file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);



	pd = uobj_get_obj_read(pd, cmd.pd_handle, file->ucontext);

	pd = uobj_get_obj_read(pd, UVERBS_OBJECT_PD, cmd.pd_handle, file->ucontext);

	if (!pd) {

		ret = -EINVAL;

		goto err_free;
@@ -916,7 +916,7 @@ ssize_t ib_uverbs_dealloc_mw(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof(cmd)))

		return -EFAULT;



	uobj  = uobj_get_write(uobj_get_type(mw), cmd.mw_handle,

	uobj  = uobj_get_write(UVERBS_OBJECT_MW, cmd.mw_handle,

			       file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -941,7 +941,7 @@ ssize_t ib_uverbs_create_comp_channel(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	uobj = uobj_alloc(uobj_get_type(comp_channel), file->ucontext);

	uobj = uobj_alloc(UVERBS_OBJECT_COMP_CHANNEL, file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -986,7 +986,7 @@ static struct ib_ucq_object *create_cq(struct ib_uverbs_file *file, 
	if (cmd->comp_vector >= file->device->num_comp_vectors)

		return ERR_PTR(-EINVAL);



	obj  = (struct ib_ucq_object *)uobj_alloc(uobj_get_type(cq),

	obj  = (struct ib_ucq_object *)uobj_alloc(UVERBS_OBJECT_CQ,

						  file->ucontext);

	if (IS_ERR(obj))

		return obj;
@@ -1175,7 +1175,7 @@ ssize_t ib_uverbs_resize_cq(struct ib_uverbs_file *file, 
		   in_len - sizeof(cmd) - sizeof(struct ib_uverbs_cmd_hdr),

		   out_len - sizeof(resp));



	cq = uobj_get_obj_read(cq, cmd.cq_handle, file->ucontext);

	cq = uobj_get_obj_read(cq, UVERBS_OBJECT_CQ, cmd.cq_handle, file->ucontext);

	if (!cq)

		return -EINVAL;
@@ -1240,7 +1240,7 @@ ssize_t ib_uverbs_poll_cq(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	cq = uobj_get_obj_read(cq, cmd.cq_handle, file->ucontext);

	cq = uobj_get_obj_read(cq, UVERBS_OBJECT_CQ, cmd.cq_handle, file->ucontext);

	if (!cq)

		return -EINVAL;
@@ -1287,7 +1287,7 @@ ssize_t ib_uverbs_req_notify_cq(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	cq = uobj_get_obj_read(cq, cmd.cq_handle, file->ucontext);

	cq = uobj_get_obj_read(cq, UVERBS_OBJECT_CQ, cmd.cq_handle, file->ucontext);

	if (!cq)

		return -EINVAL;
@@ -1314,7 +1314,7 @@ ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	uobj  = uobj_get_write(uobj_get_type(cq), cmd.cq_handle,

	uobj  = uobj_get_write(UVERBS_OBJECT_CQ, cmd.cq_handle,

			       file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -1373,7 +1373,7 @@ static int create_qp(struct ib_uverbs_file *file, 
	if (cmd->qp_type == IB_QPT_RAW_PACKET && !capable(CAP_NET_RAW))

		return -EPERM;



	obj  = (struct ib_uqp_object *)uobj_alloc(uobj_get_type(qp),

	obj  = (struct ib_uqp_object *)uobj_alloc(UVERBS_OBJECT_QP,

						  file->ucontext);

	if (IS_ERR(obj))

		return PTR_ERR(obj);
@@ -1384,7 +1384,7 @@ static int create_qp(struct ib_uverbs_file *file, 
	if (cmd_sz >= offsetof(typeof(*cmd), rwq_ind_tbl_handle) +

		      sizeof(cmd->rwq_ind_tbl_handle) &&

		      (cmd->comp_mask & IB_UVERBS_CREATE_QP_MASK_IND_TABLE)) {

		ind_tbl = uobj_get_obj_read(rwq_ind_table,

		ind_tbl = uobj_get_obj_read(rwq_ind_table, UVERBS_OBJECT_RWQ_IND_TBL,

					    cmd->rwq_ind_tbl_handle,

					    file->ucontext);

		if (!ind_tbl) {
@@ -1411,7 +1411,7 @@ static int create_qp(struct ib_uverbs_file *file, 
		has_sq = false;



	if (cmd->qp_type == IB_QPT_XRC_TGT) {

		xrcd_uobj = uobj_get_read(uobj_get_type(xrcd), cmd->pd_handle,

		xrcd_uobj = uobj_get_read(UVERBS_OBJECT_XRCD, cmd->pd_handle,

					  file->ucontext);



		if (IS_ERR(xrcd_uobj)) {
@@ -1431,7 +1431,7 @@ static int create_qp(struct ib_uverbs_file *file, 
			cmd->max_recv_sge = 0;

		} else {

			if (cmd->is_srq) {

				srq = uobj_get_obj_read(srq, cmd->srq_handle,

				srq = uobj_get_obj_read(srq, UVERBS_OBJECT_SRQ, cmd->srq_handle,

							file->ucontext);

				if (!srq || srq->srq_type == IB_SRQT_XRC) {

					ret = -EINVAL;
@@ -1441,7 +1441,7 @@ static int create_qp(struct ib_uverbs_file *file, 


			if (!ind_tbl) {

				if (cmd->recv_cq_handle != cmd->send_cq_handle) {

					rcq = uobj_get_obj_read(cq, cmd->recv_cq_handle,

					rcq = uobj_get_obj_read(cq, UVERBS_OBJECT_CQ, cmd->recv_cq_handle,

								file->ucontext);

					if (!rcq) {

						ret = -EINVAL;
@@ -1452,11 +1452,11 @@ static int create_qp(struct ib_uverbs_file *file, 
		}



		if (has_sq)

			scq = uobj_get_obj_read(cq, cmd->send_cq_handle,

			scq = uobj_get_obj_read(cq, UVERBS_OBJECT_CQ, cmd->send_cq_handle,

						file->ucontext);

		if (!ind_tbl)

			rcq = rcq ?: scq;

		pd  = uobj_get_obj_read(pd, cmd->pd_handle, file->ucontext);

		pd  = uobj_get_obj_read(pd, UVERBS_OBJECT_PD, cmd->pd_handle, file->ucontext);

		if (!pd || (!scq && has_sq)) {

			ret = -EINVAL;

			goto err_put;
@@ -1753,12 +1753,12 @@ ssize_t ib_uverbs_open_qp(struct ib_uverbs_file *file, 
		   in_len - sizeof(cmd) - sizeof(struct ib_uverbs_cmd_hdr),

		   out_len - sizeof(resp));



	obj  = (struct ib_uqp_object *)uobj_alloc(uobj_get_type(qp),

	obj  = (struct ib_uqp_object *)uobj_alloc(UVERBS_OBJECT_QP,

						  file->ucontext);

	if (IS_ERR(obj))

		return PTR_ERR(obj);



	xrcd_uobj = uobj_get_read(uobj_get_type(xrcd), cmd.pd_handle,

	xrcd_uobj = uobj_get_read(UVERBS_OBJECT_XRCD, cmd.pd_handle,

				  file->ucontext);

	if (IS_ERR(xrcd_uobj)) {

		ret = -EINVAL;
@@ -1861,7 +1861,7 @@ ssize_t ib_uverbs_query_qp(struct ib_uverbs_file *file, 
		goto out;

	}



	qp = uobj_get_obj_read(qp, cmd.qp_handle, file->ucontext);

	qp = uobj_get_obj_read(qp, UVERBS_OBJECT_QP, cmd.qp_handle, file->ucontext);

	if (!qp) {

		ret = -EINVAL;

		goto out;
@@ -1966,7 +1966,7 @@ static int modify_qp(struct ib_uverbs_file *file, 
	if (!attr)

		return -ENOMEM;



	qp = uobj_get_obj_read(qp, cmd->base.qp_handle, file->ucontext);

	qp = uobj_get_obj_read(qp, UVERBS_OBJECT_QP, cmd->base.qp_handle, file->ucontext);

	if (!qp) {

		ret = -EINVAL;

		goto out;
@@ -2121,7 +2121,7 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file, 


	memset(&resp, 0, sizeof resp);



	uobj  = uobj_get_write(uobj_get_type(qp), cmd.qp_handle,

	uobj  = uobj_get_write(UVERBS_OBJECT_QP, cmd.qp_handle,

			       file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -2187,7 +2187,7 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, 
	if (!user_wr)

		return -ENOMEM;



	qp = uobj_get_obj_read(qp, cmd.qp_handle, file->ucontext);

	qp = uobj_get_obj_read(qp, UVERBS_OBJECT_QP, cmd.qp_handle, file->ucontext);

	if (!qp)

		goto out;
@@ -2223,7 +2223,7 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file, 
				goto out_put;

			}



			ud->ah = uobj_get_obj_read(ah, user_wr->wr.ud.ah,

			ud->ah = uobj_get_obj_read(ah, UVERBS_OBJECT_AH, user_wr->wr.ud.ah,

						   file->ucontext);

			if (!ud->ah) {

				kfree(ud);
@@ -2458,7 +2458,7 @@ ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file, 
	if (IS_ERR(wr))

		return PTR_ERR(wr);



	qp = uobj_get_obj_read(qp, cmd.qp_handle, file->ucontext);

	qp = uobj_get_obj_read(qp, UVERBS_OBJECT_QP, cmd.qp_handle, file->ucontext);

	if (!qp)

		goto out;
@@ -2507,7 +2507,7 @@ ssize_t ib_uverbs_post_srq_recv(struct ib_uverbs_file *file, 
	if (IS_ERR(wr))

		return PTR_ERR(wr);



	srq = uobj_get_obj_read(srq, cmd.srq_handle, file->ucontext);

	srq = uobj_get_obj_read(srq, UVERBS_OBJECT_SRQ, cmd.srq_handle, file->ucontext);

	if (!srq)

		goto out;
@@ -2564,11 +2564,11 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file, 
		   in_len - sizeof(cmd) - sizeof(struct ib_uverbs_cmd_hdr),

		   out_len - sizeof(resp));



	uobj  = uobj_alloc(uobj_get_type(ah), file->ucontext);

	uobj  = uobj_alloc(UVERBS_OBJECT_AH, file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);



	pd = uobj_get_obj_read(pd, cmd.pd_handle, file->ucontext);

	pd = uobj_get_obj_read(pd, UVERBS_OBJECT_PD, cmd.pd_handle, file->ucontext);

	if (!pd) {

		ret = -EINVAL;

		goto err;
@@ -2636,7 +2636,7 @@ ssize_t ib_uverbs_destroy_ah(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	uobj  = uobj_get_write(uobj_get_type(ah), cmd.ah_handle,

	uobj  = uobj_get_write(UVERBS_OBJECT_AH, cmd.ah_handle,

			       file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -2659,7 +2659,7 @@ ssize_t ib_uverbs_attach_mcast(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	qp = uobj_get_obj_read(qp, cmd.qp_handle, file->ucontext);

	qp = uobj_get_obj_read(qp, UVERBS_OBJECT_QP, cmd.qp_handle, file->ucontext);

	if (!qp)

		return -EINVAL;
@@ -2710,7 +2710,7 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	qp = uobj_get_obj_read(qp, cmd.qp_handle, file->ucontext);

	qp = uobj_get_obj_read(qp, UVERBS_OBJECT_QP, cmd.qp_handle, file->ucontext);

	if (!qp)

		return -EINVAL;
@@ -2934,18 +2934,18 @@ int ib_uverbs_ex_create_wq(struct ib_uverbs_file *file, 
	if (cmd.comp_mask)

		return -EOPNOTSUPP;



	obj  = (struct ib_uwq_object *)uobj_alloc(uobj_get_type(wq),

	obj  = (struct ib_uwq_object *)uobj_alloc(UVERBS_OBJECT_WQ,

						  file->ucontext);

	if (IS_ERR(obj))

		return PTR_ERR(obj);



	pd  = uobj_get_obj_read(pd, cmd.pd_handle, file->ucontext);

	pd  = uobj_get_obj_read(pd, UVERBS_OBJECT_PD, cmd.pd_handle, file->ucontext);

	if (!pd) {

		err = -EINVAL;

		goto err_uobj;

	}



	cq = uobj_get_obj_read(cq, cmd.cq_handle, file->ucontext);

	cq = uobj_get_obj_read(cq, UVERBS_OBJECT_CQ, cmd.cq_handle, file->ucontext);

	if (!cq) {

		err = -EINVAL;

		goto err_put_pd;
@@ -3049,7 +3049,7 @@ int ib_uverbs_ex_destroy_wq(struct ib_uverbs_file *file, 
		return -EOPNOTSUPP;



	resp.response_length = required_resp_len;

	uobj  = uobj_get_write(uobj_get_type(wq), cmd.wq_handle,

	uobj  = uobj_get_write(UVERBS_OBJECT_WQ, cmd.wq_handle,

			       file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -3100,7 +3100,7 @@ int ib_uverbs_ex_modify_wq(struct ib_uverbs_file *file, 
	if (cmd.attr_mask > (IB_WQ_STATE | IB_WQ_CUR_STATE | IB_WQ_FLAGS))

		return -EINVAL;



	wq = uobj_get_obj_read(wq, cmd.wq_handle, file->ucontext);

	wq = uobj_get_obj_read(wq, UVERBS_OBJECT_WQ, cmd.wq_handle, file->ucontext);

	if (!wq)

		return -EINVAL;
@@ -3194,7 +3194,7 @@ int ib_uverbs_ex_create_rwq_ind_table(struct ib_uverbs_file *file, 


	for (num_read_wqs = 0; num_read_wqs < num_wq_handles;

			num_read_wqs++) {

		wq = uobj_get_obj_read(wq, wqs_handles[num_read_wqs],

		wq = uobj_get_obj_read(wq, UVERBS_OBJECT_WQ, wqs_handles[num_read_wqs],

				       file->ucontext);

		if (!wq) {

			err = -EINVAL;
@@ -3204,7 +3204,7 @@ int ib_uverbs_ex_create_rwq_ind_table(struct ib_uverbs_file *file, 
		wqs[num_read_wqs] = wq;

	}



	uobj  = uobj_alloc(uobj_get_type(rwq_ind_table), file->ucontext);

	uobj  = uobj_alloc(UVERBS_OBJECT_RWQ_IND_TBL, file->ucontext);

	if (IS_ERR(uobj)) {

		err = PTR_ERR(uobj);

		goto put_wqs;
@@ -3291,7 +3291,7 @@ int ib_uverbs_ex_destroy_rwq_ind_table(struct ib_uverbs_file *file, 
	if (cmd.comp_mask)

		return -EOPNOTSUPP;



	uobj  = uobj_get_write(uobj_get_type(rwq_ind_table), cmd.ind_tbl_handle,

	uobj  = uobj_get_write(UVERBS_OBJECT_RWQ_IND_TBL, cmd.ind_tbl_handle,

			       file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -3370,13 +3370,13 @@ int ib_uverbs_ex_create_flow(struct ib_uverbs_file *file, 
		kern_flow_attr = &cmd.flow_attr;

	}



	uobj  = uobj_alloc(uobj_get_type(flow), file->ucontext);

	uobj  = uobj_alloc(UVERBS_OBJECT_FLOW, file->ucontext);

	if (IS_ERR(uobj)) {

		err = PTR_ERR(uobj);

		goto err_free_attr;

	}



	qp = uobj_get_obj_read(qp, cmd.qp_handle, file->ucontext);

	qp = uobj_get_obj_read(qp, UVERBS_OBJECT_QP, cmd.qp_handle, file->ucontext);

	if (!qp) {

		err = -EINVAL;

		goto err_uobj;
@@ -3472,7 +3472,7 @@ int ib_uverbs_ex_destroy_flow(struct ib_uverbs_file *file, 
	if (cmd.comp_mask)

		return -EINVAL;



	uobj  = uobj_get_write(uobj_get_type(flow), cmd.flow_handle,

	uobj  = uobj_get_write(UVERBS_OBJECT_FLOW, cmd.flow_handle,

			       file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -3494,7 +3494,7 @@ static int __uverbs_create_xsrq(struct ib_uverbs_file *file, 
	struct ib_srq_init_attr          attr;

	int ret;



	obj  = (struct ib_usrq_object *)uobj_alloc(uobj_get_type(srq),

	obj  = (struct ib_usrq_object *)uobj_alloc(UVERBS_OBJECT_SRQ,

						   file->ucontext);

	if (IS_ERR(obj))

		return PTR_ERR(obj);
@@ -3503,7 +3503,7 @@ static int __uverbs_create_xsrq(struct ib_uverbs_file *file, 
		attr.ext.tag_matching.max_num_tags = cmd->max_num_tags;



	if (cmd->srq_type == IB_SRQT_XRC) {

		xrcd_uobj = uobj_get_read(uobj_get_type(xrcd), cmd->xrcd_handle,

		xrcd_uobj = uobj_get_read(UVERBS_OBJECT_XRCD, cmd->xrcd_handle,

					  file->ucontext);

		if (IS_ERR(xrcd_uobj)) {

			ret = -EINVAL;
@@ -3521,7 +3521,7 @@ static int __uverbs_create_xsrq(struct ib_uverbs_file *file, 
	}



	if (ib_srq_has_cq(cmd->srq_type)) {

		attr.ext.cq  = uobj_get_obj_read(cq, cmd->cq_handle,

		attr.ext.cq  = uobj_get_obj_read(cq, UVERBS_OBJECT_CQ, cmd->cq_handle,

						 file->ucontext);

		if (!attr.ext.cq) {

			ret = -EINVAL;
@@ -3529,7 +3529,7 @@ static int __uverbs_create_xsrq(struct ib_uverbs_file *file, 
		}

	}



	pd  = uobj_get_obj_read(pd, cmd->pd_handle, file->ucontext);

	pd  = uobj_get_obj_read(pd, UVERBS_OBJECT_PD, cmd->pd_handle, file->ucontext);

	if (!pd) {

		ret = -EINVAL;

		goto err_put_cq;
@@ -3701,7 +3701,7 @@ ssize_t ib_uverbs_modify_srq(struct ib_uverbs_file *file, 
	ib_uverbs_init_udata(&udata, buf + sizeof cmd, NULL, in_len - sizeof cmd,

		   out_len);



	srq = uobj_get_obj_read(srq, cmd.srq_handle, file->ucontext);

	srq = uobj_get_obj_read(srq, UVERBS_OBJECT_SRQ, cmd.srq_handle, file->ucontext);

	if (!srq)

		return -EINVAL;
@@ -3732,7 +3732,7 @@ ssize_t ib_uverbs_query_srq(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	srq = uobj_get_obj_read(srq, cmd.srq_handle, file->ucontext);

	srq = uobj_get_obj_read(srq, UVERBS_OBJECT_SRQ, cmd.srq_handle, file->ucontext);

	if (!srq)

		return -EINVAL;
@@ -3769,7 +3769,7 @@ ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	uobj  = uobj_get_write(uobj_get_type(srq), cmd.srq_handle,

	uobj  = uobj_get_write(UVERBS_OBJECT_SRQ, cmd.srq_handle,

			       file->ucontext);

	if (IS_ERR(uobj))

		return PTR_ERR(uobj);
@@ -3942,7 +3942,7 @@ int ib_uverbs_ex_modify_cq(struct ib_uverbs_file *file, 
	if (cmd.attr_mask > IB_CQ_MODERATE)

		return -EOPNOTSUPP;



	cq = uobj_get_obj_read(cq, cmd.cq_handle, file->ucontext);

	cq = uobj_get_obj_read(cq, UVERBS_OBJECT_CQ, cmd.cq_handle, file->ucontext);

	if (!cq)

		return -EINVAL;

drivers/infiniband/core/uverbs_std_types.c

+91 −85
Original line number Diff line number Diff line
@@ -216,9 +216,9 @@ static int uverbs_hot_unplug_completion_event_file(struct ib_uobject_file *uobj_ 
 * spec.

 */

static const struct uverbs_attr_def uverbs_uhw_compat_in =

	UVERBS_ATTR_PTR_IN_SZ(UVERBS_UHW_IN, 0, UA_FLAGS(UVERBS_ATTR_SPEC_F_MIN_SZ));

	UVERBS_ATTR_PTR_IN_SZ(UVERBS_ATTR_UHW_IN, 0, UA_FLAGS(UVERBS_ATTR_SPEC_F_MIN_SZ));

static const struct uverbs_attr_def uverbs_uhw_compat_out =

	UVERBS_ATTR_PTR_OUT_SZ(UVERBS_UHW_OUT, 0, UA_FLAGS(UVERBS_ATTR_SPEC_F_MIN_SZ));

	UVERBS_ATTR_PTR_OUT_SZ(UVERBS_ATTR_UHW_OUT, 0, UA_FLAGS(UVERBS_ATTR_SPEC_F_MIN_SZ));



static void create_udata(struct uverbs_attr_bundle *ctx,

			 struct ib_udata *udata)
@@ -229,9 +229,9 @@ static void create_udata(struct uverbs_attr_bundle *ctx, 
	 * Assume attr == 0 is input and attr == 1 is output.

	 */

	const struct uverbs_attr *uhw_in =

		uverbs_attr_get(ctx, UVERBS_UHW_IN);

		uverbs_attr_get(ctx, UVERBS_ATTR_UHW_IN);

	const struct uverbs_attr *uhw_out =

		uverbs_attr_get(ctx, UVERBS_UHW_OUT);

		uverbs_attr_get(ctx, UVERBS_ATTR_UHW_OUT);



	if (!IS_ERR(uhw_in)) {

		udata->inlen = uhw_in->ptr_attr.len;
@@ -253,7 +253,7 @@ static void create_udata(struct uverbs_attr_bundle *ctx, 
	}

}



static int uverbs_create_cq_handler(struct ib_device *ib_dev,

static int UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE)(struct ib_device *ib_dev,

						   struct ib_uverbs_file *file,

						   struct uverbs_attr_bundle *attrs)

{
@@ -271,19 +271,23 @@ static int uverbs_create_cq_handler(struct ib_device *ib_dev, 
	if (!(ib_dev->uverbs_cmd_mask & 1ULL << IB_USER_VERBS_CMD_CREATE_CQ))

		return -EOPNOTSUPP;



	ret = uverbs_copy_from(&attr.comp_vector, attrs, CREATE_CQ_COMP_VECTOR);

	ret = uverbs_copy_from(&attr.comp_vector, attrs,

			       UVERBS_ATTR_CREATE_CQ_COMP_VECTOR);

	if (!ret)

		ret = uverbs_copy_from(&attr.cqe, attrs, CREATE_CQ_CQE);

		ret = uverbs_copy_from(&attr.cqe, attrs,

				       UVERBS_ATTR_CREATE_CQ_CQE);

	if (!ret)

		ret = uverbs_copy_from(&user_handle, attrs, CREATE_CQ_USER_HANDLE);

		ret = uverbs_copy_from(&user_handle, attrs,

				       UVERBS_ATTR_CREATE_CQ_USER_HANDLE);

	if (ret)

		return ret;



	/* Optional param, if it doesn't exist, we get -ENOENT and skip it */

	if (uverbs_copy_from(&attr.flags, attrs, CREATE_CQ_FLAGS) == -EFAULT)

	if (uverbs_copy_from(&attr.flags, attrs,

			     UVERBS_ATTR_CREATE_CQ_FLAGS) == -EFAULT)

		return -EFAULT;



	ev_file_attr = uverbs_attr_get(attrs, CREATE_CQ_COMP_CHANNEL);

	ev_file_attr = uverbs_attr_get(attrs, UVERBS_ATTR_CREATE_CQ_COMP_CHANNEL);

	if (!IS_ERR(ev_file_attr)) {

		ev_file_uobj = ev_file_attr->obj_attr.uobject;
@@ -298,7 +302,8 @@ static int uverbs_create_cq_handler(struct ib_device *ib_dev, 
		goto err_event_file;

	}



	obj = container_of(uverbs_attr_get(attrs, CREATE_CQ_HANDLE)->obj_attr.uobject,

	obj = container_of(uverbs_attr_get(attrs,

					   UVERBS_ATTR_CREATE_CQ_HANDLE)->obj_attr.uobject,

			   typeof(*obj), uobject);

	obj->uverbs_file	   = ucontext->ufile;

	obj->comp_events_reported  = 0;
@@ -326,7 +331,7 @@ static int uverbs_create_cq_handler(struct ib_device *ib_dev, 
	cq->res.type = RDMA_RESTRACK_CQ;

	rdma_restrack_add(&cq->res);



	ret = uverbs_copy_to(attrs, CREATE_CQ_RESP_CQE, &cq->cqe,

	ret = uverbs_copy_to(attrs, UVERBS_ATTR_CREATE_CQ_RESP_CQE, &cq->cqe,

			     sizeof(cq->cqe));

	if (ret)

		goto err_cq;
@@ -341,30 +346,31 @@ static int uverbs_create_cq_handler(struct ib_device *ib_dev, 
	return ret;

};



static DECLARE_UVERBS_METHOD(

	uverbs_method_cq_create, UVERBS_CQ_CREATE, uverbs_create_cq_handler,

	&UVERBS_ATTR_IDR(CREATE_CQ_HANDLE, UVERBS_OBJECT_CQ, UVERBS_ACCESS_NEW,

static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_CQ_CREATE,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_CREATE_CQ_HANDLE, UVERBS_OBJECT_CQ,

			 UVERBS_ACCESS_NEW,

			 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_PTR_IN(CREATE_CQ_CQE, u32,

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_CQE, u32,

			    UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_PTR_IN(CREATE_CQ_USER_HANDLE, u64,

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_USER_HANDLE, u64,

			    UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_FD(CREATE_CQ_COMP_CHANNEL, UVERBS_OBJECT_COMP_CHANNEL,

	&UVERBS_ATTR_FD(UVERBS_ATTR_CREATE_CQ_COMP_CHANNEL,

			UVERBS_OBJECT_COMP_CHANNEL,

			UVERBS_ACCESS_READ),

	&UVERBS_ATTR_PTR_IN(CREATE_CQ_COMP_VECTOR, u32,

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_COMP_VECTOR, u32,

			    UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_PTR_IN(CREATE_CQ_FLAGS, u32),

	&UVERBS_ATTR_PTR_OUT(CREATE_CQ_RESP_CQE, u32,

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_FLAGS, u32),

	&UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_CREATE_CQ_RESP_CQE, u32,

			     UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&uverbs_uhw_compat_in, &uverbs_uhw_compat_out);



static int uverbs_destroy_cq_handler(struct ib_device *ib_dev,

static int UVERBS_HANDLER(UVERBS_METHOD_CQ_DESTROY)(struct ib_device *ib_dev,

						    struct ib_uverbs_file *file,

						    struct uverbs_attr_bundle *attrs)

{

	struct ib_uverbs_destroy_cq_resp resp;

	struct ib_uobject *uobj =

		uverbs_attr_get(attrs, DESTROY_CQ_HANDLE)->obj_attr.uobject;

		uverbs_attr_get(attrs, UVERBS_ATTR_DESTROY_CQ_HANDLE)->obj_attr.uobject;

	struct ib_ucq_object *obj = container_of(uobj, struct ib_ucq_object,

						 uobject);

	int ret;
@@ -379,81 +385,81 @@ static int uverbs_destroy_cq_handler(struct ib_device *ib_dev, 
	resp.comp_events_reported  = obj->comp_events_reported;

	resp.async_events_reported = obj->async_events_reported;



	return uverbs_copy_to(attrs, DESTROY_CQ_RESP, &resp, sizeof(resp));

	return uverbs_copy_to(attrs, UVERBS_ATTR_DESTROY_CQ_RESP, &resp,

			      sizeof(resp));

}



static DECLARE_UVERBS_METHOD(

	uverbs_method_cq_destroy, UVERBS_CQ_DESTROY, uverbs_destroy_cq_handler,

	&UVERBS_ATTR_IDR(DESTROY_CQ_HANDLE, UVERBS_OBJECT_CQ,

static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_CQ_DESTROY,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_DESTROY_CQ_HANDLE, UVERBS_OBJECT_CQ,

			 UVERBS_ACCESS_DESTROY,

			 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_PTR_OUT(DESTROY_CQ_RESP, struct ib_uverbs_destroy_cq_resp,

	&UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_DESTROY_CQ_RESP,

			     struct ib_uverbs_destroy_cq_resp,

			     UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));



DECLARE_UVERBS_OBJECT(uverbs_object_comp_channel,

		      UVERBS_OBJECT_COMP_CHANNEL,

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_COMP_CHANNEL,

			    &UVERBS_TYPE_ALLOC_FD(0,

						  sizeof(struct ib_uverbs_completion_event_file),

						  uverbs_hot_unplug_completion_event_file,

						  &uverbs_event_fops,

						  "[infinibandevent]", O_RDONLY));



DECLARE_UVERBS_OBJECT(uverbs_object_cq, UVERBS_OBJECT_CQ,

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_CQ,

			    &UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_ucq_object), 0,

						      uverbs_free_cq),

		      &uverbs_method_cq_create,

		      &uverbs_method_cq_destroy);

			    &UVERBS_METHOD(UVERBS_METHOD_CQ_CREATE),

			    &UVERBS_METHOD(UVERBS_METHOD_CQ_DESTROY)

			   );



DECLARE_UVERBS_OBJECT(uverbs_object_qp, UVERBS_OBJECT_QP,

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_QP,

			    &UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_uqp_object), 0,

						      uverbs_free_qp));



DECLARE_UVERBS_OBJECT(uverbs_object_mw, UVERBS_OBJECT_MW,

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_MW,

			    &UVERBS_TYPE_ALLOC_IDR(0, uverbs_free_mw));



DECLARE_UVERBS_OBJECT(uverbs_object_mr, UVERBS_OBJECT_MR,

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_MR,

			    /* 1 is used in order to free the MR after all the MWs */

			    &UVERBS_TYPE_ALLOC_IDR(1, uverbs_free_mr));



DECLARE_UVERBS_OBJECT(uverbs_object_srq, UVERBS_OBJECT_SRQ,

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_SRQ,

			    &UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_usrq_object), 0,

						      uverbs_free_srq));



DECLARE_UVERBS_OBJECT(uverbs_object_ah, UVERBS_OBJECT_AH,

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_AH,

			    &UVERBS_TYPE_ALLOC_IDR(0, uverbs_free_ah));



DECLARE_UVERBS_OBJECT(uverbs_object_flow, UVERBS_OBJECT_FLOW,

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_FLOW,

			    &UVERBS_TYPE_ALLOC_IDR(0, uverbs_free_flow));



DECLARE_UVERBS_OBJECT(uverbs_object_wq, UVERBS_OBJECT_WQ,

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_WQ,

			    &UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_uwq_object), 0,

						      uverbs_free_wq));



DECLARE_UVERBS_OBJECT(uverbs_object_rwq_ind_table,

		      UVERBS_OBJECT_RWQ_IND_TBL,

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_RWQ_IND_TBL,

			    &UVERBS_TYPE_ALLOC_IDR(0, uverbs_free_rwq_ind_tbl));



DECLARE_UVERBS_OBJECT(uverbs_object_xrcd, UVERBS_OBJECT_XRCD,

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_XRCD,

			    &UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_uxrcd_object), 0,

						      uverbs_free_xrcd));



DECLARE_UVERBS_OBJECT(uverbs_object_pd, UVERBS_OBJECT_PD,

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_PD,

			    /* 2 is used in order to free the PD after MRs */

			    &UVERBS_TYPE_ALLOC_IDR(2, uverbs_free_pd));



DECLARE_UVERBS_OBJECT(uverbs_object_device, UVERBS_OBJECT_DEVICE, NULL);

DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_DEVICE, NULL);



DECLARE_UVERBS_OBJECT_TREE(uverbs_default_objects,

			   &uverbs_object_device,

			   &uverbs_object_pd,

			   &uverbs_object_mr,

			   &uverbs_object_comp_channel,

			   &uverbs_object_cq,

			   &uverbs_object_qp,

			   &uverbs_object_ah,

			   &uverbs_object_mw,

			   &uverbs_object_srq,

			   &uverbs_object_flow,

			   &uverbs_object_wq,

			   &uverbs_object_rwq_ind_table,

			   &uverbs_object_xrcd);
 
			   &UVERBS_OBJECT(UVERBS_OBJECT_DEVICE),

			   &UVERBS_OBJECT(UVERBS_OBJECT_PD),

			   &UVERBS_OBJECT(UVERBS_OBJECT_MR),

			   &UVERBS_OBJECT(UVERBS_OBJECT_COMP_CHANNEL),

			   &UVERBS_OBJECT(UVERBS_OBJECT_CQ),

			   &UVERBS_OBJECT(UVERBS_OBJECT_QP),

			   &UVERBS_OBJECT(UVERBS_OBJECT_AH),

			   &UVERBS_OBJECT(UVERBS_OBJECT_MW),

			   &UVERBS_OBJECT(UVERBS_OBJECT_SRQ),

			   &UVERBS_OBJECT(UVERBS_OBJECT_FLOW),

			   &UVERBS_OBJECT(UVERBS_OBJECT_WQ),

			   &UVERBS_OBJECT(UVERBS_OBJECT_RWQ_IND_TBL),

			   &UVERBS_OBJECT(UVERBS_OBJECT_XRCD));

include/rdma/uverbs_ioctl.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/uaccess.h>

#include <rdma/rdma_user_ioctl.h>

#include <rdma/ib_user_ioctl_verbs.h>

#include <rdma/ib_user_ioctl_cmds.h>



/*

 * =======================================

include/rdma/uverbs_named_ioctl.h

0 → 100644
+59 −0

File added.

Preview size limit exceeded, changes collapsed.