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

net/mlx5e: Decouple TTC logic from mlx5e 



Remove dependency in the mlx5e driver from the TTC implementation
by changing the TTC related functions to receive mlx5 generic arguments.
It allows to decouple TTC logic from mlx5e and reused by other parts of
mlx5 driver.

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 5fba089e

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

+23 −21
Original line number Diff line number Diff line
@@ -106,15 +106,17 @@ enum mlx5_tunnel_types { 


bool mlx5_tunnel_inner_ft_supported(struct mlx5_core_dev *mdev);



struct mlx5e_ttc_rule {

struct mlx5_ttc_rule {

	struct mlx5_flow_handle *rule;

	struct mlx5_flow_destination default_dest;

};



/* L3/L4 traffic type classifier */

struct mlx5e_ttc_table {

	struct mlx5e_flow_table ft;

	struct mlx5e_ttc_rule rules[MLX5_NUM_TT];

struct mlx5_ttc_table {

	int num_groups;

	struct mlx5_flow_table *t;

	struct mlx5_flow_group **g;

	struct mlx5_ttc_rule rules[MLX5_NUM_TT];

	struct mlx5_flow_handle *tunnel_rules[MLX5_NUM_TUNNEL_TT];

};
@@ -223,8 +225,8 @@ struct mlx5e_flow_steering { 
	struct mlx5e_promisc_table      promisc;

	struct mlx5e_vlan_table         *vlan;

	struct mlx5e_l2_table           l2;

	struct mlx5e_ttc_table          ttc;

	struct mlx5e_ttc_table          inner_ttc;

	struct mlx5_ttc_table           ttc;

	struct mlx5_ttc_table           inner_ttc;

#ifdef CONFIG_MLX5_EN_ARFS

	struct mlx5e_arfs_tables       *arfs;

#endif
@@ -237,27 +239,27 @@ struct mlx5e_flow_steering { 
};



struct ttc_params {

	struct mlx5_flow_namespace *ns;

	struct mlx5_flow_table_attr ft_attr;

	u32 any_tt_tirn;

	u32 indir_tirn[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_ttc_table *inner_ttc;

	struct mlx5_flow_destination dests[MLX5_NUM_TT];

	bool   inner_ttc;

	struct mlx5_flow_destination tunnel_dests[MLX5_NUM_TUNNEL_TT];

};



void mlx5e_set_ttc_basic_params(struct mlx5e_priv *priv, struct ttc_params *ttc_params);

void mlx5e_set_ttc_ft_params(struct ttc_params *ttc_params);

void mlx5e_set_ttc_params(struct mlx5e_priv *priv,

			  struct ttc_params *ttc_params, bool tunnel);



int mlx5e_create_ttc_table(struct mlx5e_priv *priv, struct ttc_params *params,

			   struct mlx5e_ttc_table *ttc);

void mlx5e_destroy_ttc_table(struct mlx5e_priv *priv,

			     struct mlx5e_ttc_table *ttc);

int mlx5_create_ttc_table(struct mlx5_core_dev *dev, struct ttc_params *params,

			  struct mlx5_ttc_table *ttc);

void mlx5_destroy_ttc_table(struct mlx5_ttc_table *ttc);



void mlx5e_destroy_flow_table(struct mlx5e_flow_table *ft);

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

int mlx5_ttc_fwd_dest(struct mlx5_ttc_table *ttc, enum mlx5_traffic_types type,

		      struct mlx5_flow_destination *new_dest);

struct mlx5_flow_destination

mlx5e_ttc_get_default_dest(struct mlx5e_priv *priv,

mlx5_ttc_get_default_dest(struct mlx5_ttc_table *ttc,

			  enum mlx5_traffic_types type);

int mlx5e_ttc_fwd_default_dest(struct mlx5e_priv *priv,

int mlx5_ttc_fwd_default_dest(struct mlx5_ttc_table *ttc,

			      enum mlx5_traffic_types type);



void mlx5e_enable_cvlan_filter(struct mlx5e_priv *priv);

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

+7 −6
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int fs_udp_add_default_rule(struct mlx5e_priv *priv, enum fs_udp_type typ 
	fs_udp = priv->fs.udp;

	fs_udp_t = &fs_udp->tables[type];



	dest = mlx5e_ttc_get_default_dest(priv, fs_udp2tt(type));

	dest = mlx5_ttc_get_default_dest(&priv->fs.ttc, fs_udp2tt(type));

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

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);
@@ -259,7 +259,7 @@ static int fs_udp_disable(struct mlx5e_priv *priv) 


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

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

		err = mlx5e_ttc_fwd_default_dest(priv, fs_udp2tt(i));

		err = mlx5_ttc_fwd_default_dest(&priv->fs.ttc, fs_udp2tt(i));

		if (err) {

			netdev_err(priv->netdev,

				   "%s: modify ttc[%d] default destination failed, err(%d)\n",
@@ -281,7 +281,8 @@ static int fs_udp_enable(struct mlx5e_priv *priv) 
		dest.ft = priv->fs.udp->tables[i].t;



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

		err = mlx5e_ttc_fwd_dest(priv, fs_udp2tt(i), &dest);

		err = mlx5_ttc_fwd_dest(&priv->fs.ttc, fs_udp2tt(i),

					&dest);

		if (err) {

			netdev_err(priv->netdev,

				   "%s: modify ttc[%d] destination to accel failed, err(%d)\n",
@@ -401,7 +402,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, MLX5_TT_ANY);

	dest = mlx5_ttc_get_default_dest(&priv->fs.ttc, 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,7 +515,7 @@ 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, MLX5_TT_ANY);

	err = mlx5_ttc_fwd_default_dest(&priv->fs.ttc, MLX5_TT_ANY);

	if (err) {

		netdev_err(priv->netdev,

			   "%s: modify ttc[%d] default destination failed, err(%d)\n",
@@ -533,7 +534,7 @@ 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, MLX5_TT_ANY, &dest);

	err = mlx5_ttc_fwd_dest(&priv->fs.ttc, MLX5_TT_ANY, &dest);

	if (err) {

		netdev_err(priv->netdev,

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

drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c

+3 −3
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static int accel_fs_tcp_add_default_rule(struct mlx5e_priv *priv, 
	fs_tcp = priv->fs.accel_tcp;

	accel_fs_t = &fs_tcp->tables[type];



	dest = mlx5e_ttc_get_default_dest(priv, fs_accel2tt(type));

	dest = mlx5_ttc_get_default_dest(&priv->fs.ttc, fs_accel2tt(type));

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

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);
@@ -307,7 +307,7 @@ static int accel_fs_tcp_disable(struct mlx5e_priv *priv) 


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

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

		err = mlx5e_ttc_fwd_default_dest(priv, fs_accel2tt(i));

		err = mlx5_ttc_fwd_default_dest(&priv->fs.ttc, fs_accel2tt(i));

		if (err) {

			netdev_err(priv->netdev,

				   "%s: modify ttc[%d] default destination failed, err(%d)\n",
@@ -329,7 +329,7 @@ static int accel_fs_tcp_enable(struct mlx5e_priv *priv) 
		dest.ft = priv->fs.accel_tcp->tables[i].t;



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

		err = mlx5e_ttc_fwd_dest(priv, fs_accel2tt(i), &dest);

		err = mlx5_ttc_fwd_dest(&priv->fs.ttc, fs_accel2tt(i), &dest);

		if (err) {

			netdev_err(priv->netdev,

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

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c

+3 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int rx_create(struct mlx5e_priv *priv, enum accel_fs_esp_type type) 
	accel_esp = priv->ipsec->rx_fs;

	fs_prot = &accel_esp->fs_prot[type];



	fs_prot->default_dest = mlx5e_ttc_get_default_dest(priv, fs_esp2tt(type));

	fs_prot->default_dest = mlx5_ttc_get_default_dest(&priv->fs.ttc, fs_esp2tt(type));



	err = rx_err_create_ft(priv, fs_prot, &fs_prot->rx_err);

	if (err)
@@ -301,7 +301,7 @@ static int rx_ft_get(struct mlx5e_priv *priv, enum accel_fs_esp_type type) 
	/* connect */

	dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;

	dest.ft = fs_prot->ft;

	mlx5e_ttc_fwd_dest(priv, fs_esp2tt(type), &dest);

	mlx5_ttc_fwd_dest(&priv->fs.ttc, fs_esp2tt(type), &dest);



out:

	mutex_unlock(&fs_prot->prot_mutex);
@@ -320,7 +320,7 @@ static void rx_ft_put(struct mlx5e_priv *priv, enum accel_fs_esp_type type) 
		goto out;



	/* disconnect */

	mlx5e_ttc_fwd_default_dest(priv, fs_esp2tt(type));

	mlx5_ttc_fwd_default_dest(&priv->fs.ttc, fs_esp2tt(type));



	/* remove FT */

	rx_destroy(priv, type);

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

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int arfs_disable(struct mlx5e_priv *priv) 


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

		/* Modify ttc rules destination back to their default */

		err = mlx5e_ttc_fwd_default_dest(priv, arfs_get_tt(i));

		err = mlx5_ttc_fwd_default_dest(&priv->fs.ttc, arfs_get_tt(i));

		if (err) {

			netdev_err(priv->netdev,

				   "%s: modify ttc[%d] default destination failed, err(%d)\n",
@@ -149,7 +149,7 @@ int mlx5e_arfs_enable(struct mlx5e_priv *priv) 
	for (i = 0; i < ARFS_NUM_TYPES; i++) {

		dest.ft = priv->fs.arfs->arfs_tables[i].ft.t;

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

		err = mlx5e_ttc_fwd_dest(priv, arfs_get_tt(i), &dest);

		err = mlx5_ttc_fwd_dest(&priv->fs.ttc, arfs_get_tt(i), &dest);

		if (err) {

			netdev_err(priv->netdev,

				   "%s: modify ttc[%d] dest to arfs, failed err(%d)\n",
@@ -205,7 +205,7 @@ static int arfs_add_default_rule(struct mlx5e_priv *priv, 
		return -EINVAL;

	}



	/* FIXME: Must use mlx5e_ttc_get_default_dest(),

	/* FIXME: Must use mlx5_ttc_get_default_dest(),

	 * but can't since TTC default is not setup yet !

	 */

	dest.tir_num = mlx5e_rx_res_get_tirn_rss(priv->rx_res, tt);