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

net/mlx5: Embed mlx5_ttc_table 



mlx5_ttc_table struct shouldn't be exposed to the users so
this patch make it internal to ttc.

In addition add a getter function to get the TTC flow table for users
that need to add a rule which points on it.

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

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

+5 −2
Original line number Diff line number Diff line
@@ -169,8 +169,8 @@ struct mlx5e_flow_steering { 
	struct mlx5e_promisc_table      promisc;

	struct mlx5e_vlan_table         *vlan;

	struct mlx5e_l2_table           l2;

	struct mlx5_ttc_table           ttc;

	struct mlx5_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
@@ -185,6 +185,9 @@ struct mlx5e_flow_steering { 
void mlx5e_set_ttc_params(struct mlx5e_priv *priv,

			  struct ttc_params *ttc_params, bool tunnel);



void mlx5e_destroy_ttc_table(struct mlx5e_priv *priv);

int mlx5e_create_ttc_table(struct mlx5e_priv *priv);



void mlx5e_destroy_flow_table(struct mlx5e_flow_table *ft);



void mlx5e_enable_cvlan_filter(struct mlx5e_priv *priv);

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

+6 −7
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 = mlx5_ttc_get_default_dest(&priv->fs.ttc, 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 = mlx5_ttc_fwd_default_dest(&priv->fs.ttc, 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,8 +281,7 @@ 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 = mlx5_ttc_fwd_dest(&priv->fs.ttc, 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",
@@ -402,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 = mlx5_ttc_get_default_dest(&priv->fs.ttc, 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);
@@ -515,7 +514,7 @@ static int fs_any_disable(struct mlx5e_priv *priv) 
	int err;



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

	err = mlx5_ttc_fwd_default_dest(&priv->fs.ttc, 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",
@@ -534,7 +533,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 = mlx5_ttc_fwd_dest(&priv->fs.ttc, 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 = mlx5_ttc_get_default_dest(&priv->fs.ttc, 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 = mlx5_ttc_fwd_default_dest(&priv->fs.ttc, 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 = mlx5_ttc_fwd_dest(&priv->fs.ttc, 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

+4 −3
Original line number Diff line number Diff line
@@ -265,7 +265,8 @@ 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 = mlx5_ttc_get_default_dest(&priv->fs.ttc, 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 +302,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;

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

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



out:

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



	/* disconnect */

	mlx5_ttc_fwd_default_dest(&priv->fs.ttc, 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

+2 −2
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 = mlx5_ttc_fwd_default_dest(&priv->fs.ttc, 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 = mlx5_ttc_fwd_dest(&priv->fs.ttc, 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",