Skip to content

Commit 8de8482

Browse files
maorgottliebrleon
authored andcommitted
RDMA/mlx5: Fix validation of max_rd_atomic caps for DC
Currently, when modifying DC, we validate max_rd_atomic user attribute against the RC cap, validate against DC. RC and DC QP types have different device limitations. This can cause userspace created DC QPs to malfunction. Fixes: c32a4f2 ("IB/mlx5: Add support for DC Initiator QP") Link: https://lore.kernel.org/r/0c5aee72cea188c3bb770f4207cce7abc9b6fc74.1672231736.git.leonro@nvidia.com Signed-off-by: Maor Gottlieb <[email protected]> Signed-off-by: Leon Romanovsky <[email protected]>
1 parent 38b50aa commit 8de8482

File tree

1 file changed

+35
-14
lines changed
  • drivers/infiniband/hw/mlx5

1 file changed

+35
-14
lines changed

drivers/infiniband/hw/mlx5/qp.c

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4502,6 +4502,40 @@ static bool mlx5_ib_modify_qp_allowed(struct mlx5_ib_dev *dev,
45024502
return false;
45034503
}
45044504

4505+
static int validate_rd_atomic(struct mlx5_ib_dev *dev, struct ib_qp_attr *attr,
4506+
int attr_mask, enum ib_qp_type qp_type)
4507+
{
4508+
int log_max_ra_res;
4509+
int log_max_ra_req;
4510+
4511+
if (qp_type == MLX5_IB_QPT_DCI) {
4512+
log_max_ra_res = 1 << MLX5_CAP_GEN(dev->mdev,
4513+
log_max_ra_res_dc);
4514+
log_max_ra_req = 1 << MLX5_CAP_GEN(dev->mdev,
4515+
log_max_ra_req_dc);
4516+
} else {
4517+
log_max_ra_res = 1 << MLX5_CAP_GEN(dev->mdev,
4518+
log_max_ra_res_qp);
4519+
log_max_ra_req = 1 << MLX5_CAP_GEN(dev->mdev,
4520+
log_max_ra_req_qp);
4521+
}
4522+
4523+
if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC &&
4524+
attr->max_rd_atomic > log_max_ra_res) {
4525+
mlx5_ib_dbg(dev, "invalid max_rd_atomic value %d\n",
4526+
attr->max_rd_atomic);
4527+
return false;
4528+
}
4529+
4530+
if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC &&
4531+
attr->max_dest_rd_atomic > log_max_ra_req) {
4532+
mlx5_ib_dbg(dev, "invalid max_dest_rd_atomic value %d\n",
4533+
attr->max_dest_rd_atomic);
4534+
return false;
4535+
}
4536+
return true;
4537+
}
4538+
45054539
int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
45064540
int attr_mask, struct ib_udata *udata)
45074541
{
@@ -4589,21 +4623,8 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
45894623
goto out;
45904624
}
45914625

4592-
if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC &&
4593-
attr->max_rd_atomic >
4594-
(1 << MLX5_CAP_GEN(dev->mdev, log_max_ra_res_qp))) {
4595-
mlx5_ib_dbg(dev, "invalid max_rd_atomic value %d\n",
4596-
attr->max_rd_atomic);
4597-
goto out;
4598-
}
4599-
4600-
if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC &&
4601-
attr->max_dest_rd_atomic >
4602-
(1 << MLX5_CAP_GEN(dev->mdev, log_max_ra_req_qp))) {
4603-
mlx5_ib_dbg(dev, "invalid max_dest_rd_atomic value %d\n",
4604-
attr->max_dest_rd_atomic);
4626+
if (!validate_rd_atomic(dev, attr, attr_mask, qp_type))
46054627
goto out;
4606-
}
46074628

46084629
if (cur_state == new_state && cur_state == IB_QPS_RESET) {
46094630
err = 0;

0 commit comments

Comments
 (0)