Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7b169f3 authored by Noa Osherovich's avatar Noa Osherovich Committed by Jason Gunthorpe
Browse files

IB/mlx5: Avoid passing an invalid QP type to firmware 



During QP creation, the mlx5 driver translates the QP type to an
internal value which is passed on to FW. There was no check to make
sure that the translated value is valid, and -EINVAL was coerced into
the mailbox command.

Current firmware refuses this as an invalid QP type, but future/past
firmware may do something else.

Fixes: 09a7d9ec ('{net,IB}/mlx5: QP/XRCD commands via mlx5 ifc')
Reviewed-by: default avatarIlya Lesokhin <ilyal@mellanox.com>
Signed-off-by: default avatarNoa Osherovich <noaos@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent da343b6d

drivers/infiniband/hw/mlx5/qp.c

+6 −1
Original line number Diff line number Diff line
@@ -1584,6 +1584,7 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd, 
	u32 uidx = MLX5_IB_DEFAULT_UIDX;

	struct mlx5_ib_create_qp ucmd;

	struct mlx5_ib_qp_base *base;

	int mlx5_st;

	void *qpc;

	u32 *in;

	int err;
@@ -1592,6 +1593,10 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd, 
	spin_lock_init(&qp->sq.lock);

	spin_lock_init(&qp->rq.lock);



	mlx5_st = to_mlx5_st(init_attr->qp_type);

	if (mlx5_st < 0)

		return -EINVAL;



	if (init_attr->rwq_ind_tbl) {

		if (!udata)

			return -ENOSYS;
@@ -1753,7 +1758,7 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd, 


	qpc = MLX5_ADDR_OF(create_qp_in, in, qpc);



	MLX5_SET(qpc, qpc, st, to_mlx5_st(init_attr->qp_type));

	MLX5_SET(qpc, qpc, st, mlx5_st);

	MLX5_SET(qpc, qpc, pm_state, MLX5_QP_PM_MIGRATED);



	if (init_attr->qp_type != MLX5_IB_QPT_REG_UMR)