Commit d443c6f6 authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Saeed Mahameed
Browse files

net/mlx5e: Rename traffic type enums 



Rename traffic type enums as part of the preparation for moving
the traffic type logic to a separate file.

Signed-off-by: default avatarMaor Gottlieb <maorg@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 3ac90dec

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

+46 −43
Original line number Diff line number Diff line
@@ -67,22 +67,23 @@ struct mlx5e_l2_table { 
	bool                       promisc_enabled;

};



enum mlx5e_traffic_types {

	MLX5E_TT_IPV4_TCP,

	MLX5E_TT_IPV6_TCP,

	MLX5E_TT_IPV4_UDP,

	MLX5E_TT_IPV6_UDP,

	MLX5E_TT_IPV4_IPSEC_AH,

	MLX5E_TT_IPV6_IPSEC_AH,

	MLX5E_TT_IPV4_IPSEC_ESP,

	MLX5E_TT_IPV6_IPSEC_ESP,

	MLX5E_TT_IPV4,

	MLX5E_TT_IPV6,

	MLX5E_TT_ANY,

	MLX5E_NUM_TT,

	MLX5E_NUM_INDIR_TIRS = MLX5E_TT_ANY,

enum mlx5_traffic_types {

	MLX5_TT_IPV4_TCP,

	MLX5_TT_IPV6_TCP,

	MLX5_TT_IPV4_UDP,

	MLX5_TT_IPV6_UDP,

	MLX5_TT_IPV4_IPSEC_AH,

	MLX5_TT_IPV6_IPSEC_AH,

	MLX5_TT_IPV4_IPSEC_ESP,

	MLX5_TT_IPV6_IPSEC_ESP,

	MLX5_TT_IPV4,

	MLX5_TT_IPV6,

	MLX5_TT_ANY,

	MLX5_NUM_TT,

};



#define MLX5E_NUM_INDIR_TIRS (MLX5_NUM_TT - 1)



#define MLX5_HASH_IP		(MLX5_HASH_FIELD_SEL_SRC_IP   |\

				 MLX5_HASH_FIELD_SEL_DST_IP)

#define MLX5_HASH_IP_L4PORTS	(MLX5_HASH_FIELD_SEL_SRC_IP   |\
@@ -93,14 +94,14 @@ enum mlx5e_traffic_types { 
				 MLX5_HASH_FIELD_SEL_DST_IP   |\

				 MLX5_HASH_FIELD_SEL_IPSEC_SPI)



enum mlx5e_tunnel_types {

	MLX5E_TT_IPV4_GRE,

	MLX5E_TT_IPV6_GRE,

	MLX5E_TT_IPV4_IPIP,

	MLX5E_TT_IPV6_IPIP,

	MLX5E_TT_IPV4_IPV6,

	MLX5E_TT_IPV6_IPV6,

	MLX5E_NUM_TUNNEL_TT,

enum mlx5_tunnel_types {

	MLX5_TT_IPV4_GRE,

	MLX5_TT_IPV6_GRE,

	MLX5_TT_IPV4_IPIP,

	MLX5_TT_IPV6_IPIP,

	MLX5_TT_IPV4_IPV6,

	MLX5_TT_IPV6_IPV6,

	MLX5_NUM_TUNNEL_TT,

};



bool mlx5e_tunnel_inner_ft_supported(struct mlx5_core_dev *mdev);
@@ -113,8 +114,8 @@ struct mlx5e_ttc_rule { 
/* L3/L4 traffic type classifier */

struct mlx5e_ttc_table {

	struct mlx5e_flow_table ft;

	struct mlx5e_ttc_rule rules[MLX5E_NUM_TT];

	struct mlx5_flow_handle *tunnel_rules[MLX5E_NUM_TUNNEL_TT];

	struct mlx5e_ttc_rule rules[MLX5_NUM_TT];

	struct mlx5_flow_handle *tunnel_rules[MLX5_NUM_TUNNEL_TT];

};



/* NIC prio FTS */
@@ -138,21 +139,21 @@ enum { 
#endif

};



#define MLX5E_TTC_NUM_GROUPS	3

#define MLX5E_TTC_GROUP1_SIZE	(BIT(3) + MLX5E_NUM_TUNNEL_TT)

#define MLX5E_TTC_GROUP2_SIZE	 BIT(1)

#define MLX5E_TTC_GROUP3_SIZE	 BIT(0)

#define MLX5E_TTC_TABLE_SIZE	(MLX5E_TTC_GROUP1_SIZE +\

				 MLX5E_TTC_GROUP2_SIZE +\

				 MLX5E_TTC_GROUP3_SIZE)



#define MLX5E_INNER_TTC_NUM_GROUPS	3

#define MLX5E_INNER_TTC_GROUP1_SIZE	BIT(3)

#define MLX5E_INNER_TTC_GROUP2_SIZE	BIT(1)

#define MLX5E_INNER_TTC_GROUP3_SIZE	BIT(0)

#define MLX5E_INNER_TTC_TABLE_SIZE	(MLX5E_INNER_TTC_GROUP1_SIZE +\

