Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3301870 authored by Moshe Shemesh's avatar Moshe Shemesh Committed by Doug Ledford
Browse files

(IB, net)/mlx4: Add resource utilization support 



Adding visibility of resource usage of QPs, CQs and counters used by
virtual functions. This feature will be used to give the PF administrator
more data while debugging VF status. Usage info was added to ALLOC_RES
command, to notify the PF if the resource which is being reserved or
allocated for the VF will be used by kernel driver or by user verbs.

Updated reservation and allocation functions of QP, CQ and counter with
additional usage parameter.

Signed-off-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent ea30b966

drivers/infiniband/hw/mlx4/cq.c

+2 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev, 
			goto err_mtt;



		uar = &to_mucontext(context)->uar;

		cq->mcq.usage = MLX4_RES_USAGE_USER_VERBS;

	} else {

		err = mlx4_db_alloc(dev->dev, &cq->db, 1);

		if (err)
@@ -233,6 +234,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev, 
			goto err_db;



		uar = &dev->priv_uar;

		cq->mcq.usage = MLX4_RES_USAGE_DRIVER;

	}



	if (dev->eq_table)

drivers/infiniband/hw/mlx4/main.c

+4 −2
Original line number Diff line number Diff line
@@ -2779,7 +2779,8 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
		allocated = 0;

		if (mlx4_ib_port_link_layer(&ibdev->ib_dev, i + 1) ==

						IB_LINK_LAYER_ETHERNET) {

			err = mlx4_counter_alloc(ibdev->dev, &counter_index);

			err = mlx4_counter_alloc(ibdev->dev, &counter_index,

						 MLX4_RES_USAGE_DRIVER);

			/* if failed to allocate a new counter, use default */

			if (err)

				counter_index =
@@ -2834,7 +2835,8 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
		ibdev->steer_qpn_count = MLX4_IB_UC_MAX_NUM_QPS;

		err = mlx4_qp_reserve_range(dev, ibdev->steer_qpn_count,

					    MLX4_IB_UC_STEER_QPN_ALIGN,

					    &ibdev->steer_qpn_base, 0);

					    &ibdev->steer_qpn_base, 0,

					    MLX4_RES_USAGE_DRIVER);

		if (err)

			goto err_counter;

drivers/infiniband/hw/mlx4/qp.c

+9 −4
Original line number Diff line number Diff line
@@ -769,6 +769,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, 
			if (err)

				goto err_mtt;

		}

		qp->mqp.usage = MLX4_RES_USAGE_USER_VERBS;

	} else {

		err = set_rq_size(dev, &init_attr->cap, !!pd->uobject,

				  qp_has_rq(init_attr), qp, 0);
@@ -841,6 +842,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, 
			err = -ENOMEM;

			goto err_wrid;

		}

		qp->mqp.usage = MLX4_RES_USAGE_DRIVER;

	}



	if (sqpn) {
@@ -860,13 +862,14 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, 
						    (init_attr->cap.max_send_wr ?

						     MLX4_RESERVE_ETH_BF_QP : 0) |

						    (init_attr->cap.max_recv_wr ?

						     MLX4_RESERVE_A0_QP : 0));

						     MLX4_RESERVE_A0_QP : 0),

						    qp->mqp.usage);

		else

			if (qp->flags & MLX4_IB_QP_NETIF)

				err = mlx4_ib_steer_qp_alloc(dev, 1, &qpn);

			else

				err = mlx4_qp_reserve_range(dev->dev, 1, 1,

							    &qpn, 0);

							    &qpn, 0, qp->mqp.usage);

		if (err)

			goto err_proxy;

	}
@@ -1218,7 +1221,9 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd, 
		if (udata)

			return ERR_PTR(-EINVAL);

		if (init_attr->create_flags & MLX4_IB_QP_CREATE_ROCE_V2_GSI) {

			int res = mlx4_qp_reserve_range(to_mdev(pd->device)->dev, 1, 1, &sqpn, 0);

			int res = mlx4_qp_reserve_range(to_mdev(pd->device)->dev,

							1, 1, &sqpn, 0,

							MLX4_RES_USAGE_DRIVER);



			if (res)

				return ERR_PTR(res);
@@ -1581,7 +1586,7 @@ static int create_qp_lb_counter(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp) 
	    !(dev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_LB_SRC_CHK))

		return 0;



	err = mlx4_counter_alloc(dev->dev, &tmp_idx);

	err = mlx4_counter_alloc(dev->dev, &tmp_idx, MLX4_RES_USAGE_DRIVER);

	if (err)

		return err;

drivers/net/ethernet/mellanox/mlx4/cq.c

+4 −3
Original line number Diff line number Diff line
@@ -241,13 +241,14 @@ int __mlx4_cq_alloc_icm(struct mlx4_dev *dev, int *cqn) 
	return err;

}



static int mlx4_cq_alloc_icm(struct mlx4_dev *dev, int *cqn)

static int mlx4_cq_alloc_icm(struct mlx4_dev *dev, int *cqn, u8 usage)

{

	u32 in_modifier = RES_CQ | (((u32)usage & 3) << 30);

	u64 out_param;

	int err;



	if (mlx4_is_mfunc(dev)) {

		err = mlx4_cmd_imm(dev, 0, &out_param, RES_CQ,

		err = mlx4_cmd_imm(dev, 0, &out_param, in_modifier,

				   RES_OP_RESERVE_AND_MAP, MLX4_CMD_ALLOC_RES,

				   MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);

		if (err)
@@ -303,7 +304,7 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, 


	cq->vector = vector;



	err = mlx4_cq_alloc_icm(dev, &cq->cqn);

	err = mlx4_cq_alloc_icm(dev, &cq->cqn, cq->usage);

	if (err)

		return err;

drivers/net/ethernet/mellanox/mlx4/en_cq.c

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq, 
	    (cq->type == RX && priv->hwtstamp_config.rx_filter))

		timestamp_en = 1;



	cq->mcq.usage = MLX4_RES_USAGE_DRIVER;

	err = mlx4_cq_alloc(mdev->dev, cq->size, &cq->wqres.mtt,

			    &mdev->priv_uar, cq->wqres.db.dma, &cq->mcq,

			    cq->vector, 0, timestamp_en);