Commit d2b10794 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/core: Create clean QP creations interface for uverbs 

Unify create QP creation interface to make clean approach to create
XRC_TGT and regular QPs.

Link: https://lore.kernel.org/r/5cd50e7d8ad9112545a1a61dea62799a5cb3224a.1628014762.git.leonro@nvidia.com


Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 5507f67d

drivers/infiniband/core/core_priv.h

+5 −4
Original line number Diff line number Diff line
@@ -316,10 +316,11 @@ struct ib_device *ib_device_get_by_index(const struct net *net, u32 index); 
void nldev_init(void);

void nldev_exit(void);



struct ib_qp *_ib_create_qp(struct ib_device *dev, struct ib_pd *pd,

struct ib_qp *ib_create_qp_user(struct ib_device *dev, struct ib_pd *pd,

				struct ib_qp_init_attr *attr,

			    struct ib_udata *udata, struct ib_uqp_object *uobj,

			    const char *caller);

				struct ib_udata *udata,

				struct ib_uqp_object *uobj, const char *caller);



void ib_qp_usecnt_inc(struct ib_qp *qp);

void ib_qp_usecnt_dec(struct ib_qp *qp);

drivers/infiniband/core/uverbs_cmd.c

+2 −11
Original line number Diff line number Diff line
@@ -1435,23 +1435,14 @@ static int create_qp(struct uverbs_attr_bundle *attrs, 
		attr.source_qpn = cmd->source_qpn;

	}



	if (cmd->qp_type == IB_QPT_XRC_TGT)

		qp = ib_create_qp(pd, &attr);

	else

		qp = _ib_create_qp(device, pd, &attr, &attrs->driver_udata, obj,

				   NULL);



	qp = ib_create_qp_user(device, pd, &attr, &attrs->driver_udata, obj,

			       KBUILD_MODNAME);

	if (IS_ERR(qp)) {

		ret = PTR_ERR(qp);

		goto err_put;

	}

	ib_qp_usecnt_inc(qp);



	if (cmd->qp_type == IB_QPT_XRC_TGT) {

		/* It is done in _ib_create_qp for other QP types */

		qp->uobject = obj;

	}



	obj->uevent.uobject.object = qp;

	obj->uevent.event_file = READ_ONCE(attrs->ufile->default_async_file);

	if (obj->uevent.event_file)

drivers/infiniband/core/uverbs_std_types_qp.c

+2 −8
Original line number Diff line number Diff line
@@ -248,12 +248,8 @@ static int UVERBS_HANDLER(UVERBS_METHOD_QP_CREATE)( 
	set_caps(&attr, &cap, true);

	mutex_init(&obj->mcast_lock);



	if (attr.qp_type == IB_QPT_XRC_TGT)

		qp = ib_create_qp(pd, &attr);

	else

		qp = _ib_create_qp(device, pd, &attr, &attrs->driver_udata, obj,

				   NULL);



	qp = ib_create_qp_user(device, pd, &attr, &attrs->driver_udata, obj,

			       KBUILD_MODNAME);

	if (IS_ERR(qp)) {

		ret = PTR_ERR(qp);

		goto err_put;
@@ -264,8 +260,6 @@ static int UVERBS_HANDLER(UVERBS_METHOD_QP_CREATE)( 
		obj->uxrcd = container_of(xrcd_uobj, struct ib_uxrcd_object,

					  uobject);

		atomic_inc(&obj->uxrcd->refcnt);

		/* It is done in _ib_create_qp for other QP types */

		qp->uobject = obj;

	}



	obj->uevent.uobject.object = qp;

drivers/infiniband/core/verbs.c

+43 −29
Original line number Diff line number Diff line
@@ -1200,21 +1200,10 @@ static struct ib_qp *create_xrc_qp_user(struct ib_qp *qp, 
	return qp;

}



/**

 * _ib_create_qp - Creates a QP associated with the specified protection domain

 * @dev: IB device

 * @pd: The protection domain associated with the QP.

 * @attr: A list of initial attributes required to create the

 *   QP.  If QP creation succeeds, then the attributes are updated to

 *   the actual capabilities of the created QP.

 * @udata: User data

 * @uobj: uverbs obect

 * @caller: caller's build-time module name

 */

struct ib_qp *_ib_create_qp(struct ib_device *dev, struct ib_pd *pd,

static struct ib_qp *create_qp(struct ib_device *dev, struct ib_pd *pd,

			       struct ib_qp_init_attr *attr,

			    struct ib_udata *udata, struct ib_uqp_object *uobj,

			    const char *caller)

			       struct ib_udata *udata,

			       struct ib_uqp_object *uobj, const char *caller)

{

	struct ib_udata dummy = {};

	struct ib_qp *qp;
@@ -1272,7 +1261,43 @@ struct ib_qp *_ib_create_qp(struct ib_device *dev, struct ib_pd *pd, 
	return ERR_PTR(ret);



}

EXPORT_SYMBOL(_ib_create_qp);



/**

 * ib_create_qp_user - Creates a QP associated with the specified protection

 *   domain.

 * @dev: IB device

 * @pd: The protection domain associated with the QP.

 * @attr: A list of initial attributes required to create the

 *   QP.  If QP creation succeeds, then the attributes are updated to

 *   the actual capabilities of the created QP.

 * @udata: User data

 * @uobj: uverbs obect

 * @caller: caller's build-time module name

 */

struct ib_qp *ib_create_qp_user(struct ib_device *dev, struct ib_pd *pd,

				struct ib_qp_init_attr *attr,

				struct ib_udata *udata,

				struct ib_uqp_object *uobj, const char *caller)

{

	struct ib_qp *qp, *xrc_qp;



	if (attr->qp_type == IB_QPT_XRC_TGT)

		qp = create_qp(dev, pd, attr, NULL, NULL, caller);

	else

		qp = create_qp(dev, pd, attr, udata, uobj, NULL);

	if (attr->qp_type != IB_QPT_XRC_TGT || IS_ERR(qp))

		return qp;



	xrc_qp = create_xrc_qp_user(qp, attr);

	if (IS_ERR(xrc_qp)) {

		ib_destroy_qp(qp);

		return xrc_qp;

	}



	xrc_qp->uobject = uobj;

	return xrc_qp;

}

EXPORT_SYMBOL(ib_create_qp_user);



void ib_qp_usecnt_inc(struct ib_qp *qp)

{
@@ -1308,7 +1333,7 @@ struct ib_qp *ib_create_qp_kernel(struct ib_pd *pd, 
				  struct ib_qp_init_attr *qp_init_attr,

				  const char *caller)

{

	struct ib_device *device = pd ? pd->device : qp_init_attr->xrcd->device;

	struct ib_device *device = pd->device;

	struct ib_qp *qp;

	int ret;
@@ -1321,21 +1346,10 @@ struct ib_qp *ib_create_qp_kernel(struct ib_pd *pd, 
	if (qp_init_attr->cap.max_rdma_ctxs)

		rdma_rw_init_qp(device, qp_init_attr);



	qp = _ib_create_qp(device, pd, qp_init_attr, NULL, NULL, caller);

	qp = create_qp(device, pd, qp_init_attr, NULL, NULL, caller);

	if (IS_ERR(qp))

		return qp;



	if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) {

		struct ib_qp *xrc_qp =

			create_xrc_qp_user(qp, qp_init_attr);



		if (IS_ERR(xrc_qp)) {

			ret = PTR_ERR(xrc_qp);

			goto err;

		}

		return xrc_qp;

	}



	ib_qp_usecnt_inc(qp);



	if (qp_init_attr->cap.max_rdma_ctxs) {