RDMA: Add dedicated QP resource tracker function

In order to avoid double multiplexing of the resource when it is a QP, add
a dedicated callback function.

Link: https://lore.kernel.org/r/20200623113043.1228482-7-leon@kernel.org
Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 9eeac8c..f949892 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -2620,6 +2620,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)
        SET_DEVICE_OP(dev_ops, fill_res_cq_entry);
        SET_DEVICE_OP(dev_ops, fill_res_entry);
        SET_DEVICE_OP(dev_ops, fill_res_mr_entry);
+       SET_DEVICE_OP(dev_ops, fill_res_qp_entry);
        SET_DEVICE_OP(dev_ops, fill_stat_mr_entry);
        SET_DEVICE_OP(dev_ops, get_dev_fw_str);
        SET_DEVICE_OP(dev_ops, get_dma_mr);

diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index 707f724..79d0980 100644 (file)
--- a/drivers/infiniband/core/nldev.c
+++ b/drivers/infiniband/core/nldev.c
@@ -507,9 +507,8 @@ static int fill_res_qp_entry(struct sk_buff *msg, bool has_cap_net_admin,
        if (fill_res_name_pid(msg, res))
                goto err;
 
-       if (fill_res_entry(dev, msg, res))
-               goto err;
-
+       if (dev->ops.fill_res_qp_entry)
+               return dev->ops.fill_res_qp_entry(msg, qp);
        return 0;
 
 err:   return -EMSGSIZE;

diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
index 18a2c1a..c84aa7c 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -1057,6 +1057,7 @@ typedef int c4iw_restrack_func(struct sk_buff *msg,
                               struct rdma_restrack_entry *res);
 int c4iw_fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ibmr);
 int c4iw_fill_res_cq_entry(struct sk_buff *msg, struct ib_cq *ibcq);
+int c4iw_fill_res_qp_entry(struct sk_buff *msg, struct ib_qp *ibqp);
 extern c4iw_restrack_func *c4iw_restrack_funcs[RDMA_RESTRACK_MAX];
 
 #endif

diff --git a/drivers/infiniband/hw/cxgb4/restrack.c b/drivers/infiniband/hw/cxgb4/restrack.c
index ead2cd0..5144d3b 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/restrack.c
+++ b/drivers/infiniband/hw/cxgb4/restrack.c
@@ -134,10 +134,8 @@ err:
        return -EMSGSIZE;
 }
 
-static int fill_res_qp_entry(struct sk_buff *msg,
-                            struct rdma_restrack_entry *res)
+int c4iw_fill_res_qp_entry(struct sk_buff *msg, struct ib_qp *ibqp)
 {
-       struct ib_qp *ibqp = container_of(res, struct ib_qp, res);
        struct t4_swsqe *fsp = NULL, *lsp = NULL;
        struct c4iw_qp *qhp = to_c4iw_qp(ibqp);
        u16 first_sq_idx = 0, last_sq_idx = 0;
@@ -490,6 +488,5 @@ err:
 }
 
 c4iw_restrack_func *c4iw_restrack_funcs[RDMA_RESTRACK_MAX] = {
-       [RDMA_RESTRACK_QP]      = fill_res_qp_entry,
        [RDMA_RESTRACK_CM_ID]   = fill_res_ep_entry,
 };

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 097b1d4..4e8519a 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -2585,6 +2585,7 @@ struct ib_device_ops {
                              struct rdma_restrack_entry *entry);
        int (*fill_res_mr_entry)(struct sk_buff *msg, struct ib_mr *ibmr);
        int (*fill_res_cq_entry)(struct sk_buff *msg, struct ib_cq *ibcq);
+       int (*fill_res_qp_entry)(struct sk_buff *msg, struct ib_qp *ibqp);
 
        /* Device lifecycle callbacks */
        /*