IB/mlx4: Implement IB_QP_CREATE_USE_GFP_NOIO

Modify the various routines used to allocate memory resources which
serve QPs in mlx4 to get an input GFP directive.  Have the Ethernet
driver to use GFP_KERNEL in it's QP allocations as done prior to this
commit, and the IB driver to use GFP_NOIO when the IB verbs
IB_QP_CREATE_USE_GFP_NOIO QP creation flag is provided.

Signed-off-by: Mel Gorman <mgorman@suse.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

4 files changed, 25 insertions, 19 deletions

diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index 5f640814cc81..1066eec854a9 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -102,7 +102,7 @@ static int mlx4_ib_alloc_cq_buf(struct mlx4_ib_dev *dev, struct mlx4_ib_cq_buf *
         int err;
 
         err = mlx4_buf_alloc(dev->dev, nent * dev->dev->caps.cqe_size,
-                             PAGE_SIZE * 2, &buf->buf);
+                             PAGE_SIZE * 2, &buf->buf, GFP_KERNEL);
 
         if (err)
                 goto out;
@@ -113,7 +113,7 @@ static int mlx4_ib_alloc_cq_buf(struct mlx4_ib_dev *dev, struct mlx4_ib_cq_buf *
         if (err)
                 goto err_buf;
 
-        err = mlx4_buf_write_mtt(dev->dev, &buf->mtt, &buf->buf);
+        err = mlx4_buf_write_mtt(dev->dev, &buf->mtt, &buf->buf, GFP_KERNEL);
         if (err)
                 goto err_mtt;
 
@@ -209,7 +209,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev, int entries, int vector
 
                 uar = &to_mucontext(context)->uar;
         } else {
-                err = mlx4_db_alloc(dev->dev, &cq->db, 1);
+                err = mlx4_db_alloc(dev->dev, &cq->db, 1, GFP_KERNEL);
                 if (err)
                         goto err_cq;
 
diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
index f589522fddfd..bb8c9dd442ae 100644
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
@@ -156,6 +156,7 @@ enum mlx4_ib_qp_flags {
         MLX4_IB_QP_LSO = IB_QP_CREATE_IPOIB_UD_LSO,
         MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK = IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK,
         MLX4_IB_QP_NETIF = IB_QP_CREATE_NETIF_QP,
+        MLX4_IB_QP_CREATE_USE_GFP_NOIO = IB_QP_CREATE_USE_GFP_NOIO,
         MLX4_IB_SRIOV_TUNNEL_QP = 1 << 30,
         MLX4_IB_SRIOV_SQP = 1 << 31,
 };
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 41308af4163c..8710baf60bb9 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -610,7 +610,8 @@ static int qp_has_rq(struct ib_qp_init_attr *attr)
 
 static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
                             struct ib_qp_init_attr *init_attr,
-                            struct ib_udata *udata, int sqpn, struct mlx4_ib_qp **caller_qp)
+                            struct ib_udata *udata, int sqpn, struct mlx4_ib_qp **caller_qp,
+                            gfp_t gfp)
 {
         int qpn;
         int err;
@@ -748,14 +749,14 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
                         goto err;
 
                 if (qp_has_rq(init_attr)) {
-                        err = mlx4_db_alloc(dev->dev, &qp->db, 0);
+                        err = mlx4_db_alloc(dev->dev, &qp->db, 0, gfp);
                         if (err)
                                 goto err;
 
                         *qp->db.db = 0;
                 }
 
-                if (mlx4_buf_alloc(dev->dev, qp->buf_size, PAGE_SIZE * 2, &qp->buf)) {
+                if (mlx4_buf_alloc(dev->dev, qp->buf_size, PAGE_SIZE * 2, &qp->buf, gfp)) {
                         err = -ENOMEM;
                         goto err_db;
                 }
@@ -765,13 +766,12 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
                 if (err)
                         goto err_buf;
 
-                err = mlx4_buf_write_mtt(dev->dev, &qp->mtt, &qp->buf);
+                err = mlx4_buf_write_mtt(dev->dev, &qp->mtt, &qp->buf, gfp);
                 if (err)
                         goto err_mtt;
 
-                qp->sq.wrid  = kmalloc(qp->sq.wqe_cnt * sizeof (u64), GFP_KERNEL);
-                qp->rq.wrid  = kmalloc(qp->rq.wqe_cnt * sizeof (u64), GFP_KERNEL);
-
+                qp->sq.wrid  = kmalloc(qp->sq.wqe_cnt * sizeof (u64), gfp);
+                qp->rq.wrid  = kmalloc(qp->rq.wqe_cnt * sizeof (u64), gfp);
                 if (!qp->sq.wrid || !qp->rq.wrid) {
                         err = -ENOMEM;
                         goto err_wrid;
@@ -801,7 +801,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
                         goto err_proxy;
         }
 
-        err = mlx4_qp_alloc(dev->dev, qpn, &qp->mqp);
+        err = mlx4_qp_alloc(dev->dev, qpn, &qp->mqp, gfp);
         if (err)
                 goto err_qpn;
 
@@ -1040,7 +1040,10 @@ struct ib_qp *mlx4_ib_create_qp(struct ib_pd *pd,
         struct mlx4_ib_qp *qp = NULL;
         int err;
         u16 xrcdn = 0;
+        gfp_t gfp;
 
+        gfp = (init_attr->create_flags & MLX4_IB_QP_CREATE_USE_GFP_NOIO) ?
+                GFP_NOIO : GFP_KERNEL;
         /*
          * We only support LSO, vendor flag1, and multicast loopback blocking,
          * and only for kernel UD QPs.
@@ -1049,7 +1052,8 @@ struct ib_qp *mlx4_ib_create_qp(struct ib_pd *pd,
                                         MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK |
                                         MLX4_IB_SRIOV_TUNNEL_QP |
                                         MLX4_IB_SRIOV_SQP |
-                                        MLX4_IB_QP_NETIF))
+                                        MLX4_IB_QP_NETIF |
+                                        MLX4_IB_QP_CREATE_USE_GFP_NOIO))
                 return ERR_PTR(-EINVAL);
 
         if (init_attr->create_flags & IB_QP_CREATE_NETIF_QP) {
@@ -1059,7 +1063,7 @@ struct ib_qp *mlx4_ib_create_qp(struct ib_pd *pd,
 
         if (init_attr->create_flags &&
             (udata ||
-             ((init_attr->create_flags & ~MLX4_IB_SRIOV_SQP) &&
+             ((init_attr->create_flags & ~(MLX4_IB_SRIOV_SQP | MLX4_IB_QP_CREATE_USE_GFP_NOIO)) &&
               init_attr->qp_type != IB_QPT_UD) ||
              ((init_attr->create_flags & MLX4_IB_SRIOV_SQP) &&
               init_attr->qp_type > IB_QPT_GSI)))
@@ -1079,7 +1083,7 @@ struct ib_qp *mlx4_ib_create_qp(struct ib_pd *pd,
         case IB_QPT_RC:
         case IB_QPT_UC:
         case IB_QPT_RAW_PACKET:
-                qp = kzalloc(sizeof *qp, GFP_KERNEL);
+                qp = kzalloc(sizeof *qp, gfp);
                 if (!qp)
                         return ERR_PTR(-ENOMEM);
                 qp->pri.vid = 0xFFFF;
@@ -1088,7 +1092,7 @@ struct ib_qp *mlx4_ib_create_qp(struct ib_pd *pd,
         case IB_QPT_UD:
         {
                 err = create_qp_common(to_mdev(pd->device), pd, init_attr,
-                                       udata, 0, &qp);
+                                       udata, 0, &qp, gfp);
                 if (err)
                         return ERR_PTR(err);
 
@@ -1106,7 +1110,7 @@ struct ib_qp *mlx4_ib_create_qp(struct ib_pd *pd,
 
                 err = create_qp_common(to_mdev(pd->device), pd, init_attr, udata,
                                        get_sqp_num(to_mdev(pd->device), init_attr),
-                                       &qp);
+                                       &qp, gfp);
                 if (err)
                         return ERR_PTR(err);
 
diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c
index 60c5fb025fc7..62d9285300af 100644
--- a/drivers/infiniband/hw/mlx4/srq.c
+++ b/drivers/infiniband/hw/mlx4/srq.c
@@ -134,13 +134,14 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
                 if (err)
                         goto err_mtt;
         } else {
-                err = mlx4_db_alloc(dev->dev, &srq->db, 0);
+                err = mlx4_db_alloc(dev->dev, &srq->db, 0, GFP_KERNEL);
                 if (err)
                         goto err_srq;
 
                 *srq->db.db = 0;
 
-                if (mlx4_buf_alloc(dev->dev, buf_size, PAGE_SIZE * 2, &srq->buf)) {
+                if (mlx4_buf_alloc(dev->dev, buf_size, PAGE_SIZE * 2, &srq->buf,
+                                   GFP_KERNEL)) {
                         err = -ENOMEM;
                         goto err_db;
                 }
@@ -165,7 +166,7 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
                 if (err)
                         goto err_buf;
 
-                err = mlx4_buf_write_mtt(dev->dev, &srq->mtt, &srq->buf);
+                err = mlx4_buf_write_mtt(dev->dev, &srq->mtt, &srq->buf, GFP_KERNEL);
                 if (err)
                         goto err_mtt;