Commit e8b5c4bc authored by Lama Kayal's avatar Lama Kayal Committed by Saeed Mahameed
Browse files

net/mlx5e: Directly get flow_steering struct as input when init/cleanup ethtool steering 



Let both mlx5e_ethtool_init_steering and mlx5e_ethtool_cleanup_steering
get ethtool steering struct as input instead of priv, as passing priv is
obsolete.
Also modify other function through the flow similarly.

Signed-off-by: default avatarLama Kayal <lkayal@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent c7eafc5e

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

+4 −4
Original line number Diff line number Diff line
@@ -109,14 +109,14 @@ struct mlx5e_ethtool_steering { 
	int                             tot_num_rules;

};



void mlx5e_ethtool_init_steering(struct mlx5e_priv *priv);

void mlx5e_ethtool_cleanup_steering(struct mlx5e_priv *priv);

void mlx5e_ethtool_init_steering(struct mlx5e_flow_steering *fs);

void mlx5e_ethtool_cleanup_steering(struct mlx5e_flow_steering *fs);

int mlx5e_ethtool_set_rxnfc(struct mlx5e_priv *priv, struct ethtool_rxnfc *cmd);

int mlx5e_ethtool_get_rxnfc(struct mlx5e_priv *priv,

			    struct ethtool_rxnfc *info, u32 *rule_locs);

#else

static inline void mlx5e_ethtool_init_steering(struct mlx5e_priv *priv)    { }

static inline void mlx5e_ethtool_cleanup_steering(struct mlx5e_priv *priv) { }

static inline void mlx5e_ethtool_init_steering(struct mlx5e_flow_steering *fs) { }

static inline void mlx5e_ethtool_cleanup_steering(struct mlx5e_flow_steering *fs) { }

static inline int mlx5e_ethtool_set_rxnfc(struct mlx5e_priv *priv, struct ethtool_rxnfc *cmd)

{ return -EOPNOTSUPP; }

static inline int mlx5e_ethtool_get_rxnfc(struct mlx5e_priv *priv,

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

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

		goto err_destory_vlan_table;



	mlx5e_ethtool_init_steering(priv);

	mlx5e_ethtool_init_steering(priv->fs);



	return 0;
@@ -1368,7 +1368,7 @@ void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv) 
	mlx5e_destroy_ttc_table(priv);

	mlx5e_destroy_inner_ttc_table(priv);

	mlx5e_arfs_destroy_tables(priv);

	mlx5e_ethtool_cleanup_steering(priv);

	mlx5e_ethtool_cleanup_steering(priv->fs);

}



static int mlx5e_fs_vlan_alloc(struct mlx5e_flow_steering *fs)

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

+10 −10
Original line number Diff line number Diff line
@@ -501,10 +501,10 @@ add_ethtool_flow_rule(struct mlx5e_priv *priv, 
	return err ? ERR_PTR(err) : rule;

}



static void del_ethtool_rule(struct mlx5e_priv *priv,

static void del_ethtool_rule(struct mlx5e_flow_steering *fs,

			     struct mlx5e_ethtool_rule *eth_rule)

{

	struct mlx5e_ethtool_steering *ethtool = mlx5e_fs_get_ethtool(priv->fs);

	struct mlx5e_ethtool_steering *ethtool = mlx5e_fs_get_ethtool(fs);

	if (eth_rule->rule)

		mlx5_del_flow_rules(eth_rule->rule);

	if (eth_rule->rss)
@@ -535,7 +535,7 @@ static struct mlx5e_ethtool_rule *get_ethtool_rule(struct mlx5e_priv *priv, 


	eth_rule = find_ethtool_rule(priv, location);

	if (eth_rule)

		del_ethtool_rule(priv, eth_rule);

		del_ethtool_rule(priv->fs, eth_rule);



	eth_rule = kzalloc(sizeof(*eth_rule), GFP_KERNEL);

	if (!eth_rule)
@@ -758,7 +758,7 @@ mlx5e_ethtool_flow_replace(struct mlx5e_priv *priv, 
	return 0;



del_ethtool_rule:

	del_ethtool_rule(priv, eth_rule);

	del_ethtool_rule(priv->fs, eth_rule);



	return err;

}
@@ -778,7 +778,7 @@ mlx5e_ethtool_flow_remove(struct mlx5e_priv *priv, int location) 
		goto out;

	}



	del_ethtool_rule(priv, eth_rule);

	del_ethtool_rule(priv->fs, eth_rule);

out:

	return err;

}
@@ -831,19 +831,19 @@ mlx5e_ethtool_get_all_flows(struct mlx5e_priv *priv, 
	return err;

}



void mlx5e_ethtool_cleanup_steering(struct mlx5e_priv *priv)

void mlx5e_ethtool_cleanup_steering(struct mlx5e_flow_steering *fs)

{

	struct mlx5e_ethtool_steering *ethtool = mlx5e_fs_get_ethtool(priv->fs);

	struct mlx5e_ethtool_steering *ethtool = mlx5e_fs_get_ethtool(fs);

	struct mlx5e_ethtool_rule *iter;

	struct mlx5e_ethtool_rule *temp;



	list_for_each_entry_safe(iter, temp, &ethtool->rules, list)

		del_ethtool_rule(priv, iter);

		del_ethtool_rule(fs, iter);

}



void mlx5e_ethtool_init_steering(struct mlx5e_priv *priv)

void mlx5e_ethtool_init_steering(struct mlx5e_flow_steering *fs)

{

	struct mlx5e_ethtool_steering *ethtool = mlx5e_fs_get_ethtool(priv->fs);

	struct mlx5e_ethtool_steering *ethtool = mlx5e_fs_get_ethtool(fs);



	INIT_LIST_HEAD(&ethtool->rules);

}

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

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

		goto err_destroy_root_ft;



	mlx5e_ethtool_init_steering(priv);

	mlx5e_ethtool_init_steering(priv->fs);



	return 0;
@@ -907,7 +907,7 @@ static int mlx5e_init_rep_rx(struct mlx5e_priv *priv) 


static void mlx5e_cleanup_rep_rx(struct mlx5e_priv *priv)

{

	mlx5e_ethtool_cleanup_steering(priv);

	mlx5e_ethtool_cleanup_steering(priv->fs);

	rep_vport_rx_rule_destroy(priv);

	mlx5e_destroy_rep_root_ft(priv);

	mlx5_destroy_ttc_table(mlx5e_fs_get_ttc(priv->fs, false));

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

+2 −2
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int mlx5i_create_flow_steering(struct mlx5e_priv *priv) 
		goto err_destroy_arfs_tables;

	}



	mlx5e_ethtool_init_steering(priv);

	mlx5e_ethtool_init_steering(priv->fs);



	return 0;
@@ -358,7 +358,7 @@ static void mlx5i_destroy_flow_steering(struct mlx5e_priv *priv) 
{

	mlx5e_destroy_ttc_table(priv);

	mlx5e_arfs_destroy_tables(priv);

	mlx5e_ethtool_cleanup_steering(priv);

	mlx5e_ethtool_cleanup_steering(priv->fs);

}



static int mlx5i_init_rx(struct mlx5e_priv *priv)