RDMA/core: Add resource tracking for create and destroy CQs

Track create and destroy operations of CQ objects.

Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/cq.c b/drivers/infiniband/core/cq.c
index d99565dbd12fe3c8edbb692addd875aaab151d07..bc79ca8215d7c25ff22c2a901db04b209b49052a 100644 (file)
--- a/drivers/infiniband/core/cq.c
+++ b/drivers/infiniband/core/cq.c
@@ -159,6 +159,10 @@ struct ib_cq *__ib_alloc_cq(struct ib_device *dev, void *private,
        if (!cq->wc)
                goto out_destroy_cq;
 
+       cq->res.type = RDMA_RESTRACK_CQ;
+       cq->res.kern_name = caller;
+       rdma_restrack_add(&cq->res);
+
        switch (cq->poll_ctx) {
        case IB_POLL_DIRECT:
                cq->comp_handler = ib_cq_completion_direct;
@@ -183,6 +187,7 @@ struct ib_cq *__ib_alloc_cq(struct ib_device *dev, void *private,
 
 out_free_wc:
        kfree(cq->wc);
+       rdma_restrack_del(&cq->res);
 out_destroy_cq:
        cq->device->destroy_cq(cq);
        return ERR_PTR(ret);
@@ -214,6 +219,7 @@ void ib_free_cq(struct ib_cq *cq)
        }
 
        kfree(cq->wc);
+       rdma_restrack_del(&cq->res);
        ret = cq->device->destroy_cq(cq);
        WARN_ON_ONCE(ret);
 }

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 825325c764a170dd356f267c34f30875c9179b5a..3e95acd29de7940c3abd35641dadf2d5c9148d0a 100644 (file)
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1033,6 +1033,8 @@ static struct ib_ucq_object *create_cq(struct ib_uverbs_file *file,
                goto err_cb;
 
        uobj_alloc_commit(&obj->uobject);
+       cq->res.type = RDMA_RESTRACK_CQ;
+       rdma_restrack_add(&cq->res);
 
        return obj;
 

diff --git a/drivers/infiniband/core/uverbs_std_types.c b/drivers/infiniband/core/uverbs_std_types.c
index c3ee5d9b336d97c36c32d7d00b6ce9de061c1b46..b571176babbe8a4f786871f9152818336664053c 100644 (file)
--- a/drivers/infiniband/core/uverbs_std_types.c
+++ b/drivers/infiniband/core/uverbs_std_types.c
@@ -35,6 +35,7 @@
 #include <rdma/ib_verbs.h>
 #include <linux/bug.h>
 #include <linux/file.h>
+#include <rdma/restrack.h>
 #include "rdma_core.h"
 #include "uverbs.h"
 
@@ -319,6 +320,8 @@ static int uverbs_create_cq_handler(struct ib_device *ib_dev,
        obj->uobject.object = cq;
        obj->uobject.user_handle = user_handle;
        atomic_set(&cq->usecnt, 0);
+       cq->res.type = RDMA_RESTRACK_CQ;
+       rdma_restrack_add(&cq->res);
 
        ret = uverbs_copy_to(attrs, CREATE_CQ_RESP_CQE, &cq->cqe);
        if (ret)

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 5324cf4788d02120aa0daabc763d73b51b20ebdd..8cb5c850828dd4f6bbefa708ec380b08c3bfa1ae 100644 (file)
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -1579,6 +1579,8 @@ struct ib_cq *ib_create_cq(struct ib_device *device,
                cq->event_handler = event_handler;
                cq->cq_context    = cq_context;
                atomic_set(&cq->usecnt, 0);
+               cq->res.type = RDMA_RESTRACK_CQ;
+               rdma_restrack_add(&cq->res);
        }
 
        return cq;
@@ -1597,6 +1599,7 @@ int ib_destroy_cq(struct ib_cq *cq)
        if (atomic_read(&cq->usecnt))
                return -EBUSY;
 
+       rdma_restrack_del(&cq->res);
        return cq->device->destroy_cq(cq);
 }
 EXPORT_SYMBOL(ib_destroy_cq);