RDMA: Add dedicated CM_ID resource tracker function

In order to avoid double multiplexing of the resource when it is a cm id,
add a dedicated callback function. In addition remove fill_res_entry which
is not used anymore.

Link: https://lore.kernel.org/r/20200623113043.1228482-8-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 f94989274df55d08497a3e8ec0d9c25f2d8107b0..cbe95e729cf104df1d580d0992315466f310eb65 100644 (file)
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -2617,8 +2617,8 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops)
        SET_DEVICE_OP(dev_ops, drain_rq);
        SET_DEVICE_OP(dev_ops, drain_sq);
        SET_DEVICE_OP(dev_ops, enable_driver);
+       SET_DEVICE_OP(dev_ops, fill_res_cm_id_entry);
        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);

diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index 79d0980a75e05314720cac2b5596de8ee466c34b..394e307c342c3bf17a932866994729680cac3cf9 100644 (file)
--- a/drivers/infiniband/core/nldev.c
+++ b/drivers/infiniband/core/nldev.c
@@ -446,14 +446,6 @@ static int fill_res_name_pid(struct sk_buff *msg,
        return err ? -EMSGSIZE : 0;
 }
 
-static bool fill_res_entry(struct ib_device *dev, struct sk_buff *msg,
-                          struct rdma_restrack_entry *res)
-{
-       if (!dev->ops.fill_res_entry)
-               return false;
-       return dev->ops.fill_res_entry(msg, res);
-}
-
 static int fill_res_qp_entry(struct sk_buff *msg, bool has_cap_net_admin,
                             struct rdma_restrack_entry *res, uint32_t port)
 {
@@ -559,9 +551,8 @@ static int fill_res_cm_id_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_cm_id_entry)
+               return dev->ops.fill_res_cm_id_entry(msg, cm_id);
        return 0;
 
 err: return -EMSGSIZE;

diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
index c84aa7c937f15a5c406fddb0e04f689a369fb8c5..27da0705c88a7bae8963fd8b7c36dc732a797a85 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -1053,11 +1053,9 @@ int c4iw_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr,
                       const struct ib_recv_wr **bad_wr);
 struct c4iw_wr_wait *c4iw_alloc_wr_wait(gfp_t gfp);
 
-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];
+int c4iw_fill_res_cm_id_entry(struct sk_buff *msg, struct rdma_cm_id *cm_id);
 
 #endif

diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
index d6b20aa314a044f670ca55a8b3a160ce36d51318..1d3ff59e4060b88683d6ee351b9ed212faa477f3 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/provider.c
+++ b/drivers/infiniband/hw/cxgb4/provider.c
@@ -458,13 +458,6 @@ static void get_dev_fw_str(struct ib_device *dev, char *str)
                 FW_HDR_FW_VER_BUILD_G(c4iw_dev->rdev.lldi.fw_vers));
 }
 
-static int fill_res_entry(struct sk_buff *msg, struct rdma_restrack_entry *res)
-{
-       return (res->type < ARRAY_SIZE(c4iw_restrack_funcs) &&
-               c4iw_restrack_funcs[res->type]) ?
-               c4iw_restrack_funcs[res->type](msg, res) : 0;
-}
-
 static const struct ib_device_ops c4iw_dev_ops = {
        .owner = THIS_MODULE,
        .driver_id = RDMA_DRIVER_CXGB4,
@@ -486,7 +479,7 @@ static const struct ib_device_ops c4iw_dev_ops = {
        .destroy_qp = c4iw_destroy_qp,
        .destroy_srq = c4iw_destroy_srq,
        .fill_res_cq_entry = c4iw_fill_res_cq_entry,
-       .fill_res_entry = fill_res_entry,
+       .fill_res_cm_id_entry = c4iw_fill_res_cm_id_entry,
        .fill_res_mr_entry = c4iw_fill_res_mr_entry,
        .get_dev_fw_str = get_dev_fw_str,
        .get_dma_mr = c4iw_get_dma_mr,

diff --git a/drivers/infiniband/hw/cxgb4/restrack.c b/drivers/infiniband/hw/cxgb4/restrack.c
index 5144d3b67293828c47f08d3def9435f5ba637d0e..b32e6516d65fe93fc054d00fcad4197b2890c88e 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/restrack.c
+++ b/drivers/infiniband/hw/cxgb4/restrack.c
@@ -193,10 +193,9 @@ union union_ep {
        struct c4iw_ep ep;
 };
 
-static int fill_res_ep_entry(struct sk_buff *msg,
-                            struct rdma_restrack_entry *res)
+int c4iw_fill_res_cm_id_entry(struct sk_buff *msg,
+                             struct rdma_cm_id *cm_id)
 {
-       struct rdma_cm_id *cm_id = rdma_res_to_id(res);
        struct nlattr *table_attr;
        struct c4iw_ep_common *epcp;
        struct c4iw_listen_ep *listen_ep = NULL;
@@ -486,7 +485,3 @@ err_cancel_table:
 err:
        return -EMSGSIZE;
 }
-
-c4iw_restrack_func *c4iw_restrack_funcs[RDMA_RESTRACK_MAX] = {
-       [RDMA_RESTRACK_CM_ID]   = fill_res_ep_entry,
-};

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 4e8519ac7363d21dc555f20f894f06a1eb0dbad4..9127cffafccdbfd78b26db69ccc6b041b9145add 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -75,6 +75,7 @@ struct ib_umem_odp;
 struct ib_uqp_object;
 struct ib_usrq_object;
 struct ib_uwq_object;
+struct rdma_cm_id;
 
 extern struct workqueue_struct *ib_wq;
 extern struct workqueue_struct *ib_comp_wq;
@@ -2581,11 +2582,10 @@ struct ib_device_ops {
        /**
         * Allows rdma drivers to add their own restrack attributes.
         */
-       int (*fill_res_entry)(struct sk_buff *msg,
-                             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);
+       int (*fill_res_cm_id_entry)(struct sk_buff *msg, struct rdma_cm_id *id);
 
        /* Device lifecycle callbacks */
        /*