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

Commit c3abb51b authored by Eran Ben Elisha's avatar Eran Ben Elisha Committed by David S. Miller
Browse files

IB/mlx4: Add RoCE/IB dedicated counters 



This is an infrastructure step to attach all the QPs opened from the
IB driver to a counter in order to collect VF stats from the PF using
those counters.

If the port's type is Ethernet, the counter policy demands two counters
per port (one for RoCE and one for Ethernet). The port default counter
(allocated in mlx4_core) is used for the Ethernet netdev QPs and we
allocate another counter for RoCE.

If the port's traffic is Infiniband, the counter policy demands
one counter per port, so it can use the port's default counter.

Also, Add 'allocated' flag for each counter in order to clean it at
unload.

Signed-off-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6de5f7f6

drivers/infiniband/hw/mlx4/mad.c

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ static int iboe_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 
	struct mlx4_cmd_mailbox *mailbox;

	struct mlx4_ib_dev *dev = to_mdev(ibdev);

	int err;

	u32 inmod = dev->counters[port_num - 1] & 0xffff;

	u32 inmod = dev->counters[port_num - 1].index & 0xffff;

	u8 mode;



	if (in_mad->mad_hdr.mgmt_class != IB_MGMT_CLASS_PERF_MGMT)

drivers/infiniband/hw/mlx4/main.c

+30 −13
Original line number Diff line number Diff line
@@ -2098,6 +2098,8 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	struct mlx4_ib_iboe *iboe;

	int ib_num_ports = 0;

	int num_req_counters;

	int allocated;

	u32 counter_index;



	pr_info_once("%s", mlx4_ib_version);
@@ -2263,19 +2265,31 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	num_req_counters = mlx4_is_bonded(dev) ? 1 : ibdev->num_ports;

	for (i = 0; i < num_req_counters; ++i) {

		mutex_init(&ibdev->qp1_proxy_lock[i]);

		allocated = 0;

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

						IB_LINK_LAYER_ETHERNET) {

			err = mlx4_counter_alloc(ibdev->dev, &ibdev->counters[i]);

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

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

			if (err)

				ibdev->counters[i] = -1;

		} else {

			ibdev->counters[i] = -1;

				counter_index =

					mlx4_get_default_counter_index(dev,

								       i + 1);

			else

				allocated = 1;

		} else { /* IB_LINK_LAYER_INFINIBAND use the default counter */

			counter_index = mlx4_get_default_counter_index(dev,

								       i + 1);

		}

		ibdev->counters[i].index = counter_index;

		ibdev->counters[i].allocated = allocated;

		pr_info("counter index %d for port %d allocated %d\n",

			counter_index, i + 1, allocated);

	}

	if (mlx4_is_bonded(dev))

		for (i = 1; i < ibdev->num_ports ; ++i)

			ibdev->counters[i] = ibdev->counters[0];



		for (i = 1; i < ibdev->num_ports ; ++i) {

			ibdev->counters[i].index = ibdev->counters[0].index;

			ibdev->counters[i].allocated = 0;

		}



	mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_IB)

		ib_num_ports++;
@@ -2415,10 +2429,12 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
		mlx4_qp_release_range(dev, ibdev->steer_qpn_base,

				      ibdev->steer_qpn_count);

err_counter:

	for (; i; --i)

		if (ibdev->counters[i - 1] != -1)

			mlx4_counter_free(ibdev->dev, ibdev->counters[i - 1]);



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

		if (ibdev->counters[i].index != -1 &&

		    ibdev->counters[i].allocated)

			mlx4_counter_free(ibdev->dev,

					  ibdev->counters[i].index);

	}

err_map:

	iounmap(ibdev->uar_map);
@@ -2535,8 +2551,9 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) 


	iounmap(ibdev->uar_map);

	for (p = 0; p < ibdev->num_ports; ++p)

		if (ibdev->counters[p] != -1)

			mlx4_counter_free(ibdev->dev, ibdev->counters[p]);

		if (ibdev->counters[p].index != -1 &&

		    ibdev->counters[p].allocated)

			mlx4_counter_free(ibdev->dev, ibdev->counters[p].index);

	mlx4_foreach_port(p, dev, MLX4_PORT_TYPE_IB)

		mlx4_CLOSE_PORT(dev, p);

drivers/infiniband/hw/mlx4/mlx4_ib.h

+6 −1
Original line number Diff line number Diff line
@@ -503,6 +503,11 @@ struct mlx4_ib_iov_port { 
	struct mlx4_ib_iov_sysfs_attr mcg_dentry;

};



struct counter_index {

	u32		index;

	u8		allocated;

};



struct mlx4_ib_dev {

	struct ib_device	ib_dev;

	struct mlx4_dev	       *dev;
@@ -521,7 +526,7 @@ struct mlx4_ib_dev { 
	struct mutex		cap_mask_mutex;

	bool			ib_active;

	struct mlx4_ib_iboe	iboe;

	int			counters[MLX4_MAX_PORTS];

	struct counter_index    counters[MLX4_MAX_PORTS];

	int		       *eq_table;

	struct kobject	       *iov_parent;

	struct kobject	       *ports_parent;

drivers/infiniband/hw/mlx4/qp.c

+2 −2
Original line number Diff line number Diff line
@@ -1539,9 +1539,9 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp, 
	}



	if (cur_state == IB_QPS_INIT && new_state == IB_QPS_RTR) {

		if (dev->counters[qp->port - 1] != -1) {

		if (dev->counters[qp->port - 1].index != -1) {

			context->pri_path.counter_index =

						dev->counters[qp->port - 1];

					dev->counters[qp->port - 1].index;

			optpar |= MLX4_QP_OPTPAR_COUNTER_INDEX;

		} else

			context->pri_path.counter_index =