[PATCH rdma-rc] RDMA/mlx5: Fix query DCT via DEVX

[PATCH rdma-rc] RDMA/mlx5: Fix query DCT via DEVX

[Leon Romanovsky]

From: Maor Gottlieb <maorg@nvidia.com>

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")
Reviewed-by: Yishai Hadas <yishaih@nvidia.com>
Signed-off-by: Maor Gottlieb <maorg@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
---
 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 72a0828388de..53dc67e16d03 100644
--- a/drivers/infiniband/hw/mlx5/devx.c
+++ b/drivers/infiniband/hw/mlx5/devx.c
@@ -630,9 +630,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;
@@ -649,10 +648,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.31.1

Re: [PATCH rdma-rc] RDMA/mlx5: Fix query DCT via DEVX

[Jason Gunthorpe]

On Wed, May 19, 2021 at 11:41:32AM +0300, Leon Romanovsky wrote:
> From: Maor Gottlieb <maorg@nvidia.com>
> 
> 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")
> Reviewed-by: Yishai Hadas <yishaih@nvidia.com>
> Signed-off-by: Maor Gottlieb <maorg@nvidia.com>
> Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
> ---
>  drivers/infiniband/hw/mlx5/devx.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)

Applied to for-rc, thanks

Jason