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

net/mlx5e: TIRs management refactoring 



The current refresh tirs self loopback mechanism, refreshes all the tirs
belonging to the same mlx5e instance to prevent self loopback by packets
sent over any ring of that instance. This mechanism relies on all the
tirs/tises of an instance to be created with the same transport domain
number (tdn).

Change the driver to refresh all the tirs created under the same tdn
regardless of which mlx5e netdev instance they belong to.

This behaviour is needed for introducing new mlx5e instances which serve
to represent SRIOV VFs. The representors and the PF share vport used for
E-Switch management, and we want to avoid NIC level HW loopback between
them, e.g when sending broadcast packets. To achieve that, both the
representors and the PF NIC will share the tdn.

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 b50d292b

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

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

};



struct mlx5e_direct_tir {

struct mlx5e_tir {

	u32              tirn;

	u32              rqtn;

	struct list_head list;

};



enum {
@@ -576,8 +577,8 @@ struct mlx5e_priv { 
	struct mlx5e_channel     **channel;

	u32                        tisn[MLX5E_MAX_NUM_TC];

	u32                        indir_rqtn;

	u32                        indir_tirn[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_direct_tir    direct_tir[MLX5E_MAX_NUM_CHANNELS];

	struct mlx5e_tir           indir_tir[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_tir           direct_tir[MLX5E_MAX_NUM_CHANNELS];

	u32                        tx_rates[MLX5E_MAX_NUM_SQS];



	struct mlx5e_flow_steering fs;
@@ -784,7 +785,12 @@ int mlx5e_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, 
#endif



u16 mlx5e_get_max_inline_cap(struct mlx5_core_dev *mdev);

int mlx5e_create_tir(struct mlx5_core_dev *mdev,

		     struct mlx5e_tir *tir, u32 *in, int inlen);

void mlx5e_destroy_tir(struct mlx5_core_dev *mdev,

		       struct mlx5e_tir *tir);

int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev);

void mlx5e_destroy_mdev_resources(struct mlx5_core_dev *mdev);

int mlx5e_refresh_tirs_self_loopback_enable(struct mlx5_core_dev *mdev);



#endif /* __MLX5_EN_H__ */

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

+7 −7
Original line number Diff line number Diff line
@@ -93,14 +93,14 @@ static enum mlx5e_traffic_types arfs_get_tt(enum arfs_type type) 
static int arfs_disable(struct mlx5e_priv *priv)

{

	struct mlx5_flow_destination dest;

	u32 *tirn = priv->indir_tirn;

	struct mlx5e_tir *tir = priv->indir_tir;

	int err = 0;

	int tt;

	int i;



	dest.type = MLX5_FLOW_DESTINATION_TYPE_TIR;

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

		dest.tir_num = tirn[i];

		dest.tir_num = tir[i].tirn;

		tt = arfs_get_tt(i);

		/* Modify ttc rules destination to bypass the aRFS tables*/

		err = mlx5_modify_rule_destination(priv->fs.ttc.rules[tt],
@@ -176,7 +176,7 @@ static int arfs_add_default_rule(struct mlx5e_priv *priv, 
	struct arfs_table *arfs_t = &priv->fs.arfs.arfs_tables[type];

	struct mlx5_flow_destination dest;

	u8 match_criteria_enable = 0;

	u32 *tirn = priv->indir_tirn;

	struct mlx5e_tir *tir = priv->indir_tir;

	u32 *match_criteria;

	u32 *match_value;

	int err = 0;
@@ -192,16 +192,16 @@ static int arfs_add_default_rule(struct mlx5e_priv *priv, 
	dest.type = MLX5_FLOW_DESTINATION_TYPE_TIR;

	switch (type) {

	case ARFS_IPV4_TCP:

		dest.tir_num = tirn[MLX5E_TT_IPV4_TCP];

		dest.tir_num = tir[MLX5E_TT_IPV4_TCP].tirn;

		break;

	case ARFS_IPV4_UDP:

		dest.tir_num = tirn[MLX5E_TT_IPV4_UDP];

		dest.tir_num = tir[MLX5E_TT_IPV4_UDP].tirn;

		break;

	case ARFS_IPV6_TCP:

		dest.tir_num = tirn[MLX5E_TT_IPV6_TCP];

		dest.tir_num = tir[MLX5E_TT_IPV6_TCP].tirn;

		break;

	case ARFS_IPV6_UDP:

		dest.tir_num = tirn[MLX5E_TT_IPV6_UDP];

		dest.tir_num = tir[MLX5E_TT_IPV6_UDP].tirn;

		break;

	default:

		err = -EINVAL;

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

+48 −0
Original line number Diff line number Diff line
@@ -36,6 +36,27 @@ 
 * Global resources are common to all the netdevices crated on the same nic.

 */



int mlx5e_create_tir(struct mlx5_core_dev *mdev,

		     struct mlx5e_tir *tir, u32 *in, int inlen)

{

	int err;



	err = mlx5_core_create_tir(mdev, in, inlen, &tir->tirn);

	if (err)

		return err;



	list_add(&tir->list, &mdev->mlx5e_res.td.tirs_list);



	return 0;

}



void mlx5e_destroy_tir(struct mlx5_core_dev *mdev,

		       struct mlx5e_tir *tir)

{

	mlx5_core_destroy_tir(mdev, tir->tirn);

	list_del(&tir->list);

}



static int mlx5e_create_mkey(struct mlx5_core_dev *mdev, u32 pdn,

			     struct mlx5_core_mkey *mkey)

{
@@ -89,6 +110,8 @@ int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev) 
		goto err_dealloc_transport_domain;

	}



	INIT_LIST_HEAD(&mdev->mlx5e_res.td.tirs_list);



	return 0;



err_dealloc_transport_domain:
@@ -110,3 +133,28 @@ void mlx5e_destroy_mdev_resources(struct mlx5_core_dev *mdev) 
	mlx5_core_dealloc_pd(mdev, res->pdn);

	mlx5_unmap_free_uar(mdev, &res->cq_uar);

}



int mlx5e_refresh_tirs_self_loopback_enable(struct mlx5_core_dev *mdev)

{

	struct mlx5e_tir *tir;

	void *in;

	int inlen;

	int err;



	inlen = MLX5_ST_SZ_BYTES(modify_tir_in);

	in = mlx5_vzalloc(inlen);

	if (!in)

		return -ENOMEM;



	MLX5_SET(modify_tir_in, in, bitmask.self_lb_en, 1);



	list_for_each_entry(tir, &mdev->mlx5e_res.td.tirs_list, list) {

		err = mlx5_core_modify_tir(mdev, tir->tirn, in, inlen);

		if (err)

			return err;

	}



	kvfree(in);



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ static void mlx5e_modify_tirs_hash(struct mlx5e_priv *priv, void *in, int inlen) 
	mlx5e_build_tir_ctx_hash(tirc, priv);



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

		mlx5_core_modify_tir(mdev, priv->indir_tirn[i], in, inlen);

		mlx5_core_modify_tir(mdev, priv->indir_tir[i].tirn, in, inlen);

}



static int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir,

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

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static int mlx5e_generate_ttc_table_rules(struct mlx5e_priv *priv) 
		if (tt == MLX5E_TT_ANY)

			dest.tir_num = priv->direct_tir[0].tirn;

		else

			dest.tir_num = priv->indir_tirn[tt];

			dest.tir_num = priv->indir_tir[tt].tirn;

		rules[tt] = mlx5e_generate_ttc_rule(priv, ft, &dest,

						    ttc_rules[tt].etype,

						    ttc_rules[tt].proto);

CRA Git | Maintained and supported by SUSTech CRA and CCSE