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

Commit af8d7037 authored by Shamir Rabinovitch's avatar Shamir Rabinovitch Committed by Jason Gunthorpe
Browse files

RDMA/restrack: Resource-tracker should not use uobject pointers 



Having uobject pointer embedded in ib core objects is not aligned with a
future shared ib_x model. The resource tracker only does this to keep
track of user/kernel objects - track this directly instead.

Signed-off-by: default avatarShamir Rabinovitch <shamir.rabinovitch@oracle.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 813e90b1

drivers/infiniband/core/cma.c

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static void _cma_attach_to_dev(struct rdma_id_private *id_priv, 
	id_priv->id.route.addr.dev_addr.transport =

		rdma_node_get_transport(cma_dev->device->node_type);

	list_add_tail(&id_priv->list, &cma_dev->id_list);

	rdma_restrack_add(&id_priv->res);

	rdma_restrack_kadd(&id_priv->res);

}



static void cma_attach_to_dev(struct rdma_id_private *id_priv,

drivers/infiniband/core/core_priv.h

+4 −1
Original line number Diff line number Diff line
@@ -297,7 +297,10 @@ static inline struct ib_qp *_ib_create_qp(struct ib_device *dev, 
	 */

	if (attr->qp_type < IB_QPT_XRC_INI) {

		qp->res.type = RDMA_RESTRACK_QP;

		rdma_restrack_add(&qp->res);

		if (uobj)

			rdma_restrack_uadd(&qp->res);

		else

			rdma_restrack_kadd(&qp->res);

	} else

		qp->res.valid = false;

drivers/infiniband/core/cq.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ struct ib_cq *__ib_alloc_cq(struct ib_device *dev, void *private, 


	cq->res.type = RDMA_RESTRACK_CQ;

	rdma_restrack_set_task(&cq->res, caller);

	rdma_restrack_add(&cq->res);

	rdma_restrack_kadd(&cq->res);



	switch (cq->poll_ctx) {

	case IB_POLL_DIRECT:

drivers/infiniband/core/restrack.c

+25 −25
Original line number Diff line number Diff line
@@ -139,27 +139,6 @@ static struct ib_device *res_to_dev(struct rdma_restrack_entry *res) 
	}

}



static bool res_is_user(struct rdma_restrack_entry *res)

{

	switch (res->type) {

	case RDMA_RESTRACK_PD:

		return container_of(res, struct ib_pd, res)->uobject;

	case RDMA_RESTRACK_CQ:

		return container_of(res, struct ib_cq, res)->uobject;

	case RDMA_RESTRACK_QP:

		return container_of(res, struct ib_qp, res)->uobject;

	case RDMA_RESTRACK_CM_ID:

		return !res->kern_name;

	case RDMA_RESTRACK_MR:

		return container_of(res, struct ib_mr, res)->pd->uobject;

	case RDMA_RESTRACK_CTX:

		return true;

	default:

		WARN_ONCE(true, "Wrong resource tracking type %u\n", res->type);

		return false;

	}

}



void rdma_restrack_set_task(struct rdma_restrack_entry *res,

			    const char *caller)

{
@@ -175,17 +154,17 @@ void rdma_restrack_set_task(struct rdma_restrack_entry *res, 
}

EXPORT_SYMBOL(rdma_restrack_set_task);



void rdma_restrack_add(struct rdma_restrack_entry *res)

static void rdma_restrack_add(struct rdma_restrack_entry *res)

{

	struct ib_device *dev = res_to_dev(res);



	if (!dev)

		return;



	if (res->type != RDMA_RESTRACK_CM_ID || !res_is_user(res))

	if (res->type != RDMA_RESTRACK_CM_ID || rdma_is_kernel_res(res))

		res->task = NULL;



	if (res_is_user(res)) {

	if (!rdma_is_kernel_res(res)) {

		if (!res->task)

			rdma_restrack_set_task(res, NULL);

		res->kern_name = NULL;
@@ -201,7 +180,28 @@ void rdma_restrack_add(struct rdma_restrack_entry *res) 
	hash_add(dev->res.hash, &res->node, res->type);

	up_write(&dev->res.rwsem);

}

EXPORT_SYMBOL(rdma_restrack_add);



/**

 * rdma_restrack_kadd() - add kernel object to the reource tracking database

 * @res:  resource entry

 */

void rdma_restrack_kadd(struct rdma_restrack_entry *res)

{

	res->user = false;

	rdma_restrack_add(res);

}

EXPORT_SYMBOL(rdma_restrack_kadd);



/**

 * rdma_restrack_uadd() - add user object to the reource tracking database

 * @res:  resource entry

 */

void rdma_restrack_uadd(struct rdma_restrack_entry *res)

{

	res->user = true;

	rdma_restrack_add(res);

}

EXPORT_SYMBOL(rdma_restrack_uadd);



int __must_check rdma_restrack_get(struct rdma_restrack_entry *res)

{

drivers/infiniband/core/uverbs_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int ib_uverbs_get_context(struct uverbs_attr_bundle *attrs) 
	fd_install(resp.async_fd, filp);



	ucontext->res.type = RDMA_RESTRACK_CTX;

	rdma_restrack_add(&ucontext->res);

	rdma_restrack_uadd(&ucontext->res);



	/*

	 * Make sure that ib_uverbs_get_ucontext() sees the pointer update
@@ -472,7 +472,7 @@ static int ib_uverbs_alloc_pd(struct uverbs_attr_bundle *attrs) 
	memset(&resp, 0, sizeof resp);

	resp.pd_handle = uobj->id;

	pd->res.type = RDMA_RESTRACK_PD;

	rdma_restrack_add(&pd->res);

	rdma_restrack_uadd(&pd->res);



	ret = uverbs_response(attrs, &resp, sizeof(resp));

	if (ret)
@@ -788,7 +788,7 @@ static int ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs) 
	mr->uobject = uobj;

	atomic_inc(&pd->usecnt);

	mr->res.type = RDMA_RESTRACK_MR;

	rdma_restrack_add(&mr->res);

	rdma_restrack_uadd(&mr->res);



	uobj->object = mr;
@@ -1066,7 +1066,7 @@ static struct ib_ucq_object *create_cq(struct uverbs_attr_bundle *attrs, 
	resp.response_length = uverbs_response_length(attrs, sizeof(resp));



	cq->res.type = RDMA_RESTRACK_CQ;

	rdma_restrack_add(&cq->res);

	rdma_restrack_uadd(&cq->res);



	ret = uverbs_response(attrs, &resp, sizeof(resp));

	if (ret)