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

RDMA: Add dedicated MR resource tracker function 

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

Link: https://lore.kernel.org/r/20200623113043.1228482-5-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 24fd6d6f

drivers/infiniband/core/device.c

+2 −1
Original line number Diff line number Diff line
@@ -2618,7 +2618,8 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops) 
	SET_DEVICE_OP(dev_ops, drain_sq);

	SET_DEVICE_OP(dev_ops, enable_driver);

	SET_DEVICE_OP(dev_ops, fill_res_entry);

	SET_DEVICE_OP(dev_ops, fill_stat_entry);

	SET_DEVICE_OP(dev_ops, fill_res_mr_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);

	SET_DEVICE_OP(dev_ops, get_hw_stats);

drivers/infiniband/core/nldev.c

+4 −14
Original line number Diff line number Diff line
@@ -454,14 +454,6 @@ static bool fill_res_entry(struct ib_device *dev, struct sk_buff *msg, 
	return dev->ops.fill_res_entry(msg, res);

}



static bool fill_stat_entry(struct ib_device *dev, struct sk_buff *msg,

			    struct rdma_restrack_entry *res)

{

	if (!dev->ops.fill_stat_entry)

		return false;

	return dev->ops.fill_stat_entry(msg, res);

}



static int fill_res_qp_entry(struct sk_buff *msg, bool has_cap_net_admin,

			     struct rdma_restrack_entry *res, uint32_t port)

{
@@ -641,9 +633,8 @@ static int fill_res_mr_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_mr_entry)

		return dev->ops.fill_res_mr_entry(msg, mr);

	return 0;



err:	return -EMSGSIZE;
@@ -786,9 +777,8 @@ static int fill_stat_mr_entry(struct sk_buff *msg, bool has_cap_net_admin, 
	if (nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_MRN, res->id))

		goto err;



	if (fill_stat_entry(dev, msg, res))

		goto err;



	if (dev->ops.fill_stat_mr_entry)

		return dev->ops.fill_stat_mr_entry(msg, mr);

	return 0;



err:

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

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

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
@@ -486,6 +486,7 @@ static const struct ib_device_ops c4iw_dev_ops = { 
	.destroy_qp = c4iw_destroy_qp,

	.destroy_srq = c4iw_destroy_srq,

	.fill_res_entry = fill_res_entry,

	.fill_res_mr_entry = c4iw_fill_res_mr_entry,

	.get_dev_fw_str = get_dev_fw_str,

	.get_dma_mr = c4iw_get_dma_mr,

	.get_hw_stats = c4iw_get_mib,

drivers/infiniband/hw/cxgb4/restrack.c

+1 −4
Original line number Diff line number Diff line
@@ -433,10 +433,8 @@ static int fill_res_cq_entry(struct sk_buff *msg, 
	return -EMSGSIZE;

}



static int fill_res_mr_entry(struct sk_buff *msg,

			     struct rdma_restrack_entry *res)

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

{

	struct ib_mr *ibmr = container_of(res, struct ib_mr, res);

	struct c4iw_mr *mhp = to_c4iw_mr(ibmr);

	struct c4iw_dev *dev = mhp->rhp;

	u32 stag = mhp->attr.stag;
@@ -497,5 +495,4 @@ 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,

	[RDMA_RESTRACK_MR]	= fill_res_mr_entry,

};