					 MLX5E_INNER_TTC_GROUP2_SIZE +\

					 MLX5E_INNER_TTC_GROUP3_SIZE)

#define MLX5_TTC_NUM_GROUPS	3

#define MLX5_TTC_GROUP1_SIZE	(BIT(3) + MLX5_NUM_TUNNEL_TT)

#define MLX5_TTC_GROUP2_SIZE	 BIT(1)

#define MLX5_TTC_GROUP3_SIZE	 BIT(0)

#define MLX5_TTC_TABLE_SIZE	(MLX5_TTC_GROUP1_SIZE +\

				 MLX5_TTC_GROUP2_SIZE +\

				 MLX5_TTC_GROUP3_SIZE)



#define MLX5_INNER_TTC_NUM_GROUPS	3

#define MLX5_INNER_TTC_GROUP1_SIZE	BIT(3)

#define MLX5_INNER_TTC_GROUP2_SIZE	BIT(1)

#define MLX5_INNER_TTC_GROUP3_SIZE	BIT(0)

#define MLX5_INNER_TTC_TABLE_SIZE	(MLX5_INNER_TTC_GROUP1_SIZE +\

					 MLX5_INNER_TTC_GROUP2_SIZE +\

					 MLX5_INNER_TTC_GROUP3_SIZE)



struct mlx5e_priv;
@@ -251,11 +252,13 @@ void mlx5e_destroy_ttc_table(struct mlx5e_priv *priv, 
			     struct mlx5e_ttc_table *ttc);



void mlx5e_destroy_flow_table(struct mlx5e_flow_table *ft);

int mlx5e_ttc_fwd_dest(struct mlx5e_priv *priv, enum mlx5e_traffic_types type,

int mlx5e_ttc_fwd_dest(struct mlx5e_priv *priv, enum mlx5_traffic_types type,

		       struct mlx5_flow_destination *new_dest);

struct mlx5_flow_destination

mlx5e_ttc_get_default_dest(struct mlx5e_priv *priv, enum mlx5e_traffic_types type);

int mlx5e_ttc_fwd_default_dest(struct mlx5e_priv *priv, enum mlx5e_traffic_types type);

mlx5e_ttc_get_default_dest(struct mlx5e_priv *priv,

			   enum mlx5_traffic_types type);

int mlx5e_ttc_fwd_default_dest(struct mlx5e_priv *priv,

			       enum mlx5_traffic_types type);



void mlx5e_enable_cvlan_filter(struct mlx5e_priv *priv);

void mlx5e_disable_cvlan_filter(struct mlx5e_priv *priv);
@@ -263,7 +266,7 @@ void mlx5e_disable_cvlan_filter(struct mlx5e_priv *priv); 
int mlx5e_create_flow_steering(struct mlx5e_priv *priv);

void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv);



u8 mlx5e_get_proto_by_tunnel_type(enum mlx5e_tunnel_types tt);

u8 mlx5e_get_proto_by_tunnel_type(enum mlx5_tunnel_types tt);

int mlx5e_add_vlan_trap(struct mlx5e_priv *priv, int  trap_id, int tir_num);

void mlx5e_remove_vlan_trap(struct mlx5e_priv *priv);

int mlx5e_add_mac_trap(struct mlx5e_priv *priv, int  trap_id, int tir_num);

drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.c

+12 −12
Original line number Diff line number Diff line
@@ -33,22 +33,22 @@ static char *fs_udp_type2str(enum fs_udp_type i) 
	}

}



static enum mlx5e_traffic_types fs_udp2tt(enum fs_udp_type i)

static enum mlx5_traffic_types fs_udp2tt(enum fs_udp_type i)

{

	switch (i) {

	case FS_IPV4_UDP:

		return MLX5E_TT_IPV4_UDP;

		return MLX5_TT_IPV4_UDP;

	default: /* FS_IPV6_UDP */

		return MLX5E_TT_IPV6_UDP;

		return MLX5_TT_IPV6_UDP;

	}

}



