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

Commit 398f3351 authored by Hadar Hen Zion's avatar Hadar Hen Zion Committed by David S. Miller
Browse files

net/mlx5e: Mark enabled RQTs instances explicitly 



In the current driver implementation two types of receive queue
tables (RQTs) are in use - direct and indirect.

Change the driver to mark each new created RQT (direct or indirect)
as "enabled". This behaviour is needed for introducing new mlx5e
instances which serve to represent SRIOV VFs.

The VF representors will have only one type of RQTs (direct).

An "enabled" flag is added to each RQT to allow better handling
and code sharing between the representors and the nic netdevices.

This patch doesn't add any new functionality.

Signed-off-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 724b2aa1

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

+9 −4
Original line number Original line Diff line number Diff line
@@ -552,9 +552,14 @@ struct mlx5e_flow_steering { 
	struct mlx5e_arfs_tables        arfs;

	struct mlx5e_arfs_tables        arfs;

};

};





struct mlx5e_rqt {

	u32              rqtn;

	bool		 enabled;

};



struct mlx5e_tir {

struct mlx5e_tir {

	u32		  tirn;

	u32		  tirn;

	u32              rqtn;

	struct mlx5e_rqt  rqt;

	struct list_head  list;

	struct list_head  list;

};

};
@@ -576,7 +581,7 @@ struct mlx5e_priv { 




	struct mlx5e_channel     **channel;

	struct mlx5e_channel     **channel;

	u32                        tisn[MLX5E_MAX_NUM_TC];

	u32                        tisn[MLX5E_MAX_NUM_TC];

	u32                        indir_rqtn;

	struct mlx5e_rqt           indir_rqt;

	struct mlx5e_tir           indir_tir[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_tir           indir_tir[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_tir           direct_tir[MLX5E_MAX_NUM_CHANNELS];

	struct mlx5e_tir           direct_tir[MLX5E_MAX_NUM_CHANNELS];

	u32                        tx_rates[MLX5E_MAX_NUM_SQS];

	u32                        tx_rates[MLX5E_MAX_NUM_SQS];

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -898,7 +898,7 @@ static int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir, 
	mutex_lock(&priv->state_lock);

	mutex_lock(&priv->state_lock);





	if (indir) {

	if (indir) {

		u32 rqtn = priv->indir_rqtn;

		u32 rqtn = priv->indir_rqt.rqtn;





		memcpy(priv->params.indirection_rqt, indir,

		memcpy(priv->params.indirection_rqt, indir,

		       sizeof(priv->params.indirection_rqt));

		       sizeof(priv->params.indirection_rqt));

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

+27 −18
Original line number Original line Diff line number Diff line
@@ -1486,7 +1486,8 @@ static void mlx5e_fill_direct_rqt_rqn(struct mlx5e_priv *priv, void *rqtc, 
	MLX5_SET(rqtc, rqtc, rq_num[0], rqn);

	MLX5_SET(rqtc, rqtc, rq_num[0], rqn);

}

}





static int mlx5e_create_rqt(struct mlx5e_priv *priv, int sz, int ix, u32 *rqtn)

static int mlx5e_create_rqt(struct mlx5e_priv *priv, int sz,

			    int ix, struct mlx5e_rqt *rqt)

{

{

	struct mlx5_core_dev *mdev = priv->mdev;

	struct mlx5_core_dev *mdev = priv->mdev;

	void *rqtc;

	void *rqtc;
@@ -1509,34 +1510,37 @@ static int mlx5e_create_rqt(struct mlx5e_priv *priv, int sz, int ix, u32 *rqtn) 
	else

	else

		mlx5e_fill_direct_rqt_rqn(priv, rqtc, ix);

		mlx5e_fill_direct_rqt_rqn(priv, rqtc, ix);





	err = mlx5_core_create_rqt(mdev, in, inlen, rqtn);

	err = mlx5_core_create_rqt(mdev, in, inlen, &rqt->rqtn);

	if (!err)

		rqt->enabled = true;





	kvfree(in);

	kvfree(in);

	return err;

	return err;

}

}





static void mlx5e_destroy_rqt(struct mlx5e_priv *priv, u32 rqtn)

static void mlx5e_destroy_rqt(struct mlx5e_priv *priv, struct mlx5e_rqt *rqt)

{

{

	mlx5_core_destroy_rqt(priv->mdev, rqtn);

	rqt->enabled = false;

	mlx5_core_destroy_rqt(priv->mdev, rqt->rqtn);

}

}





static int mlx5e_create_rqts(struct mlx5e_priv *priv)

static int mlx5e_create_rqts(struct mlx5e_priv *priv)

{

{

	int nch = mlx5e_get_max_num_channels(priv->mdev);

	int nch = mlx5e_get_max_num_channels(priv->mdev);

	u32 *rqtn;

	struct mlx5e_rqt *rqt;

	int err;

	int err;

	int ix;

	int ix;





	/* Indirect RQT */

	/* Indirect RQT */

	rqtn = &priv->indir_rqtn;

	rqt = &priv->indir_rqt;

	err = mlx5e_create_rqt(priv, MLX5E_INDIR_RQT_SIZE, 0, rqtn);

	err = mlx5e_create_rqt(priv, MLX5E_INDIR_RQT_SIZE, 0, rqt);

	if (err)

	if (err)

		return err;

		return err;





	/* Direct RQTs */

	/* Direct RQTs */

	for (ix = 0; ix < nch; ix++) {

	for (ix = 0; ix < nch; ix++) {

		rqtn = &priv->direct_tir[ix].rqtn;

		rqt = &priv->direct_tir[ix].rqt;

		err = mlx5e_create_rqt(priv, 1 /*size */, ix, rqtn);

		err = mlx5e_create_rqt(priv, 1 /*size */, ix, rqt);

		if (err)

		if (err)

			goto err_destroy_rqts;

			goto err_destroy_rqts;

	}

	}
@@ -1545,9 +1549,9 @@ static int mlx5e_create_rqts(struct mlx5e_priv *priv) 




err_destroy_rqts:

err_destroy_rqts:

	for (ix--; ix >= 0; ix--)

	for (ix--; ix >= 0; ix--)

		mlx5e_destroy_rqt(priv, priv->direct_tir[ix].rqtn);

		mlx5e_destroy_rqt(priv, &priv->direct_tir[ix].rqt);





	mlx5e_destroy_rqt(priv, priv->indir_rqtn);

	mlx5e_destroy_rqt(priv, &priv->indir_rqt);





	return err;

	return err;

}

}
@@ -1558,9 +1562,9 @@ static void mlx5e_destroy_rqts(struct mlx5e_priv *priv) 
	int i;

	int i;





	for (i = 0; i < nch; i++)

	for (i = 0; i < nch; i++)

		mlx5e_destroy_rqt(priv, priv->direct_tir[i].rqtn);

		mlx5e_destroy_rqt(priv, &priv->direct_tir[i].rqt);





	mlx5e_destroy_rqt(priv, priv->indir_rqtn);

	mlx5e_destroy_rqt(priv, &priv->indir_rqt);

}

}





int mlx5e_redirect_rqt(struct mlx5e_priv *priv, u32 rqtn, int sz, int ix)

int mlx5e_redirect_rqt(struct mlx5e_priv *priv, u32 rqtn, int sz, int ix)
@@ -1598,10 +1602,15 @@ static void mlx5e_redirect_rqts(struct mlx5e_priv *priv) 
	u32 rqtn;

	u32 rqtn;

	int ix;

	int ix;





	rqtn = priv->indir_rqtn;

	if (priv->indir_rqt.enabled) {

		rqtn = priv->indir_rqt.rqtn;

		mlx5e_redirect_rqt(priv, rqtn, MLX5E_INDIR_RQT_SIZE, 0);

		mlx5e_redirect_rqt(priv, rqtn, MLX5E_INDIR_RQT_SIZE, 0);

	}



	for (ix = 0; ix < priv->params.num_channels; ix++) {

	for (ix = 0; ix < priv->params.num_channels; ix++) {

		rqtn = priv->direct_tir[ix].rqtn;

		if (!priv->direct_tir[ix].rqt.enabled)

			continue;

		rqtn = priv->direct_tir[ix].rqt.rqtn;

		mlx5e_redirect_rqt(priv, rqtn, 1, ix);

		mlx5e_redirect_rqt(priv, rqtn, 1, ix);

	}

	}

}

}
@@ -2012,7 +2021,7 @@ static void mlx5e_build_indir_tir_ctx(struct mlx5e_priv *priv, u32 *tirc, 
	mlx5e_build_tir_ctx_lro(tirc, priv);

	mlx5e_build_tir_ctx_lro(tirc, priv);





	MLX5_SET(tirc, tirc, disp_type, MLX5_TIRC_DISP_TYPE_INDIRECT);

	MLX5_SET(tirc, tirc, disp_type, MLX5_TIRC_DISP_TYPE_INDIRECT);

	MLX5_SET(tirc, tirc, indirect_table, priv->indir_rqtn);

	MLX5_SET(tirc, tirc, indirect_table, priv->indir_rqt.rqtn);

	mlx5e_build_tir_ctx_hash(tirc, priv);

	mlx5e_build_tir_ctx_hash(tirc, priv);





	switch (tt) {

	switch (tt) {
@@ -2144,7 +2153,7 @@ static int mlx5e_create_tirs(struct mlx5e_priv *priv) 
		tir = &priv->direct_tir[ix];

		tir = &priv->direct_tir[ix];

		tirc = MLX5_ADDR_OF(create_tir_in, in, ctx);

		tirc = MLX5_ADDR_OF(create_tir_in, in, ctx);

		mlx5e_build_direct_tir_ctx(priv, tirc,

		mlx5e_build_direct_tir_ctx(priv, tirc,

					   priv->direct_tir[ix].rqtn);

					   priv->direct_tir[ix].rqt.rqtn);

		err = mlx5e_create_tir(priv->mdev, tir, in, inlen);

		err = mlx5e_create_tir(priv->mdev, tir, in, inlen);

		if (err)

		if (err)

			goto err_destroy_ch_tirs;

			goto err_destroy_ch_tirs;