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

RDMA/restrack: Simplify restrack tracking in kernel flows 

Have a single rdma_restrack_add() that adds an entry, there is no reason
to split the user/kernel here, the rdma_restrack_set_task() is responsible
for this difference.

This patch prepares the code to the future requirement of making restrack
is mandatory for managing ib objects.

Link: https://lore.kernel.org/r/20200922091106.2152715-5-leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 13ef5539

drivers/infiniband/core/cma.c

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ static void _cma_attach_to_dev(struct rdma_id_private *id_priv, 
		rdma_node_get_transport(cma_dev->device->node_type);

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

	if (id_priv->res.kern_name)

		rdma_restrack_kadd(&id_priv->res);

		rdma_restrack_add(&id_priv->res);

	else

		rdma_restrack_uadd(&id_priv->res);

	trace_cm_id_attach(id_priv, cma_dev->device);

drivers/infiniband/core/core_priv.h

+4 −2
Original line number Diff line number Diff line
@@ -363,8 +363,10 @@ static inline struct ib_qp *_ib_create_qp(struct ib_device *dev, 
	if ((qp_type < IB_QPT_MAX && !is_xrc) || qp_type == IB_QPT_DRIVER) {

		if (uobj)

			rdma_restrack_uadd(&qp->res);

		else

			rdma_restrack_kadd(&qp->res);

		else {

			rdma_restrack_set_task(&qp->res, pd->res.kern_name);

			rdma_restrack_add(&qp->res);

		}

	} else

		qp->res.valid = false;

drivers/infiniband/core/counters.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static void rdma_counter_res_add(struct rdma_counter *counter, 
{

	if (rdma_is_kernel_res(&qp->res)) {

		rdma_restrack_set_task(&counter->res, qp->res.kern_name);

		rdma_restrack_kadd(&counter->res);

		rdma_restrack_add(&counter->res);

	} else {

		rdma_restrack_attach_task(&counter->res, qp->res.task);

		rdma_restrack_uadd(&counter->res);

drivers/infiniband/core/cq.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ struct ib_cq *__ib_alloc_cq(struct ib_device *dev, void *private, int nr_cqe, 
		goto out_destroy_cq;

	}



	rdma_restrack_kadd(&cq->res);

	rdma_restrack_add(&cq->res);

	trace_cq_alloc(cq, nr_cqe, comp_vector, poll_ctx);

	return cq;

drivers/infiniband/core/restrack.c

+6 −40
Original line number Diff line number Diff line
@@ -123,32 +123,6 @@ int rdma_restrack_count(struct ib_device *dev, enum rdma_restrack_type type) 
}

EXPORT_SYMBOL(rdma_restrack_count);



static void set_kern_name(struct rdma_restrack_entry *res)

{

	struct ib_pd *pd;



	switch (res->type) {

	case RDMA_RESTRACK_QP:

		pd = container_of(res, struct ib_qp, res)->pd;

		if (!pd) {

			WARN_ONCE(true, "XRC QPs are not supported\n");

			/* Survive, despite the programmer's error */

			res->kern_name = " ";

		}

		break;

	case RDMA_RESTRACK_MR:

		pd = container_of(res, struct ib_mr, res)->pd;

		break;

	default:

		/* Other types set kern_name directly */

		pd = NULL;

		break;

	}



	if (pd)

		res->kern_name = pd->res.kern_name;

}



static struct ib_device *res_to_dev(struct rdma_restrack_entry *res)

{

	switch (res->type) {
@@ -217,7 +191,11 @@ void rdma_restrack_new(struct rdma_restrack_entry *res, 
}

EXPORT_SYMBOL(rdma_restrack_new);



static void rdma_restrack_add(struct rdma_restrack_entry *res)

/**

 * rdma_restrack_add() - add object to the reource tracking database

 * @res:  resource entry

 */

void rdma_restrack_add(struct rdma_restrack_entry *res)

{

	struct ib_device *dev = res_to_dev(res);

	struct rdma_restrack_root *rt;
@@ -249,19 +227,7 @@ static void rdma_restrack_add(struct rdma_restrack_entry *res) 
	if (!ret)

		res->valid = true;

}



/**

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

 * @res:  resource entry

 */

void rdma_restrack_kadd(struct rdma_restrack_entry *res)

{

	res->task = NULL;

	set_kern_name(res);

	res->user = false;

	rdma_restrack_add(res);

}

EXPORT_SYMBOL(rdma_restrack_kadd);

EXPORT_SYMBOL(rdma_restrack_add);



/**

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