Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c40348c authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/mlx5e: Adjustments in the TC offload code towards reuse for SRIOV 



Towards reusing the TC offloads code for an SRIOV use-case, change some of the
helper functions to have _nic in their names so it's clear what's NIC unique
and what's general. Also group together the NIC related helpers so we can easily
branch per the use-case in downstream patch.

Signed-off-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 3d80d1a2

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

+16 −16
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct mlx5e_tc_flow { 
#define MLX5E_TC_TABLE_NUM_ENTRIES 1024

#define MLX5E_TC_TABLE_NUM_GROUPS 4



static struct mlx5_flow_rule *mlx5e_tc_add_flow(struct mlx5e_priv *priv,

static struct mlx5_flow_rule *mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv,

						    struct mlx5_flow_spec *spec,

						    u32 action, u32 flow_tag)

{
@@ -120,7 +120,7 @@ static void mlx5e_tc_del_flow(struct mlx5e_priv *priv, 


	mlx5_fc_destroy(priv->mdev, counter);



	if (!mlx5e_tc_num_filters(priv)) {

	if (!mlx5e_tc_num_filters(priv) && (priv->fs.tc.t)) {

		mlx5_destroy_flow_table(priv->fs.tc.t);

		priv->fs.tc.t = NULL;

	}
@@ -295,7 +295,7 @@ static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec 
	return 0;

}



static int parse_tc_actions(struct mlx5e_priv *priv, struct tcf_exts *exts,

static int parse_tc_nic_actions(struct mlx5e_priv *priv, struct tcf_exts *exts,

				u32 *action, u32 *flow_tag)

{

	const struct tc_action *a;
@@ -369,28 +369,28 @@ int mlx5e_configure_flower(struct mlx5e_priv *priv, __be16 protocol, 
	if (err < 0)

		goto err_free;



	err = parse_tc_actions(priv, f->exts, &action, &flow_tag);

	err = parse_tc_nic_actions(priv, f->exts, &action, &flow_tag);

	if (err < 0)

		goto err_free;



	err = rhashtable_insert_fast(&tc->ht, &flow->node,

				     tc->ht_params);

	if (err)

		goto err_free;



	flow->rule = mlx5e_tc_add_flow(priv, spec, action, flow_tag);

	flow->rule = mlx5e_tc_add_nic_flow(priv, spec, action, flow_tag);

	if (IS_ERR(flow->rule)) {

		err = PTR_ERR(flow->rule);

		goto err_hash_del;

		goto err_free;

	}



	err = rhashtable_insert_fast(&tc->ht, &flow->node,

				     tc->ht_params);

	if (err)

		goto err_del_rule;



	if (old)

		mlx5e_tc_del_flow(priv, old);



	goto out;



err_hash_del:

	rhashtable_remove_fast(&tc->ht, &flow->node, tc->ht_params);

err_del_rule:

	mlx5_del_flow_rule(flow->rule);



err_free:

	if (!old)