IB/core: Change ib_create_cq to use struct ib_cq_init_attr

Currently, ib_create_cq uses cqe and comp_vecotr instead
of the extendible ib_cq_init_attr struct.

Earlier patches already changed the vendors to work with
ib_cq_init_attr. This patch changes the consumers too.

Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

11 files changed, 44 insertions, 16 deletions

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 600af266838c..533c0b2e7a63 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -2923,6 +2923,7 @@ static int ib_mad_port_open(struct ib_device *device,
         unsigned long flags;
         char name[sizeof "ib_mad123"];
         int has_smi;
+        struct ib_cq_init_attr cq_attr = {};
 
         /* Create new device info */
         port_priv = kzalloc(sizeof *port_priv, GFP_KERNEL);
@@ -2943,9 +2944,10 @@ static int ib_mad_port_open(struct ib_device *device,
         if (has_smi)
                 cq_size *= 2;
 
+        cq_attr.cqe = cq_size;
         port_priv->cq = ib_create_cq(port_priv->device,
                                      ib_mad_thread_completion_handler,
-                                     NULL, port_priv, cq_size, 0);
+                                     NULL, port_priv, &cq_attr);
         if (IS_ERR(port_priv->cq)) {
                 dev_err(&device->dev, "Couldn't create ib_mad CQ\n");
                 ret = PTR_ERR(port_priv->cq);
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 7bffdbe6afe9..bac3fb406a74 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -1076,12 +1076,12 @@ EXPORT_SYMBOL(ib_destroy_qp);
 struct ib_cq *ib_create_cq(struct ib_device *device,
                            ib_comp_handler comp_handler,
                            void (*event_handler)(struct ib_event *, void *),
-                           void *cq_context, int cqe, int comp_vector)
+                           void *cq_context,
+                           const struct ib_cq_init_attr *cq_attr)
 {
         struct ib_cq *cq;
-        struct ib_cq_init_attr attr = {.cqe = cqe, .comp_vector = comp_vector};
 
-        cq = device->create_cq(device, &attr, NULL, NULL);
+        cq = device->create_cq(device, cq_attr, NULL, NULL);
 
         if (!IS_ERR(cq)) {
                 cq->device        = device;
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 5e30b72d3677..c0e45a46504b 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -552,6 +552,7 @@ static int ehca_create_aqp1(struct ehca_shca *shca, u32 port)
         struct ib_cq *ibcq;
         struct ib_qp *ibqp;
         struct ib_qp_init_attr qp_init_attr;
+        struct ib_cq_init_attr cq_attr = {};
         int ret;
 
         if (sport->ibcq_aqp1) {
@@ -559,7 +560,9 @@ static int ehca_create_aqp1(struct ehca_shca *shca, u32 port)
                 return -EPERM;
         }
 
-        ibcq = ib_create_cq(&shca->ib_device, NULL, NULL, (void *)(-1), 10, 0);
+        cq_attr.cqe = 10;
+        ibcq = ib_create_cq(&shca->ib_device, NULL, NULL, (void *)(-1),
+                            &cq_attr);
         if (IS_ERR(ibcq)) {
                 ehca_err(&shca->ib_device, "Cannot create AQP1 CQ.");
                 return PTR_ERR(ibcq);
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 614ac6f07ae1..a790be5a7423 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -1774,6 +1774,7 @@ static int create_pv_resources(struct ib_device *ibdev, int slave, int port,
                                int create_tun, struct mlx4_ib_demux_pv_ctx *ctx)
 {
         int ret, cq_size;
+        struct ib_cq_init_attr cq_attr = {};
 
         if (ctx->state != DEMUX_PV_STATE_DOWN)
                 return -EEXIST;
@@ -1802,8 +1803,9 @@ static int create_pv_resources(struct ib_device *ibdev, int slave, int port,
         if (ctx->has_smi)
                 cq_size *= 2;
 
+        cq_attr.cqe = cq_size;
         ctx->cq = ib_create_cq(ctx->ib_dev, mlx4_ib_tunnel_comp_handler,
-                               NULL, ctx, cq_size, 0);
+                               NULL, ctx, &cq_attr);
         if (IS_ERR(ctx->cq)) {
                 ret = PTR_ERR(ctx->cq);
                 pr_err("Couldn't create tunnel CQ (%d)\n", ret);
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 86c0c27120f7..af2071ed1437 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -758,6 +758,7 @@ static struct ib_xrcd *mlx4_ib_alloc_xrcd(struct ib_device *ibdev,
                                           struct ib_udata *udata)
 {
         struct mlx4_ib_xrcd *xrcd;
+        struct ib_cq_init_attr cq_attr = {};
         int err;
 
         if (!(to_mdev(ibdev)->dev->caps.flags & MLX4_DEV_CAP_FLAG_XRC))
@@ -777,7 +778,8 @@ static struct ib_xrcd *mlx4_ib_alloc_xrcd(struct ib_device *ibdev,
                 goto err2;
         }
 
-        xrcd->cq = ib_create_cq(ibdev, NULL, NULL, xrcd, 1, 0);
+        cq_attr.cqe = 1;
+        xrcd->cq = ib_create_cq(ibdev, NULL, NULL, xrcd, &cq_attr);
         if (IS_ERR(xrcd->cq)) {
                 err = PTR_ERR(xrcd->cq);
                 goto err3;
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 9565c203a497..06b023855a33 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -971,6 +971,7 @@ static int create_umr_res(struct mlx5_ib_dev *dev)
         struct ib_cq *cq;
         struct ib_qp *qp;
         struct ib_mr *mr;
+        struct ib_cq_init_attr cq_attr = {};
         int ret;
 
         attr = kzalloc(sizeof(*attr), GFP_KERNEL);
@@ -994,8 +995,9 @@ static int create_umr_res(struct mlx5_ib_dev *dev)
                 goto error_1;
         }
 
-        cq = ib_create_cq(&dev->ib_dev, mlx5_umr_cq_handler, NULL, NULL, 128,
-                          0);
+        cq_attr.cqe = 128;
+        cq = ib_create_cq(&dev->ib_dev, mlx5_umr_cq_handler, NULL, NULL,
+                          &cq_attr);
         if (IS_ERR(cq)) {
                 mlx5_ib_dbg(dev, "Couldn't create CQ for sync UMR QP\n");
                 ret = PTR_ERR(cq);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index e5cc43074196..9e6ee82a8fd7 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -141,6 +141,7 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca)
                 .sq_sig_type = IB_SIGNAL_ALL_WR,
                 .qp_type     = IB_QPT_UD
         };
+        struct ib_cq_init_attr cq_attr = {};
 
         int ret, size;
         int i;
@@ -178,14 +179,17 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca)
         } else
                 goto out_free_wq;
 
-        priv->recv_cq = ib_create_cq(priv->ca, ipoib_ib_completion, NULL, dev, size, 0);
+        cq_attr.cqe = size;
+        priv->recv_cq = ib_create_cq(priv->ca, ipoib_ib_completion, NULL,
+                                     dev, &cq_attr);
         if (IS_ERR(priv->recv_cq)) {
                 printk(KERN_WARNING "%s: failed to create receive CQ\n", ca->name);
                 goto out_cm_dev_cleanup;
         }
 
+        cq_attr.cqe = ipoib_sendq_size;
         priv->send_cq = ib_create_cq(priv->ca, ipoib_send_comp_handler, NULL,
-                                     dev, ipoib_sendq_size, 0);
+                                     dev, &cq_attr);
         if (IS_ERR(priv->send_cq)) {
                 printk(KERN_WARNING "%s: failed to create send CQ\n", ca->name);
                 goto out_free_recv_cq;
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index d33c5c000f9c..5c9f565ea0e8 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -126,14 +126,17 @@ static int iser_create_device_ib_res(struct iser_device *device)
                 goto pd_err;
 
         for (i = 0; i < device->comps_used; i++) {
+                struct ib_cq_init_attr cq_attr = {};
                 struct iser_comp *comp = &device->comps[i];
 
                 comp->device = device;
+                cq_attr.cqe = max_cqe;
+                cq_attr.comp_vector = i;
                 comp->cq = ib_create_cq(device->ib_device,
                                         iser_cq_callback,
                                         iser_cq_event_callback,
                                         (void *)comp,
-                                        max_cqe, i);
+                                        &cq_attr);
                 if (IS_ERR(comp->cq)) {
                         comp->cq = NULL;
                         goto cq_err;
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index d99a0c8f14a4..9e7b4927265c 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -318,15 +318,18 @@ isert_alloc_comps(struct isert_device *device,
         max_cqe = min(ISER_MAX_CQ_LEN, attr->max_cqe);
 
         for (i = 0; i < device->comps_used; i++) {
+                struct ib_cq_init_attr cq_attr = {};
                 struct isert_comp *comp = &device->comps[i];
 
                 comp->device = device;
                 INIT_WORK(&comp->work, isert_cq_work);
+                cq_attr.cqe = max_cqe;
+                cq_attr.comp_vector = i;
                 comp->cq = ib_create_cq(device->ib_device,
                                         isert_cq_callback,
                                         isert_cq_event_callback,
                                         (void *)comp,
-                                        max_cqe, i);
+                                        &cq_attr);
                 if (IS_ERR(comp->cq)) {
                         isert_err("Unable to allocate cq\n");
                         ret = PTR_ERR(comp->cq);
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index c3f654d20038..eada8f758ad4 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -500,6 +500,7 @@ static int srp_create_ch_ib(struct srp_rdma_ch *ch)
         struct ib_fmr_pool *fmr_pool = NULL;
         struct srp_fr_pool *fr_pool = NULL;
         const int m = 1 + dev->use_fast_reg;
+        struct ib_cq_init_attr cq_attr = {};
         int ret;
 
         init_attr = kzalloc(sizeof *init_attr, GFP_KERNEL);
@@ -507,15 +508,19 @@ static int srp_create_ch_ib(struct srp_rdma_ch *ch)
                 return -ENOMEM;
 
         /* + 1 for SRP_LAST_WR_ID */
+        cq_attr.cqe = target->queue_size + 1;
+        cq_attr.comp_vector = ch->comp_vector;
         recv_cq = ib_create_cq(dev->dev, srp_recv_completion, NULL, ch,
-                               target->queue_size + 1, ch->comp_vector);
+                               &cq_attr);
         if (IS_ERR(recv_cq)) {
                 ret = PTR_ERR(recv_cq);
                 goto err;
         }
 
+        cq_attr.cqe = m * target->queue_size;
+        cq_attr.comp_vector = ch->comp_vector;
         send_cq = ib_create_cq(dev->dev, srp_send_completion, NULL, ch,
-                               m * target->queue_size, ch->comp_vector);
+                               &cq_attr);
         if (IS_ERR(send_cq)) {
                 ret = PTR_ERR(send_cq);
                 goto err_recv_cq;
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 9b84b4c0a000..783efe1a3a28 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -2080,6 +2080,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
         struct srpt_port *sport = ch->sport;
         struct srpt_device *sdev = sport->sdev;
         u32 srp_sq_size = sport->port_attrib.srp_sq_size;
+        struct ib_cq_init_attr cq_attr = {};
         int ret;
 
         WARN_ON(ch->rq_size < 1);
@@ -2090,8 +2091,9 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
                 goto out;
 
 retry:
+        cq_attr.cqe = ch->rq_size + srp_sq_size;
         ch->cq = ib_create_cq(sdev->device, srpt_completion, NULL, ch,
-                              ch->rq_size + srp_sq_size, 0);
+                              &cq_attr);
         if (IS_ERR(ch->cq)) {
                 ret = PTR_ERR(ch->cq);
                 pr_err("failed to create CQ cqe= %d ret= %d\n",