| From 7e7d458fc6f29ee0c2c524667e945dab9dc26415 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 19 May 2021 11:41:32 +0300 |
| Subject: RDMA/mlx5: Fix query DCT via DEVX |
| |
| From: Maor Gottlieb <maorg@nvidia.com> |
| |
| [ Upstream commit cfa3b797118eda7d68f9ede9b1a0279192aca653 ] |
| |
| When executing DEVX command to query QP object, we need to take the QP |
| type from the mlx5_ib_qp struct which hold the driver specific QP types as |
| well, such as DC. |
| |
| Fixes: 34613eb1d2ad ("IB/mlx5: Enable modify and query verbs objects via DEVX") |
| Link: https://lore.kernel.org/r/6eee15d63f09bb70787488e0cf96216e2957f5aa.1621413654.git.leonro@nvidia.com |
| Reviewed-by: Yishai Hadas <yishaih@nvidia.com> |
| Signed-off-by: Maor Gottlieb <maorg@nvidia.com> |
| Signed-off-by: Leon Romanovsky <leonro@nvidia.com> |
| Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/infiniband/hw/mlx5/devx.c | 6 ++---- |
| 1 file changed, 2 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c |
| index efb9ec99b68b..06a873257619 100644 |
| --- a/drivers/infiniband/hw/mlx5/devx.c |
| +++ b/drivers/infiniband/hw/mlx5/devx.c |
| @@ -559,9 +559,8 @@ static bool devx_is_valid_obj_id(struct uverbs_attr_bundle *attrs, |
| case UVERBS_OBJECT_QP: |
| { |
| struct mlx5_ib_qp *qp = to_mqp(uobj->object); |
| - enum ib_qp_type qp_type = qp->ibqp.qp_type; |
| |
| - if (qp_type == IB_QPT_RAW_PACKET || |
| + if (qp->type == IB_QPT_RAW_PACKET || |
| (qp->flags & IB_QP_CREATE_SOURCE_QPN)) { |
| struct mlx5_ib_raw_packet_qp *raw_packet_qp = |
| &qp->raw_packet_qp; |
| @@ -578,10 +577,9 @@ static bool devx_is_valid_obj_id(struct uverbs_attr_bundle *attrs, |
| sq->tisn) == obj_id); |
| } |
| |
| - if (qp_type == MLX5_IB_QPT_DCT) |
| + if (qp->type == MLX5_IB_QPT_DCT) |
| return get_enc_obj_id(MLX5_CMD_OP_CREATE_DCT, |
| qp->dct.mdct.mqp.qpn) == obj_id; |
| - |
| return get_enc_obj_id(MLX5_CMD_OP_CREATE_QP, |
| qp->ibqp.qp_num) == obj_id; |
| } |
| -- |
| 2.30.2 |
| |
