Commit 0dc0da15 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/mlx5: Rework custom driver QP type creation 

Starting from commit 2b1f7470 ("RDMA/core: Allow drivers to disable
restrack DB") the restrack is able to handle non-standard QP types either.

That change allows us to rewrite custom QP calls to their IB/core
counterparts, so we will use general QP creation flow even for the driver
QP types.

Link: https://lore.kernel.org/r/51682ab82298748941f38bd23ee3bf77ef1cab7b.1627040189.git.leonro@nvidia.com


Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 8c9e7f03

drivers/infiniband/hw/mlx5/gsi.c

+2 −13
Original line number Diff line number Diff line
@@ -145,24 +145,13 @@ int mlx5_ib_create_gsi(struct ib_pd *pd, struct mlx5_ib_qp *mqp, 
		hw_init_attr.cap.max_inline_data = 0;

	}



	gsi->rx_qp = mlx5_ib_create_qp(pd, &hw_init_attr, NULL);

	gsi->rx_qp = ib_create_qp(pd, &hw_init_attr);

	if (IS_ERR(gsi->rx_qp)) {

		mlx5_ib_warn(dev, "unable to create hardware GSI QP. error %ld\n",

			     PTR_ERR(gsi->rx_qp));

		ret = PTR_ERR(gsi->rx_qp);

		goto err_destroy_cq;

	}

	gsi->rx_qp->device = pd->device;

	gsi->rx_qp->pd = pd;

	gsi->rx_qp->real_qp = gsi->rx_qp;



	gsi->rx_qp->qp_type = hw_init_attr.qp_type;

	gsi->rx_qp->send_cq = hw_init_attr.send_cq;

	gsi->rx_qp->recv_cq = hw_init_attr.recv_cq;

	gsi->rx_qp->event_handler = hw_init_attr.event_handler;

	spin_lock_init(&gsi->rx_qp->mr_lock);

	INIT_LIST_HEAD(&gsi->rx_qp->rdma_mrs);

	INIT_LIST_HEAD(&gsi->rx_qp->sig_mrs);



	dev->devr.ports[attr->port_num - 1].gsi = gsi;

	return 0;
@@ -184,7 +173,7 @@ int mlx5_ib_destroy_gsi(struct mlx5_ib_qp *mqp) 
	int qp_index;

	int ret;



	ret = mlx5_ib_destroy_qp(gsi->rx_qp, NULL);

	ret = ib_destroy_qp(gsi->rx_qp);

	if (ret) {

		mlx5_ib_warn(dev, "unable to destroy hardware GSI QP. error %d\n",

			     ret);

drivers/infiniband/hw/mlx5/main.c

+7 −13
Original line number Diff line number Diff line
@@ -4073,7 +4073,7 @@ static void mlx5_ib_stage_pre_ib_reg_umr_cleanup(struct mlx5_ib_dev *dev) 
		mlx5_ib_warn(dev, "mr cache cleanup failed\n");



	if (dev->umrc.qp)

		mlx5_ib_destroy_qp(dev->umrc.qp, NULL);

		ib_destroy_qp(dev->umrc.qp);

	if (dev->umrc.cq)

		ib_free_cq(dev->umrc.cq);

	if (dev->umrc.pd)
@@ -4126,23 +4126,17 @@ static int mlx5_ib_stage_post_ib_reg_umr_init(struct mlx5_ib_dev *dev) 
	init_attr->cap.max_send_sge = 1;

	init_attr->qp_type = MLX5_IB_QPT_REG_UMR;

	init_attr->port_num = 1;

	qp = mlx5_ib_create_qp(pd, init_attr, NULL);

	qp = ib_create_qp(pd, init_attr);

	if (IS_ERR(qp)) {

		mlx5_ib_dbg(dev, "Couldn't create sync UMR QP\n");

		ret = PTR_ERR(qp);

		goto error_3;

	}

	qp->device     = &dev->ib_dev;

	qp->real_qp    = qp;

	qp->uobject    = NULL;

	qp->qp_type    = MLX5_IB_QPT_REG_UMR;

	qp->send_cq    = init_attr->send_cq;

	qp->recv_cq    = init_attr->recv_cq;



	attr->qp_state = IB_QPS_INIT;

	attr->port_num = 1;

	ret = mlx5_ib_modify_qp(qp, attr, IB_QP_STATE | IB_QP_PKEY_INDEX |

				IB_QP_PORT, NULL);

	ret = ib_modify_qp(qp, attr,

			   IB_QP_STATE | IB_QP_PKEY_INDEX | IB_QP_PORT);

	if (ret) {

		mlx5_ib_dbg(dev, "Couldn't modify UMR QP\n");

		goto error_4;
@@ -4152,7 +4146,7 @@ static int mlx5_ib_stage_post_ib_reg_umr_init(struct mlx5_ib_dev *dev) 
	attr->qp_state = IB_QPS_RTR;

	attr->path_mtu = IB_MTU_256;



	ret = mlx5_ib_modify_qp(qp, attr, IB_QP_STATE, NULL);

	ret = ib_modify_qp(qp, attr, IB_QP_STATE);

	if (ret) {

		mlx5_ib_dbg(dev, "Couldn't modify umr QP to rtr\n");

		goto error_4;
@@ -4160,7 +4154,7 @@ static int mlx5_ib_stage_post_ib_reg_umr_init(struct mlx5_ib_dev *dev) 


	memset(attr, 0, sizeof(*attr));

	attr->qp_state = IB_QPS_RTS;

	ret = mlx5_ib_modify_qp(qp, attr, IB_QP_STATE, NULL);

	ret = ib_modify_qp(qp, attr, IB_QP_STATE);

	if (ret) {

		mlx5_ib_dbg(dev, "Couldn't modify umr QP to rts\n");

		goto error_4;
@@ -4183,7 +4177,7 @@ static int mlx5_ib_stage_post_ib_reg_umr_init(struct mlx5_ib_dev *dev) 
	return 0;



error_4:

	mlx5_ib_destroy_qp(qp, NULL);

	ib_destroy_qp(qp);

	dev->umrc.qp = NULL;



error_3:

drivers/infiniband/hw/mlx5/qp.c

+5 −1
Original line number Diff line number Diff line
@@ -2673,7 +2673,6 @@ static int create_dct(struct mlx5_ib_dev *dev, struct ib_pd *pd, 
	}



	qp->state = IB_QPS_RESET;

	rdma_restrack_no_track(&qp->ibqp.res);

	return 0;

}
@@ -3012,6 +3011,7 @@ static int create_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd, 
	switch (qp->type) {

	case MLX5_IB_QPT_DCT:

		err = create_dct(dev, pd, qp, params);

		rdma_restrack_no_track(&qp->ibqp.res);

		break;

	case MLX5_IB_QPT_DCI:

		err = create_dci(dev, pd, qp, params);
@@ -3022,6 +3022,10 @@ static int create_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd, 
	case IB_QPT_GSI:

		err = mlx5_ib_create_gsi(pd, qp, params->attr);

		break;

	case MLX5_IB_QPT_HW_GSI:

	case MLX5_IB_QPT_REG_UMR:

		rdma_restrack_no_track(&qp->ibqp.res);

		fallthrough;

	default:

		if (params->udata)

			err = create_user_qp(dev, pd, qp, params);