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

Commit 9bc57e2d authored by Ralph Campbell's avatar Ralph Campbell Committed by Roland Dreier
Browse files

IB/uverbs: Pass userspace data to modify_srq and modify_qp methods 



Pass a struct ib_udata to the low-level driver's ->modify_srq() and
->modify_qp() methods, so that it can get to the device-specific data
passed in by the userspace driver.

Signed-off-by: default avatarRalph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 64f817ba

drivers/infiniband/core/uverbs_cmd.c

+10 −3
Original line number Diff line number Diff line
@@ -841,7 +841,6 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file, 
err_copy:

	idr_remove_uobj(&ib_uverbs_cq_idr, &obj->uobject);





err_free:

	ib_destroy_cq(cq);
@@ -1273,6 +1272,7 @@ ssize_t ib_uverbs_modify_qp(struct ib_uverbs_file *file, 
			    int out_len)

{

	struct ib_uverbs_modify_qp cmd;

	struct ib_udata            udata;

	struct ib_qp              *qp;

	struct ib_qp_attr         *attr;

	int                        ret;
@@ -1280,6 +1280,9 @@ ssize_t ib_uverbs_modify_qp(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	INIT_UDATA(&udata, buf + sizeof cmd, NULL, in_len - sizeof cmd,

		   out_len);



	attr = kmalloc(sizeof *attr, GFP_KERNEL);

	if (!attr)

		return -ENOMEM;
@@ -1336,7 +1339,7 @@ ssize_t ib_uverbs_modify_qp(struct ib_uverbs_file *file, 
	attr->alt_ah_attr.ah_flags 	    = cmd.alt_dest.is_global ? IB_AH_GRH : 0;

	attr->alt_ah_attr.port_num 	    = cmd.alt_dest.port_num;



	ret = ib_modify_qp(qp, attr, cmd.attr_mask);

	ret = qp->device->modify_qp(qp, attr, cmd.attr_mask, &udata);



	put_qp_read(qp);
@@ -2054,6 +2057,7 @@ ssize_t ib_uverbs_modify_srq(struct ib_uverbs_file *file, 
			     int out_len)

{

	struct ib_uverbs_modify_srq cmd;

	struct ib_udata             udata;

	struct ib_srq              *srq;

	struct ib_srq_attr          attr;

	int                         ret;
@@ -2061,6 +2065,9 @@ ssize_t ib_uverbs_modify_srq(struct ib_uverbs_file *file, 
	if (copy_from_user(&cmd, buf, sizeof cmd))

		return -EFAULT;



	INIT_UDATA(&udata, buf + sizeof cmd, NULL, in_len - sizeof cmd,

		   out_len);



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

	if (!srq)

		return -EINVAL;
@@ -2068,7 +2075,7 @@ ssize_t ib_uverbs_modify_srq(struct ib_uverbs_file *file, 
	attr.max_wr    = cmd.max_wr;

	attr.srq_limit = cmd.srq_limit;



	ret = ib_modify_srq(srq, &attr, cmd.attr_mask);

	ret = srq->device->modify_srq(srq, &attr, cmd.attr_mask, &udata);



	put_srq_read(srq);

drivers/infiniband/core/verbs.c

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ int ib_modify_srq(struct ib_srq *srq, 
		  struct ib_srq_attr *srq_attr,

		  enum ib_srq_attr_mask srq_attr_mask)

{

	return srq->device->modify_srq(srq, srq_attr, srq_attr_mask);

	return srq->device->modify_srq(srq, srq_attr, srq_attr_mask, NULL);

}

EXPORT_SYMBOL(ib_modify_srq);
@@ -547,7 +547,7 @@ int ib_modify_qp(struct ib_qp *qp, 
		 struct ib_qp_attr *qp_attr,

		 int qp_attr_mask)

{

	return qp->device->modify_qp(qp, qp_attr, qp_attr_mask);

	return qp->device->modify_qp(qp, qp_attr, qp_attr_mask, NULL);

}

EXPORT_SYMBOL(ib_modify_qp);

drivers/infiniband/hw/ehca/ehca_iverbs.h

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ struct ib_qp *ehca_create_qp(struct ib_pd *pd, 


int ehca_destroy_qp(struct ib_qp *qp);



int ehca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask);

int ehca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,

		   struct ib_udata *udata);



int ehca_query_qp(struct ib_qp *qp, struct ib_qp_attr *qp_attr,

		  int qp_attr_mask, struct ib_qp_init_attr *qp_init_attr);

drivers/infiniband/hw/ehca/ehca_qp.c

+2 −1
Original line number Diff line number Diff line
@@ -1230,7 +1230,8 @@ static int internal_modify_qp(struct ib_qp *ibqp, 
	return ret;

}



int ehca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)

int ehca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,

		   struct ib_udata *udata)

{

	struct ehca_qp *my_qp = container_of(ibqp, struct ehca_qp, ib_qp);

	struct ehca_pd *my_pd = container_of(my_qp->ib_qp.pd, struct ehca_pd,

drivers/infiniband/hw/ipath/ipath_qp.c

+2 −1
Original line number Diff line number Diff line
@@ -426,11 +426,12 @@ void ipath_error_qp(struct ipath_qp *qp) 
 * @ibqp: the queue pair who's attributes we're modifying

 * @attr: the new attributes

 * @attr_mask: the mask of attributes to modify

 * @udata: user data for ipathverbs.so

 *

 * Returns 0 on success, otherwise returns an errno.

 */

int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,

		    int attr_mask)

		    int attr_mask, struct ib_udata *udata)

{

	struct ipath_ibdev *dev = to_idev(ibqp->device);

	struct ipath_qp *qp = to_iqp(ibqp);