Commit aa74be6e authored by Yishai Hadas's avatar Yishai Hadas Committed by Jason Gunthorpe
Browse files

IB/mlx5: Allocate the per-port Q counter shared when DEVX is supported 



The per-port Q counter is some kernel resource and as such may be used by
few UID(s) upon DEVX usage.

To enable using it for QP/RQ when DEVX context is used need to allocate it
with a sharing mode indication to let firmware allows its usage.

The UID = 0xffff was chosen to mark it.

Signed-off-by: default avatarYishai Hadas <yishaih@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 75bf8a2a

drivers/infiniband/hw/mlx5/cmd.c

+17 −0
Original line number Diff line number Diff line
@@ -328,3 +328,20 @@ int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn, u16 uid) 
	MLX5_SET(dealloc_xrcd_in, in, uid, uid);

	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

}



int mlx5_cmd_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id,

			     u16 uid)

{

	u32 in[MLX5_ST_SZ_DW(alloc_q_counter_in)]   = {0};

	u32 out[MLX5_ST_SZ_DW(alloc_q_counter_out)] = {0};

	int err;



	MLX5_SET(alloc_q_counter_in, in, opcode, MLX5_CMD_OP_ALLOC_Q_COUNTER);

	MLX5_SET(alloc_q_counter_in, in, uid, uid);



	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	if (!err)

		*counter_id = MLX5_GET(alloc_q_counter_out, out,

				       counter_set_id);

	return err;

}

drivers/infiniband/hw/mlx5/cmd.h

+2 −0
Original line number Diff line number Diff line
@@ -61,4 +61,6 @@ int mlx5_cmd_detach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid, 
			u32 qpn, u16 uid);

int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn, u16 uid);

int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn, u16 uid);

int mlx5_cmd_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id,

			     u16 uid);

#endif /* MLX5_IB_CMD_H */

drivers/infiniband/hw/mlx5/main.c

+7 −2
Original line number Diff line number Diff line
@@ -5115,6 +5115,9 @@ static int mlx5_ib_alloc_counters(struct mlx5_ib_dev *dev) 
{

	int err = 0;

	int i;

	bool is_shared;



	is_shared = MLX5_CAP_GEN(dev->mdev, log_max_uctx) != 0;



	for (i = 0; i < dev->num_ports; i++) {

		err = __mlx5_ib_alloc_counters(dev, &dev->port[i].cnts);
@@ -5124,8 +5127,10 @@ static int mlx5_ib_alloc_counters(struct mlx5_ib_dev *dev) 
		mlx5_ib_fill_counters(dev, dev->port[i].cnts.names,

				      dev->port[i].cnts.offsets);



		err = mlx5_core_alloc_q_counter(dev->mdev,

						&dev->port[i].cnts.set_id);

		err = mlx5_cmd_alloc_q_counter(dev->mdev,

					       &dev->port[i].cnts.set_id,

					       is_shared ?

					       MLX5_SHARED_RESOURCE_UID : 0);

		if (err) {

			mlx5_ib_warn(dev,

				     "couldn't allocate queue counter for port %d, err %d\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE