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

RDMA/mana_ib: Introduce mana_ib_install_cq_cb helper function 



Use a helper function to install callbacks to CQs.
This patch removes code repetition.

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


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 3b73eb3a

drivers/infiniband/hw/mana/cq.c

+20 −1
Original line number Diff line number Diff line
@@ -100,10 +100,29 @@ int mana_ib_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata) 
	return 0;

}



void mana_ib_cq_handler(void *ctx, struct gdma_queue *gdma_cq)

static void mana_ib_cq_handler(void *ctx, struct gdma_queue *gdma_cq)

{

	struct mana_ib_cq *cq = ctx;



	if (cq->ibcq.comp_handler)

		cq->ibcq.comp_handler(&cq->ibcq, cq->ibcq.cq_context);

}



int mana_ib_install_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)

{

	struct gdma_context *gc = mdev_to_gc(mdev);

	struct gdma_queue *gdma_cq;



	/* Create CQ table entry */

	WARN_ON(gc->cq_table[cq->id]);

	gdma_cq = kzalloc(sizeof(*gdma_cq), GFP_KERNEL);

	if (!gdma_cq)

		return -ENOMEM;



	gdma_cq->cq.context = cq;

	gdma_cq->type = GDMA_CQ;

	gdma_cq->cq.callback = mana_ib_cq_handler;

	gdma_cq->id = cq->id;

	gc->cq_table[cq->id] = gdma_cq;

	return 0;

}

drivers/infiniband/hw/mana/mana_ib.h

+2 −2
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ static inline struct net_device *mana_ib_get_netdev(struct ib_device *ibdev, u32 
	return mc->ports[port - 1];

}



int mana_ib_install_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq);



int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem,

				 mana_handle_t *gdma_region);
@@ -226,6 +228,4 @@ int mana_ib_query_gid(struct ib_device *ibdev, u32 port, int index, 
void mana_ib_disassociate_ucontext(struct ib_ucontext *ibcontext);



int mana_ib_gd_query_adapter_caps(struct mana_ib_dev *mdev);



void mana_ib_cq_handler(void *ctx, struct gdma_queue *gdma_cq);

#endif

drivers/infiniband/hw/mana/qp.c

+5 −23
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp, struct ib_pd *pd, 
	struct gdma_queue **gdma_cq_allocated;

	mana_handle_t *mana_ind_table;

	struct mana_port_context *mpc;

	struct gdma_queue *gdma_cq;

	unsigned int ind_tbl_size;

	struct net_device *ndev;

	struct mana_ib_cq *cq;
@@ -229,19 +228,11 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp, struct ib_pd *pd, 
		mana_ind_table[i] = wq->rx_object;



		/* Create CQ table entry */

		WARN_ON(gc->cq_table[cq->id]);

		gdma_cq = kzalloc(sizeof(*gdma_cq), GFP_KERNEL);

		if (!gdma_cq) {

			ret = -ENOMEM;

		ret = mana_ib_install_cq_cb(mdev, cq);

		if (ret)

			goto fail;

		}

		gdma_cq_allocated[i] = gdma_cq;



		gdma_cq->cq.context = cq;

		gdma_cq->type = GDMA_CQ;

		gdma_cq->cq.callback = mana_ib_cq_handler;

		gdma_cq->id = cq->id;

		gc->cq_table[cq->id] = gdma_cq;

		gdma_cq_allocated[i] = gc->cq_table[cq->id];

	}

	resp.num_entries = i;
@@ -407,18 +398,9 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, 
	send_cq->id = cq_spec.queue_index;



	/* Create CQ table entry */

	WARN_ON(gc->cq_table[send_cq->id]);

	gdma_cq = kzalloc(sizeof(*gdma_cq), GFP_KERNEL);

	if (!gdma_cq) {

		err = -ENOMEM;

	err = mana_ib_install_cq_cb(mdev, send_cq);

	if (err)

		goto err_destroy_wq_obj;

	}



	gdma_cq->cq.context = send_cq;

	gdma_cq->type = GDMA_CQ;

	gdma_cq->cq.callback = mana_ib_cq_handler;

	gdma_cq->id = send_cq->id;

	gc->cq_table[send_cq->id] = gdma_cq;



	ibdev_dbg(&mdev->ib_dev,

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