Commit f10242b3 authored by Konstantin Taranov's avatar Konstantin Taranov Committed by Leon Romanovsky
Browse files

RDMA/mana_ib: Use struct mana_ib_queue for RAW QPs 



Use struct mana_ib_queue and its helpers for RAW QPs

Signed-off-by: default avatarKonstantin Taranov <kotaranov@microsoft.com>
Link: https://lore.kernel.org/r/1711483688-24358-5-git-send-email-kotaranov@linux.microsoft.com


Reviewed-by: default avatarLong Li <longli@microsoft.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 688bac28

drivers/infiniband/hw/mana/mana_ib.h

+2 −6
Original line number Diff line number Diff line
@@ -94,12 +94,8 @@ struct mana_ib_cq { 
struct mana_ib_qp {

	struct ib_qp ibqp;



	/* Work queue info */

	struct ib_umem *sq_umem;

	int sqe;

	u64 sq_gdma_region;

	u64 sq_id;

	mana_handle_t tx_object;

	mana_handle_t qp_handle;

	struct mana_ib_queue raw_sq;



	/* The port on the IB device, starting with 1 */

	u32 port;

drivers/infiniband/hw/mana/qp.c

+16 −40
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, 
	struct mana_obj_spec cq_spec = {};

	struct mana_port_context *mpc;

	struct net_device *ndev;

	struct ib_umem *umem;

	struct mana_eq *eq;

	int eq_vec;

	u32 port;
@@ -346,32 +345,15 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, 
	ibdev_dbg(&mdev->ib_dev, "ucmd sq_buf_addr 0x%llx port %u\n",

		  ucmd.sq_buf_addr, ucmd.port);



	umem = ib_umem_get(ibpd->device, ucmd.sq_buf_addr, ucmd.sq_buf_size,

			   IB_ACCESS_LOCAL_WRITE);

	if (IS_ERR(umem)) {

		err = PTR_ERR(umem);

		ibdev_dbg(&mdev->ib_dev,

			  "Failed to get umem for create qp-raw, err %d\n",

			  err);

		goto err_free_vport;

	}

	qp->sq_umem = umem;



	err = mana_ib_create_zero_offset_dma_region(mdev, qp->sq_umem,

						    &qp->sq_gdma_region);

	err = mana_ib_create_queue(mdev, ucmd.sq_buf_addr, ucmd.sq_buf_size, &qp->raw_sq);

	if (err) {

		ibdev_dbg(&mdev->ib_dev,

			  "Failed to create dma region for create qp-raw, %d\n",

			  err);

		goto err_release_umem;

			  "Failed to create queue for create qp-raw, err %d\n", err);

		goto err_free_vport;

	}



	ibdev_dbg(&mdev->ib_dev,

		  "create_dma_region ret %d gdma_region 0x%llx\n",

		  err, qp->sq_gdma_region);



	/* Create a WQ on the same port handle used by the Ethernet */

	wq_spec.gdma_region = qp->sq_gdma_region;

	wq_spec.gdma_region = qp->raw_sq.gdma_region;

	wq_spec.queue_size = ucmd.sq_buf_size;



	cq_spec.gdma_region = send_cq->queue.gdma_region;
@@ -382,19 +364,19 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, 
	cq_spec.attached_eq = eq->eq->id;



	err = mana_create_wq_obj(mpc, mpc->port_handle, GDMA_SQ, &wq_spec,

				 &cq_spec, &qp->tx_object);

				 &cq_spec, &qp->qp_handle);

	if (err) {

		ibdev_dbg(&mdev->ib_dev,

			  "Failed to create wq for create raw-qp, err %d\n",

			  err);

		goto err_destroy_dma_region;

		goto err_destroy_queue;

	}



	/* The GDMA regions are now owned by the WQ object */

	qp->sq_gdma_region = GDMA_INVALID_DMA_REGION;

	qp->raw_sq.gdma_region = GDMA_INVALID_DMA_REGION;

	send_cq->queue.gdma_region = GDMA_INVALID_DMA_REGION;



	qp->sq_id = wq_spec.queue_index;

	qp->raw_sq.id = wq_spec.queue_index;

	send_cq->queue.id = cq_spec.queue_index;



	/* Create CQ table entry */
@@ -403,10 +385,10 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, 
		goto err_destroy_wq_obj;



	ibdev_dbg(&mdev->ib_dev,

		  "ret %d qp->tx_object 0x%llx sq id %llu cq id %llu\n", err,

		  qp->tx_object, qp->sq_id, send_cq->queue.id);

		  "ret %d qp->qp_handle 0x%llx sq id %llu cq id %llu\n", err,

		  qp->qp_handle, qp->raw_sq.id, send_cq->queue.id);



	resp.sqid = qp->sq_id;

	resp.sqid = qp->raw_sq.id;

	resp.cqid = send_cq->queue.id;

	resp.tx_vp_offset = pd->tx_vp_offset;
@@ -425,13 +407,10 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, 
	gc->cq_table[send_cq->queue.id] = NULL;



err_destroy_wq_obj:

	mana_destroy_wq_obj(mpc, GDMA_SQ, qp->tx_object);

	mana_destroy_wq_obj(mpc, GDMA_SQ, qp->qp_handle);



err_destroy_dma_region:

	mana_ib_gd_destroy_dma_region(mdev, qp->sq_gdma_region);



err_release_umem:

	ib_umem_release(umem);

err_destroy_queue:

	mana_ib_destroy_queue(mdev, &qp->raw_sq);



err_free_vport:

	mana_ib_uncfg_vport(mdev, pd, port);
@@ -505,12 +484,9 @@ static int mana_ib_destroy_qp_raw(struct mana_ib_qp *qp, struct ib_udata *udata) 
	mpc = netdev_priv(ndev);

	pd = container_of(ibpd, struct mana_ib_pd, ibpd);



	mana_destroy_wq_obj(mpc, GDMA_SQ, qp->tx_object);

	mana_destroy_wq_obj(mpc, GDMA_SQ, qp->qp_handle);



	if (qp->sq_umem) {

		mana_ib_gd_destroy_dma_region(mdev, qp->sq_gdma_region);

		ib_umem_release(qp->sq_umem);

	}

	mana_ib_destroy_queue(mdev, &qp->raw_sq);



	mana_ib_uncfg_vport(mdev, pd, qp->port);