Commit 9e2a187a authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Jason Gunthorpe
Browse files

RDMA: Add a dedicated CQ resource tracker function 

In order to avoid double multiplexing of the resource when it is a CQ, add
a dedicated callback function.

Link: https://lore.kernel.org/r/20200623113043.1228482-6-leon@kernel.org


Signed-off-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent f4434529

drivers/infiniband/core/device.c

+1 −0
Original line number Diff line number Diff line
@@ -2617,6 +2617,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops) 
	SET_DEVICE_OP(dev_ops, drain_rq);

	SET_DEVICE_OP(dev_ops, drain_sq);

	SET_DEVICE_OP(dev_ops, enable_driver);

	SET_DEVICE_OP(dev_ops, fill_res_cq_entry);

	SET_DEVICE_OP(dev_ops, fill_res_entry);

	SET_DEVICE_OP(dev_ops, fill_res_mr_entry);

	SET_DEVICE_OP(dev_ops, fill_stat_mr_entry);

drivers/infiniband/core/nldev.c

+2 −3
Original line number Diff line number Diff line
@@ -598,9 +598,8 @@ static int fill_res_cq_entry(struct sk_buff *msg, bool has_cap_net_admin, 
	if (fill_res_name_pid(msg, res))

		goto err;



	if (fill_res_entry(dev, msg, res))

		goto err;



	if (dev->ops.fill_res_cq_entry)

		return dev->ops.fill_res_cq_entry(msg, cq);

	return 0;



err:	return -EMSGSIZE;

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+1 −0
Original line number Diff line number Diff line
@@ -1056,6 +1056,7 @@ struct c4iw_wr_wait *c4iw_alloc_wr_wait(gfp_t gfp); 
typedef int c4iw_restrack_func(struct sk_buff *msg,

			       struct rdma_restrack_entry *res);

int c4iw_fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ibmr);

int c4iw_fill_res_cq_entry(struct sk_buff *msg, struct ib_cq *ibcq);

extern c4iw_restrack_func *c4iw_restrack_funcs[RDMA_RESTRACK_MAX];



#endif

drivers/infiniband/hw/cxgb4/provider.c

+1 −0
Original line number Diff line number Diff line
@@ -485,6 +485,7 @@ static const struct ib_device_ops c4iw_dev_ops = { 
	.destroy_cq = c4iw_destroy_cq,

	.destroy_qp = c4iw_destroy_qp,

	.destroy_srq = c4iw_destroy_srq,

	.fill_res_cq_entry = c4iw_fill_res_cq_entry,

	.fill_res_entry = fill_res_entry,

	.fill_res_mr_entry = c4iw_fill_res_mr_entry,

	.get_dev_fw_str = get_dev_fw_str,

drivers/infiniband/hw/cxgb4/restrack.c

+1 −4
Original line number Diff line number Diff line
@@ -372,10 +372,8 @@ static int fill_swcqes(struct sk_buff *msg, struct t4_cq *cq, 
	return -EMSGSIZE;

}



static int fill_res_cq_entry(struct sk_buff *msg,

			     struct rdma_restrack_entry *res)

int c4iw_fill_res_cq_entry(struct sk_buff *msg, struct ib_cq *ibcq)

{

	struct ib_cq *ibcq = container_of(res, struct ib_cq, res);

	struct c4iw_cq *chp = to_c4iw_cq(ibcq);

	struct nlattr *table_attr;

	struct t4_cqe hwcqes[2];
@@ -494,5 +492,4 @@ int c4iw_fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ibmr) 
c4iw_restrack_func *c4iw_restrack_funcs[RDMA_RESTRACK_MAX] = {

	[RDMA_RESTRACK_QP]	= fill_res_qp_entry,

	[RDMA_RESTRACK_CM_ID]	= fill_res_ep_entry,

	[RDMA_RESTRACK_CQ]	= fill_res_cq_entry,

};