static enum fs_udp_type tt2fs_udp(enum mlx5e_traffic_types i)

static enum fs_udp_type tt2fs_udp(enum mlx5_traffic_types i)

{

	switch (i) {

	case MLX5E_TT_IPV4_UDP:

	case MLX5_TT_IPV4_UDP:

		return FS_IPV4_UDP;

	case MLX5E_TT_IPV6_UDP:

	case MLX5_TT_IPV6_UDP:

		return FS_IPV6_UDP;

	default:

		return FS_UDP_NUM_TYPES;
@@ -75,7 +75,7 @@ static void fs_udp_set_dport_flow(struct mlx5_flow_spec *spec, enum fs_udp_type 


struct mlx5_flow_handle *

mlx5e_fs_tt_redirect_udp_add_rule(struct mlx5e_priv *priv,

				  enum mlx5e_traffic_types ttc_type,

				  enum mlx5_traffic_types ttc_type,

				  u32 tir_num, u16 d_port)

{

	enum fs_udp_type type = tt2fs_udp(ttc_type);
@@ -401,7 +401,7 @@ static int fs_any_add_default_rule(struct mlx5e_priv *priv) 
	fs_any = priv->fs.any;

	fs_any_t = &fs_any->table;



	dest = mlx5e_ttc_get_default_dest(priv, MLX5E_TT_ANY);

	dest = mlx5e_ttc_get_default_dest(priv, MLX5_TT_ANY);

	rule = mlx5_add_flow_rules(fs_any_t->t, NULL, &flow_act, &dest, 1);

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);
@@ -514,11 +514,11 @@ static int fs_any_disable(struct mlx5e_priv *priv) 
	int err;



	/* Modify ttc rules destination to point back to the indir TIRs */

	err = mlx5e_ttc_fwd_default_dest(priv, MLX5E_TT_ANY);

	err = mlx5e_ttc_fwd_default_dest(priv, MLX5_TT_ANY);

	if (err) {

		netdev_err(priv->netdev,

			   "%s: modify ttc[%d] default destination failed, err(%d)\n",

			   __func__, MLX5E_TT_ANY, err);

			   __func__, MLX5_TT_ANY, err);

		return err;

	}

	return 0;
@@ -533,11 +533,11 @@ static int fs_any_enable(struct mlx5e_priv *priv) 
	dest.ft = priv->fs.any->table.t;



	/* Modify ttc rules destination to point on the accel_fs FTs */

	err = mlx5e_ttc_fwd_dest(priv, MLX5E_TT_ANY, &dest);

	err = mlx5e_ttc_fwd_dest(priv, MLX5_TT_ANY, &dest);

	if (err) {

		netdev_err(priv->netdev,

			   "%s: modify ttc[%d] destination to accel failed, err(%d)\n",

			   __func__, MLX5E_TT_ANY, err);

			   __func__, MLX5_TT_ANY, err);

		return err;

	}

	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ void mlx5e_fs_tt_redirect_del_rule(struct mlx5_flow_handle *rule); 
/* UDP traffic type redirect */

struct mlx5_flow_handle *

mlx5e_fs_tt_redirect_udp_add_rule(struct mlx5e_priv *priv,

				  enum mlx5e_traffic_types ttc_type,

				  enum mlx5_traffic_types ttc_type,

				  u32 tir_num, u16 d_port);

void mlx5e_fs_tt_redirect_udp_destroy(struct mlx5e_priv *priv);

int mlx5e_fs_tt_redirect_udp_create(struct mlx5e_priv *priv);

drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c

+2 −2
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ static int mlx5e_ptp_rx_set_fs(struct mlx5e_priv *priv) 
	if (err)

		goto out_free;



	rule = mlx5e_fs_tt_redirect_udp_add_rule(priv, MLX5E_TT_IPV4_UDP,

	rule = mlx5e_fs_tt_redirect_udp_add_rule(priv, MLX5_TT_IPV4_UDP,

						 tirn, PTP_EV_PORT);

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);
@@ -625,7 +625,7 @@ static int mlx5e_ptp_rx_set_fs(struct mlx5e_priv *priv) 
	}

	ptp_fs->udp_v4_rule = rule;



	rule = mlx5e_fs_tt_redirect_udp_add_rule(priv, MLX5E_TT_IPV6_UDP,

	rule = mlx5e_fs_tt_redirect_udp_add_rule(priv, MLX5_TT_IPV6_UDP,

						 tirn, PTP_EV_PORT);

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);

drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c

+22 −22
Original line number Diff line number Diff line
@@ -6,52 +6,52 @@ 
#include "params.h"



static const struct mlx5e_rss_params_traffic_type rss_default_config[MLX5E_NUM_INDIR_TIRS] = {

	[MLX5E_TT_IPV4_TCP] = {

	[MLX5_TT_IPV4_TCP] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV4,

		.l4_prot_type = MLX5_L4_PROT_TYPE_TCP,

		.rx_hash_fields = MLX5_HASH_IP_L4PORTS,

	},

	[MLX5E_TT_IPV6_TCP] = {

	[MLX5_TT_IPV6_TCP] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV6,

		.l4_prot_type = MLX5_L4_PROT_TYPE_TCP,

		.rx_hash_fields = MLX5_HASH_IP_L4PORTS,

	},

	[MLX5E_TT_IPV4_UDP] = {

	[MLX5_TT_IPV4_UDP] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV4,

		.l4_prot_type = MLX5_L4_PROT_TYPE_UDP,

		.rx_hash_fields = MLX5_HASH_IP_L4PORTS,

	},

	[MLX5E_TT_IPV6_UDP] = {

	[MLX5_TT_IPV6_UDP] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV6,

		.l4_prot_type = MLX5_L4_PROT_TYPE_UDP,

		.rx_hash_fields = MLX5_HASH_IP_L4PORTS,

	},

	[MLX5E_TT_IPV4_IPSEC_AH] = {

	[MLX5_TT_IPV4_IPSEC_AH] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV4,

		.l4_prot_type = 0,

		.rx_hash_fields = MLX5_HASH_IP_IPSEC_SPI,

	},

	[MLX5E_TT_IPV6_IPSEC_AH] = {

	[MLX5_TT_IPV6_IPSEC_AH] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV6,

		.l4_prot_type = 0,

		.rx_hash_fields = MLX5_HASH_IP_IPSEC_SPI,

	},

	[MLX5E_TT_IPV4_IPSEC_ESP] = {

	[MLX5_TT_IPV4_IPSEC_ESP] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV4,

		.l4_prot_type = 0,

		.rx_hash_fields = MLX5_HASH_IP_IPSEC_SPI,

	},

	[MLX5E_TT_IPV6_IPSEC_ESP] = {

	[MLX5_TT_IPV6_IPSEC_ESP] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV6,

		.l4_prot_type = 0,

		.rx_hash_fields = MLX5_HASH_IP_IPSEC_SPI,

	},

	[MLX5E_TT_IPV4] = {

	[MLX5_TT_IPV4] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV4,

		.l4_prot_type = 0,

		.rx_hash_fields = MLX5_HASH_IP,

	},

	[MLX5E_TT_IPV6] = {

	[MLX5_TT_IPV6] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV6,

		.l4_prot_type = 0,

		.rx_hash_fields = MLX5_HASH_IP,
@@ -59,7 +59,7 @@ static const struct mlx5e_rss_params_traffic_type rss_default_config[MLX5E_NUM_I 
};



struct mlx5e_rss_params_traffic_type

mlx5e_rss_get_default_tt_config(enum mlx5e_traffic_types tt)

mlx5e_rss_get_default_tt_config(enum mlx5_traffic_types tt)

{

	return rss_default_config[tt];

}
@@ -106,7 +106,7 @@ struct mlx5e_rx_res *mlx5e_rx_res_alloc(void) 


static void mlx5e_rx_res_rss_params_init(struct mlx5e_rx_res *res, unsigned int init_nch)

{

	enum mlx5e_traffic_types tt;

	enum mlx5_traffic_types tt;



	res->rss_params.hash.hfunc = ETH_RSS_HASH_TOP;

	netdev_rss_key_fill(res->rss_params.hash.toeplitz_hash_key,
@@ -121,7 +121,7 @@ static int mlx5e_rx_res_rss_init(struct mlx5e_rx_res *res, 
				 const struct mlx5e_lro_param *init_lro_param)

{

	bool inner_ft_support = res->features & MLX5E_RX_RES_FEATURE_INNER_FT;

	enum mlx5e_traffic_types tt, max_tt;

	enum mlx5_traffic_types tt, max_tt;

	struct mlx5e_tir_builder *builder;

	u32 indir_rqtn;

	int err;
@@ -337,7 +337,7 @@ static int mlx5e_rx_res_ptp_init(struct mlx5e_rx_res *res) 


static void mlx5e_rx_res_rss_destroy(struct mlx5e_rx_res *res)

{

	enum mlx5e_traffic_types tt;

	enum mlx5_traffic_types tt;



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

		mlx5e_tir_destroy(&res->rss[tt].indir_tir);
@@ -432,12 +432,12 @@ u32 mlx5e_rx_res_get_tirn_xsk(struct mlx5e_rx_res *res, unsigned int ix) 
	return mlx5e_tir_get_tirn(&res->channels[ix].xsk_tir);

}



u32 mlx5e_rx_res_get_tirn_rss(struct mlx5e_rx_res *res, enum mlx5e_traffic_types tt)

u32 mlx5e_rx_res_get_tirn_rss(struct mlx5e_rx_res *res, enum mlx5_traffic_types tt)

{

	return mlx5e_tir_get_tirn(&res->rss[tt].indir_tir);

}



u32 mlx5e_rx_res_get_tirn_rss_inner(struct mlx5e_rx_res *res, enum mlx5e_traffic_types tt)

u32 mlx5e_rx_res_get_tirn_rss_inner(struct mlx5e_rx_res *res, enum mlx5_traffic_types tt)

{

	WARN_ON(!(res->features & MLX5E_RX_RES_FEATURE_INNER_FT));

	return mlx5e_tir_get_tirn(&res->rss[tt].inner_indir_tir);
@@ -608,7 +608,7 @@ int mlx5e_rx_res_xsk_deactivate(struct mlx5e_rx_res *res, unsigned int ix) 
}



struct mlx5e_rss_params_traffic_type

mlx5e_rx_res_rss_get_current_tt_config(struct mlx5e_rx_res *res, enum mlx5e_traffic_types tt)

mlx5e_rx_res_rss_get_current_tt_config(struct mlx5e_rx_res *res, enum mlx5_traffic_types tt)

{

	struct mlx5e_rss_params_traffic_type rss_tt;
@@ -643,7 +643,7 @@ void mlx5e_rx_res_rss_get_rxfh(struct mlx5e_rx_res *res, u32 *indir, u8 *key, u8 
		*hfunc = res->rss_params.hash.hfunc;

}



static int mlx5e_rx_res_rss_update_tir(struct mlx5e_rx_res *res, enum mlx5e_traffic_types tt,

static int mlx5e_rx_res_rss_update_tir(struct mlx5e_rx_res *res, enum mlx5_traffic_types tt,

				       bool inner)

{

	struct mlx5e_rss_params_traffic_type rss_tt;
@@ -668,7 +668,7 @@ static int mlx5e_rx_res_rss_update_tir(struct mlx5e_rx_res *res, enum mlx5e_traf 
int mlx5e_rx_res_rss_set_rxfh(struct mlx5e_rx_res *res, const u32 *indir,

			      const u8 *key, const u8 *hfunc)

{

	enum mlx5e_traffic_types tt;

	enum mlx5_traffic_types tt;

	bool changed_indir = false;

	bool changed_hash = false;

	int err;
@@ -730,12 +730,12 @@ int mlx5e_rx_res_rss_set_rxfh(struct mlx5e_rx_res *res, const u32 *indir, 
	return 0;

}



u8 mlx5e_rx_res_rss_get_hash_fields(struct mlx5e_rx_res *res, enum mlx5e_traffic_types tt)

u8 mlx5e_rx_res_rss_get_hash_fields(struct mlx5e_rx_res *res, enum mlx5_traffic_types tt)

{

	return res->rss_params.rx_hash_fields[tt];

}



int mlx5e_rx_res_rss_set_hash_fields(struct mlx5e_rx_res *res, enum mlx5e_traffic_types tt,

int mlx5e_rx_res_rss_set_hash_fields(struct mlx5e_rx_res *res, enum mlx5_traffic_types tt,

				     u8 rx_hash_fields)

{

	u8 old_rx_hash_fields;
@@ -778,7 +778,7 @@ int mlx5e_rx_res_rss_set_hash_fields(struct mlx5e_rx_res *res, enum mlx5e_traffi 
int mlx5e_rx_res_lro_set_param(struct mlx5e_rx_res *res, struct mlx5e_lro_param *lro_param)

{

	struct mlx5e_tir_builder *builder;

	enum mlx5e_traffic_types tt;

	enum mlx5_traffic_types tt;

	int err, final_err;

	unsigned int ix;