Commit 3b023e1b authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/core: Create and destroy counters in the ib_core 

Move allocation and destruction of counters under ib_core responsibility

Link: https://lore.kernel.org/r/20200630101855.368895-2-leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 6c01e6b2

drivers/infiniband/core/device.c

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



	SET_OBJ_SIZE(dev_ops, ib_ah);

	SET_OBJ_SIZE(dev_ops, ib_counters);

	SET_OBJ_SIZE(dev_ops, ib_cq);

	SET_OBJ_SIZE(dev_ops, ib_pd);

	SET_OBJ_SIZE(dev_ops, ib_srq);

drivers/infiniband/core/uverbs_std_types_counters.c

+9 −8
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ static int uverbs_free_counters(struct ib_uobject *uobject, 
	if (ret)

		return ret;



	return counters->device->ops.destroy_counters(counters);

	counters->device->ops.destroy_counters(counters);

	kfree(counters);

	return 0;

}



static int UVERBS_HANDLER(UVERBS_METHOD_COUNTERS_CREATE)(
@@ -66,20 +68,19 @@ static int UVERBS_HANDLER(UVERBS_METHOD_COUNTERS_CREATE)( 
	if (!ib_dev->ops.create_counters)

		return -EOPNOTSUPP;



	counters = ib_dev->ops.create_counters(ib_dev, attrs);

	if (IS_ERR(counters)) {

		ret = PTR_ERR(counters);

		goto err_create_counters;

	}

	counters = rdma_zalloc_drv_obj(ib_dev, ib_counters);

	if (!counters)

		return -ENOMEM;



	counters->device = ib_dev;

	counters->uobject = uobj;

	uobj->object = counters;

	atomic_set(&counters->usecnt, 0);



	return 0;

	ret = ib_dev->ops.create_counters(counters, attrs);

	if (ret)

		kfree(counters);



err_create_counters:

	return ret;

}

drivers/infiniband/hw/mlx5/main.c

+6 −14
Original line number Diff line number Diff line
@@ -6455,7 +6455,7 @@ static int mlx5_ib_read_counters(struct ib_counters *counters, 
	return ret;

}



static int mlx5_ib_destroy_counters(struct ib_counters *counters)

static void mlx5_ib_destroy_counters(struct ib_counters *counters)

{

	struct mlx5_ib_mcounters *mcounters = to_mcounters(counters);
@@ -6463,24 +6463,15 @@ static int mlx5_ib_destroy_counters(struct ib_counters *counters) 
	if (mcounters->hw_cntrs_hndl)

		mlx5_fc_destroy(to_mdev(counters->device)->mdev,

				mcounters->hw_cntrs_hndl);



	kfree(mcounters);



	return 0;

}



static struct ib_counters *mlx5_ib_create_counters(struct ib_device *device,

static int mlx5_ib_create_counters(struct ib_counters *counters,

				   struct uverbs_attr_bundle *attrs)

{

	struct mlx5_ib_mcounters *mcounters;



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

	if (!mcounters)

		return ERR_PTR(-ENOMEM);

	struct mlx5_ib_mcounters *mcounters = to_mcounters(counters);



	mutex_init(&mcounters->mcntrs_mutex);



	return &mcounters->ibcntrs;

	return 0;

}



static void mlx5_ib_stage_init_cleanup(struct mlx5_ib_dev *dev)
@@ -6648,6 +6639,7 @@ static const struct ib_device_ops mlx5_ib_dev_ops = { 
	.resize_cq = mlx5_ib_resize_cq,



	INIT_RDMA_OBJ_SIZE(ib_ah, mlx5_ib_ah, ibah),

	INIT_RDMA_OBJ_SIZE(ib_counters, mlx5_ib_mcounters, ibcntrs),

	INIT_RDMA_OBJ_SIZE(ib_cq, mlx5_ib_cq, ibcq),

	INIT_RDMA_OBJ_SIZE(ib_pd, mlx5_ib_pd, ibpd),

	INIT_RDMA_OBJ_SIZE(ib_srq, mlx5_ib_srq, ibsrq),

include/rdma/ib_verbs.h

+4 −3
Original line number Diff line number Diff line
@@ -2540,9 +2540,9 @@ struct ib_device_ops { 
	struct ib_mr *(*reg_dm_mr)(struct ib_pd *pd, struct ib_dm *dm,

				   struct ib_dm_mr_attr *attr,

				   struct uverbs_attr_bundle *attrs);

	struct ib_counters *(*create_counters)(

		struct ib_device *device, struct uverbs_attr_bundle *attrs);

	int (*destroy_counters)(struct ib_counters *counters);

	int (*create_counters)(struct ib_counters *counters,

			       struct uverbs_attr_bundle *attrs);

	void (*destroy_counters)(struct ib_counters *counters);

	int (*read_counters)(struct ib_counters *counters,

			     struct ib_counters_read_attr *counters_read_attr,

			     struct uverbs_attr_bundle *attrs);
@@ -2650,6 +2650,7 @@ struct ib_device_ops { 
			      struct uverbs_attr_bundle *attrs);



	DECLARE_RDMA_OBJ_SIZE(ib_ah);

	DECLARE_RDMA_OBJ_SIZE(ib_counters);

	DECLARE_RDMA_OBJ_SIZE(ib_cq);

	DECLARE_RDMA_OBJ_SIZE(ib_pd);

	DECLARE_RDMA_OBJ_SIZE(ib_srq);