Commit e5d4e1da authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: Refactor eswitch attr flags to just attr flags 



The flags are flow attrs and not esw specific attr flags.
Refactor to remove the esw prefix and move from eswitch.h
to en_tc.h where struct mlx5_flow_attr exists.

Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarOz Shlomo <ozsh@nvidia.com>
Reviewed-by: default avatarVlad Buslov <vladbu@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent efe6f961

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/accept.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ tc_act_parse_accept(struct mlx5e_tc_act_parse_state *parse_state, 
{

	attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |

			MLX5_FLOW_CONTEXT_ACTION_COUNT;

	attr->flags |= MLX5_ESW_ATTR_FLAG_ACCEPT;

	attr->flags |= MLX5_ATTR_FLAG_ACCEPT;



	return 0;

}

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/trap.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ tc_act_parse_trap(struct mlx5e_tc_act_parse_state *parse_state, 
{

	attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |

			MLX5_FLOW_CONTEXT_ACTION_COUNT;

	attr->flags |= MLX5_ESW_ATTR_FLAG_SLOW_PATH;

	attr->flags |= MLX5_ATTR_FLAG_SLOW_PATH;



	return 0;

}

drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c

+2 −2
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ add_post_rule(struct mlx5_eswitch *esw, struct mlx5e_sample_flow *sample_flow, 
	post_attr->chain = 0;

	post_attr->prio = 0;

	post_attr->ft = default_tbl;

	post_attr->flags = MLX5_ESW_ATTR_FLAG_NO_IN_PORT;

	post_attr->flags = MLX5_ATTR_FLAG_NO_IN_PORT;



	/* When offloading sample and encap action, if there is no valid

	 * neigh data struct, a slow path rule is offloaded first. Source
@@ -581,7 +581,7 @@ mlx5e_tc_sample_offload(struct mlx5e_tc_psample *tc_psample, 
	if (tunnel_id)

		pre_attr->action |= MLX5_FLOW_CONTEXT_ACTION_DECAP;

	pre_attr->modify_hdr = sample_flow->restore->modify_hdr;

	pre_attr->flags = MLX5_ESW_ATTR_FLAG_SAMPLE;

	pre_attr->flags = MLX5_ATTR_FLAG_SAMPLE;

	pre_attr->inner_match_level = attr->inner_match_level;

	pre_attr->outer_match_level = attr->outer_match_level;

	pre_attr->chain = attr->chain;

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

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ mlx5_tc_ct_entry_add_rule(struct mlx5_tc_ct_priv *ct_priv, 
	attr->ft = nat ? ct_priv->ct_nat : ct_priv->ct;

	attr->outer_match_level = MLX5_MATCH_L4;

	attr->counter = entry->counter->counter;

	attr->flags |= MLX5_ESW_ATTR_FLAG_NO_IN_PORT;

	attr->flags |= MLX5_ATTR_FLAG_NO_IN_PORT;

	if (ct_priv->ns_type == MLX5_FLOW_NAMESPACE_FDB)

		attr->esw_attr->in_mdev = priv->mdev;

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

+4 −4
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ mlx5e_tc_offload_fdb_rules(struct mlx5_eswitch *esw, 
	struct mlx5e_tc_mod_hdr_acts *mod_hdr_acts;

	struct mlx5_flow_handle *rule;



	if (attr->flags & MLX5_ESW_ATTR_FLAG_SLOW_PATH)

	if (attr->flags & MLX5_ATTR_FLAG_SLOW_PATH)

		return mlx5_eswitch_add_offloaded_rule(esw, spec, attr);



	if (flow_flag_test(flow, CT)) {
@@ -1196,7 +1196,7 @@ void mlx5e_tc_unoffload_fdb_rules(struct mlx5_eswitch *esw, 
{

	flow_flag_clear(flow, OFFLOADED);



	if (attr->flags & MLX5_ESW_ATTR_FLAG_SLOW_PATH)

	if (attr->flags & MLX5_ATTR_FLAG_SLOW_PATH)

		goto offload_rule_0;



	if (attr->esw_attr->split_count)
@@ -1226,7 +1226,7 @@ mlx5e_tc_offload_to_slow_path(struct mlx5_eswitch *esw, 
	memcpy(slow_attr, flow->attr, ESW_FLOW_ATTR_SZ);

	slow_attr->action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

	slow_attr->esw_attr->split_count = 0;

	slow_attr->flags |= MLX5_ESW_ATTR_FLAG_SLOW_PATH;

	slow_attr->flags |= MLX5_ATTR_FLAG_SLOW_PATH;



	rule = mlx5e_tc_offload_fdb_rules(esw, flow, spec, slow_attr);

	if (!IS_ERR(rule))
@@ -1251,7 +1251,7 @@ void mlx5e_tc_unoffload_from_slow_path(struct mlx5_eswitch *esw, 
	memcpy(slow_attr, flow->attr, ESW_FLOW_ATTR_SZ);

	slow_attr->action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

	slow_attr->esw_attr->split_count = 0;

	slow_attr->flags |= MLX5_ESW_ATTR_FLAG_SLOW_PATH;

	slow_attr->flags |= MLX5_ATTR_FLAG_SLOW_PATH;

	mlx5e_tc_unoffload_fdb_rules(esw, flow, slow_attr);

	flow_flag_clear(flow, SLOW);

	kfree(slow_attr);