Several QP and WQ size checks in qp.c compute their limit as 1 << cap, where cap is an 8-bit log_max_* FW capability. An untrusted NIC can report 31 or more, which makes the shift undefined. Use MLX5_CAP_GEN_LOGSZ_U32() for these limits, as done for log_max_cq_sz. Signed-off-by: Yishai Hadas --- drivers/infiniband/hw/mlx5/qp.c | 36 +++++++++++++++------------------ 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index 05e8e75d734f..d784a35675d5 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -447,7 +447,7 @@ static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap, int wq_size; /* Sanity check RQ size before proceeding */ - if (cap->max_recv_wr > (1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz))) + if (cap->max_recv_wr > MLX5_CAP_GEN_LOGSZ_U32(dev->mdev, log_max_qp_sz)) return -EINVAL; if (!has_rq) { @@ -621,11 +621,11 @@ static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr, wq_size = roundup_pow_of_two(attr->cap.max_send_wr * wqe_size); qp->sq.wqe_cnt = wq_size / MLX5_SEND_WQE_BB; - if (qp->sq.wqe_cnt > (1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz))) { - mlx5_ib_dbg(dev, "send queue size (%d * %d / %d -> %d) exceeds limits(%d)\n", + if (qp->sq.wqe_cnt > MLX5_CAP_GEN_LOGSZ_U32(dev->mdev, log_max_qp_sz)) { + mlx5_ib_dbg(dev, "send queue size (%d * %d / %d -> %d) exceeds limits(%u)\n", attr->cap.max_send_wr, wqe_size, MLX5_SEND_WQE_BB, qp->sq.wqe_cnt, - 1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz)); + MLX5_CAP_GEN_LOGSZ_U32(dev->mdev, log_max_qp_sz)); return -ENOMEM; } qp->sq.wqe_shift = ilog2(MLX5_SEND_WQE_BB); @@ -663,10 +663,10 @@ static int set_user_buf_size(struct mlx5_ib_dev *dev, qp->sq.wqe_cnt = ucmd->sq_wqe_count; - if (qp->sq.wqe_cnt > (1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz))) { - mlx5_ib_warn(dev, "wqe_cnt %d, max_wqes %d\n", + if (qp->sq.wqe_cnt > MLX5_CAP_GEN_LOGSZ_U32(dev->mdev, log_max_qp_sz)) { + mlx5_ib_warn(dev, "wqe_cnt %d, max_wqes %u\n", qp->sq.wqe_cnt, - 1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz)); + MLX5_CAP_GEN_LOGSZ_U32(dev->mdev, log_max_qp_sz)); return -EINVAL; } @@ -2155,7 +2155,7 @@ static int create_dci(struct mlx5_ib_dev *dev, struct ib_pd *pd, ucmd->rq_wqe_count != qp->rq.wqe_cnt) return -EINVAL; - if (ucmd->sq_wqe_count > (1 << MLX5_CAP_GEN(mdev, log_max_qp_sz))) + if (ucmd->sq_wqe_count > MLX5_CAP_GEN_LOGSZ_U32(mdev, log_max_qp_sz)) return -EINVAL; ts_format = get_qp_ts_format(dev, to_mcq(init_attr->send_cq), @@ -2322,7 +2322,7 @@ static int create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd, ucmd->rq_wqe_count != qp->rq.wqe_cnt) return -EINVAL; - if (ucmd->sq_wqe_count > (1 << MLX5_CAP_GEN(mdev, log_max_qp_sz))) + if (ucmd->sq_wqe_count > MLX5_CAP_GEN_LOGSZ_U32(mdev, log_max_qp_sz)) return -EINVAL; if (init_attr->qp_type != IB_QPT_RAW_PACKET) { @@ -4809,19 +4809,15 @@ static bool mlx5_ib_modify_qp_allowed(struct mlx5_ib_dev *dev, static int validate_rd_atomic(struct mlx5_ib_dev *dev, struct ib_qp_attr *attr, int attr_mask, enum ib_qp_type qp_type) { - int log_max_ra_res; - int log_max_ra_req; + u32 log_max_ra_res; + u32 log_max_ra_req; if (qp_type == MLX5_IB_QPT_DCI) { - log_max_ra_res = 1 << MLX5_CAP_GEN(dev->mdev, - log_max_ra_res_dc); - log_max_ra_req = 1 << MLX5_CAP_GEN(dev->mdev, - log_max_ra_req_dc); + log_max_ra_res = MLX5_CAP_GEN_LOGSZ_U32(dev->mdev, log_max_ra_res_dc); + log_max_ra_req = MLX5_CAP_GEN_LOGSZ_U32(dev->mdev, log_max_ra_req_dc); } else { - log_max_ra_res = 1 << MLX5_CAP_GEN(dev->mdev, - log_max_ra_res_qp); - log_max_ra_req = 1 << MLX5_CAP_GEN(dev->mdev, - log_max_ra_req_qp); + log_max_ra_res = MLX5_CAP_GEN_LOGSZ_U32(dev->mdev, log_max_ra_res_qp); + log_max_ra_req = MLX5_CAP_GEN_LOGSZ_U32(dev->mdev, log_max_ra_req_qp); } if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC && @@ -5511,7 +5507,7 @@ static int set_user_rq_size(struct mlx5_ib_dev *dev, struct mlx5_ib_rwq *rwq) { /* Sanity check RQ size before proceeding */ - if (wq_init_attr->max_wr > (1 << MLX5_CAP_GEN(dev->mdev, log_max_wq_sz))) + if (wq_init_attr->max_wr > MLX5_CAP_GEN_LOGSZ_U32(dev->mdev, log_max_wq_sz)) return -EINVAL; if (!ucmd->rq_wqe_count) -- 2.18.1