1 files changed, 15 insertions, 6 deletions

diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index ceb33327091a..8d4ed24aef93 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -310,8 +310,8 @@ static int set_rq_size(struct mlx4_ib_dev *dev, struct ib_qp_cap *cap,
                        int is_user, int has_rq, struct mlx4_ib_qp *qp)
 {
         /* Sanity check RQ size before proceeding */
-        if (cap->max_recv_wr  > dev->dev->caps.max_wqes  ||
-            cap->max_recv_sge > dev->dev->caps.max_rq_sg)
+        if (cap->max_recv_wr > dev->dev->caps.max_wqes - MLX4_IB_SQ_MAX_SPARE ||
+            cap->max_recv_sge > min(dev->dev->caps.max_sq_sg, dev->dev->caps.max_rq_sg))
                 return -EINVAL;
 
         if (!has_rq) {
@@ -329,8 +329,17 @@ static int set_rq_size(struct mlx4_ib_dev *dev, struct ib_qp_cap *cap,
                 qp->rq.wqe_shift = ilog2(qp->rq.max_gs * sizeof (struct mlx4_wqe_data_seg));
         }
 
-        cap->max_recv_wr  = qp->rq.max_post = qp->rq.wqe_cnt;
-        cap->max_recv_sge = qp->rq.max_gs;
+        /* leave userspace return values as they were, so as not to break ABI */
+        if (is_user) {
+                cap->max_recv_wr  = qp->rq.max_post = qp->rq.wqe_cnt;
+                cap->max_recv_sge = qp->rq.max_gs;
+        } else {
+                cap->max_recv_wr  = qp->rq.max_post =
+                        min(dev->dev->caps.max_wqes - MLX4_IB_SQ_MAX_SPARE, qp->rq.wqe_cnt);
+                cap->max_recv_sge = min(qp->rq.max_gs,
+                                        min(dev->dev->caps.max_sq_sg,
+                                            dev->dev->caps.max_rq_sg));
+        }
 
         return 0;
 }
@@ -341,8 +350,8 @@ static int set_kernel_sq_size(struct mlx4_ib_dev *dev, struct ib_qp_cap *cap,
         int s;
 
         /* Sanity check SQ size before proceeding */
-        if (cap->max_send_wr     > dev->dev->caps.max_wqes  ||
-            cap->max_send_sge    > dev->dev->caps.max_sq_sg ||
+        if (cap->max_send_wr  > (dev->dev->caps.max_wqes - MLX4_IB_SQ_MAX_SPARE) ||
+            cap->max_send_sge > min(dev->dev->caps.max_sq_sg, dev->dev->caps.max_rq_sg) ||
             cap->max_inline_data + send_wqe_overhead(type, qp->flags) +
             sizeof (struct mlx4_wqe_inline_seg) > dev->dev->caps.max_sq_desc_sz)
                 return -EINVAL;