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

Commit f2f3df55 authored by Saeed Mahameed's avatar Saeed Mahameed Committed by Leon Romanovsky
Browse files

net/mlx5: EQ, Privatize eq_table and friends 



Move unnecessary EQ table structures and declaration from the
public include/linux/mlx5/driver.h into the private area of mlx5_core
and into eq.c/eq.h.

Introduce new mlx5 EQ APIs:

mlx5_comp_vectors_count(dev);
mlx5_comp_irq_get_affinity_mask(dev, vector);

And use them from mlx5_ib or mlx5e netdevice instead of direct access to
mlx5_core internal structures.

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent d674a9aa

drivers/infiniband/hw/mlx5/main.c

+2 −3
Original line number Diff line number Diff line
@@ -5337,7 +5337,7 @@ mlx5_ib_get_vector_affinity(struct ib_device *ibdev, int comp_vector) 
{

	struct mlx5_ib_dev *dev = to_mdev(ibdev);



	return mlx5_get_vector_affinity_hint(dev->mdev, comp_vector);

	return mlx5_comp_irq_get_affinity_mask(dev->mdev, comp_vector);

}



/* The mlx5_ib_multiport_mutex should be held when calling this function */
@@ -5701,8 +5701,7 @@ int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev) 
	dev->ib_dev.node_type		= RDMA_NODE_IB_CA;

	dev->ib_dev.local_dma_lkey	= 0 /* not supported for now */;

	dev->ib_dev.phys_port_cnt	= dev->num_ports;

	dev->ib_dev.num_comp_vectors    =

		dev->mdev->priv.eq_table.num_comp_vectors;

	dev->ib_dev.num_comp_vectors    = mlx5_comp_vectors_count(mdev);

	dev->ib_dev.dev.parent		= &mdev->pdev->dev;



	mutex_init(&dev->cap_mask_mutex);

drivers/net/ethernet/mellanox/mlx5/core/cq.c

+3 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <rdma/ib_verbs.h>

#include <linux/mlx5/cq.h>

#include "mlx5_core.h"

#include "lib/eq.h"



#define TASKLET_MAX_TIME 2

#define TASKLET_MAX_TIME_JIFFIES msecs_to_jiffies(TASKLET_MAX_TIME)
@@ -124,7 +125,7 @@ int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq, 
		goto err_cmd;



	/* Add to async EQ CQ tree to recv async events */

	err = mlx5_eq_add_cq(&dev->priv.eq_table.async_eq, cq);

	err = mlx5_eq_add_cq(mlx5_get_async_eq(dev), cq);

	if (err)

		goto err_cq_add;
@@ -157,7 +158,7 @@ int mlx5_core_destroy_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq) 
	u32 in[MLX5_ST_SZ_DW(destroy_cq_in)] = {0};

	int err;



	err = mlx5_eq_del_cq(&dev->priv.eq_table.async_eq, cq);

	err = mlx5_eq_del_cq(mlx5_get_async_eq(dev), cq);

	if (err)

		return err;

drivers/net/ethernet/mellanox/mlx5/core/debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/mlx5/cq.h>

#include <linux/mlx5/driver.h>

#include "mlx5_core.h"

#include "lib/eq.h"



enum {

	QP_PID,

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −2
Original line number Diff line number Diff line
@@ -178,8 +178,7 @@ static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev) 
{

	return is_kdump_kernel() ?

		MLX5E_MIN_NUM_CHANNELS :

		min_t(int, mdev->priv.eq_table.num_comp_vectors,

		      MLX5E_MAX_NUM_CHANNELS);

		min_t(int, mlx5_comp_vectors_count(mdev), MLX5E_MAX_NUM_CHANNELS);

}



/* Use this function to get max num channels after netdev was created */

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+3 −7
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include "lib/clock.h"

#include "en/port.h"

#include "en/xdp.h"

#include "lib/eq.h"



struct mlx5e_rq_param {

	u32			rqc[MLX5_ST_SZ_DW(rqc)];
@@ -1758,11 +1759,6 @@ static void mlx5e_close_cq(struct mlx5e_cq *cq) 
	mlx5e_free_cq(cq);

}



static int mlx5e_get_cpu(struct mlx5e_priv *priv, int ix)

{

	return cpumask_first(priv->mdev->priv.eq_table.irq_info[ix + MLX5_EQ_VEC_COMP_BASE].mask);

}



static int mlx5e_open_tx_cqs(struct mlx5e_channel *c,

			     struct mlx5e_params *params,

			     struct mlx5e_channel_param *cparam)
@@ -1913,9 +1909,9 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, 
			      struct mlx5e_channel_param *cparam,

			      struct mlx5e_channel **cp)

{

	int cpu = cpumask_first(mlx5_comp_irq_get_affinity_mask(priv->mdev, ix));

	struct net_dim_cq_moder icocq_moder = {0, 0};

	struct net_device *netdev = priv->netdev;

	int cpu = mlx5e_get_cpu(priv, ix);

	struct mlx5e_channel *c;

	unsigned int irq;

	int err;
@@ -4960,7 +4956,7 @@ int mlx5e_netdev_init(struct net_device *netdev, 
	netif_carrier_off(netdev);



#ifdef CONFIG_MLX5_EN_ARFS

	netdev->rx_cpu_rmap = mdev->priv.eq_table.rmap;

	netdev->rx_cpu_rmap =  mlx5_eq_table_get_rmap(mdev);

#endif



	return 0;