Commit 5cc34116 authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Jason Gunthorpe
Browse files

RDMA: Add dedicated QP resource tracker function 

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

Link: https://lore.kernel.org/r/20200623113043.1228482-7-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 9e2a187a

drivers/infiniband/core/device.c

+1 −0
Original line number Diff line number Diff line
@@ -2620,6 +2620,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops) 
	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_res_qp_entry);

	SET_DEVICE_OP(dev_ops, fill_stat_mr_entry);

	SET_DEVICE_OP(dev_ops, get_dev_fw_str);

	SET_DEVICE_OP(dev_ops, get_dma_mr);

drivers/infiniband/core/nldev.c

+2 −3
Original line number Diff line number Diff line
@@ -507,9 +507,8 @@ static int fill_res_qp_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_qp_entry)

		return dev->ops.fill_res_qp_entry(msg, qp);

	return 0;



err:	return -EMSGSIZE;

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+1 −0
Original line number Diff line number Diff line
@@ -1057,6 +1057,7 @@ 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);

int c4iw_fill_res_qp_entry(struct sk_buff *msg, struct ib_qp *ibqp);

extern c4iw_restrack_func *c4iw_restrack_funcs[RDMA_RESTRACK_MAX];



#endif

drivers/infiniband/hw/cxgb4/restrack.c

+1 −4
Original line number Diff line number Diff line
@@ -134,10 +134,8 @@ static int fill_swsqes(struct sk_buff *msg, struct t4_sq *sq, 
	return -EMSGSIZE;

}



static int fill_res_qp_entry(struct sk_buff *msg,

			     struct rdma_restrack_entry *res)

int c4iw_fill_res_qp_entry(struct sk_buff *msg, struct ib_qp *ibqp)

{

	struct ib_qp *ibqp = container_of(res, struct ib_qp, res);

	struct t4_swsqe *fsp = NULL, *lsp = NULL;

	struct c4iw_qp *qhp = to_c4iw_qp(ibqp);

	u16 first_sq_idx = 0, last_sq_idx = 0;
@@ -490,6 +488,5 @@ 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,

};

include/rdma/ib_verbs.h

+1 −0
Original line number Diff line number Diff line
@@ -2585,6 +2585,7 @@ struct ib_device_ops { 
			      struct rdma_restrack_entry *entry);

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

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

	int (*fill_res_qp_entry)(struct sk_buff *msg, struct ib_qp *ibqp);



	/* Device lifecycle callbacks */

	/*