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

net/mlx5e: TC, Move pedit_headers_action to parse_attr 



Move pedit_headers_action from flow parse_state to flow parse_attr.
In a follow up commit we are going to have multiple attr per flow
and pedit_headers_action are unique per attr.

Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarOz Shlomo <ozsh@nvidia.com>
Reviewed-by: default avatarMaor Dickman <maord@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent df67ad62

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ struct mlx5e_tc_act_parse_state { 
	bool mpls_push;

	bool ptype_host;

	const struct ip_tunnel_info *tun_info;

	struct pedit_headers_action hdrs[__PEDIT_CMD_MAX];

	int ifindexes[MLX5_MAX_FLOW_FWD_VPORTS];

	int if_count;

	struct mlx5_tc_ct_priv *ct_priv;

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

+3 −5
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ static int 
parse_pedit_to_modify_hdr(struct mlx5e_priv *priv,

			  const struct flow_action_entry *act, int namespace,

			  struct mlx5e_tc_flow_parse_attr *parse_attr,

			  struct pedit_headers_action *hdrs,

			  struct netlink_ext_ack *extack)

{

	struct pedit_headers_action *hdrs = parse_attr->hdrs;

	u8 cmd = (act->id == FLOW_ACTION_MANGLE) ? 0 : 1;

	u8 htype = act->mangle.htype;

	int err = -EOPNOTSUPP;
@@ -110,14 +110,13 @@ int 
mlx5e_tc_act_pedit_parse_action(struct mlx5e_priv *priv,

				const struct flow_action_entry *act, int namespace,

				struct mlx5e_tc_flow_parse_attr *parse_attr,

				struct pedit_headers_action *hdrs,

				struct mlx5e_tc_flow *flow,

				struct netlink_ext_ack *extack)

{

	if (flow && flow_flag_test(flow, L3_TO_L2_DECAP))

		return parse_pedit_to_reformat(act, parse_attr, extack);



	return parse_pedit_to_modify_hdr(priv, act, namespace, parse_attr, hdrs, extack);

	return parse_pedit_to_modify_hdr(priv, act, namespace, parse_attr, extack);

}



static bool
@@ -141,8 +140,7 @@ tc_act_parse_pedit(struct mlx5e_tc_act_parse_state *parse_state, 


	ns_type = mlx5e_get_flow_namespace(flow);



	err = mlx5e_tc_act_pedit_parse_action(flow->priv, act, ns_type,

					      attr->parse_attr, parse_state->hdrs,

	err = mlx5e_tc_act_pedit_parse_action(flow->priv, act, ns_type, attr->parse_attr,

					      flow, parse_state->extack);

	if (err)

		return err;

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ int 
mlx5e_tc_act_pedit_parse_action(struct mlx5e_priv *priv,

				const struct flow_action_entry *act, int namespace,

				struct mlx5e_tc_flow_parse_attr *parse_attr,

				struct pedit_headers_action *hdrs,

				struct mlx5e_tc_flow *flow,

				struct netlink_ext_ack *extack);

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

+4 −6
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
static int

add_vlan_prio_tag_rewrite_action(struct mlx5e_priv *priv,

				 struct mlx5e_tc_flow_parse_attr *parse_attr,

				 struct pedit_headers_action *hdrs,

				 u32 *action, struct netlink_ext_ack *extack)

{

	const struct flow_action_entry prio_tag_act = {
@@ -26,7 +25,7 @@ add_vlan_prio_tag_rewrite_action(struct mlx5e_priv *priv, 
	};



	return mlx5e_tc_act_vlan_add_rewrite_action(priv, MLX5_FLOW_NAMESPACE_FDB,

						    &prio_tag_act, parse_attr, hdrs, action,

						    &prio_tag_act, parse_attr, action,

						    extack);

}
@@ -170,8 +169,8 @@ tc_act_parse_vlan(struct mlx5e_tc_act_parse_state *parse_state, 
		/* Replace vlan pop+push with vlan modify */

		attr->action &= ~MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;

		err = mlx5e_tc_act_vlan_add_rewrite_action(priv, MLX5_FLOW_NAMESPACE_FDB, act,

							   attr->parse_attr, parse_state->hdrs,

							   &attr->action, parse_state->extack);

							   attr->parse_attr, &attr->action,

							   parse_state->extack);

	} else {

		err = parse_tc_vlan_action(priv, act, esw_attr, &attr->action,

					   parse_state->extack);
@@ -191,7 +190,6 @@ tc_act_post_parse_vlan(struct mlx5e_tc_act_parse_state *parse_state, 
		       struct mlx5_flow_attr *attr)

{

	struct mlx5e_tc_flow_parse_attr *parse_attr = attr->parse_attr;

	struct pedit_headers_action *hdrs = parse_state->hdrs;

	struct netlink_ext_ack *extack = parse_state->extack;

	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;

	int err;
@@ -202,7 +200,7 @@ tc_act_post_parse_vlan(struct mlx5e_tc_act_parse_state *parse_state, 
		 * tag rewrite.

		 */

		attr->action &= ~MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;

		err = add_vlan_prio_tag_rewrite_action(priv, parse_attr, hdrs,

		err = add_vlan_prio_tag_rewrite_action(priv, parse_attr,

						       &attr->action, extack);

		if (err)

			return err;

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ int 
mlx5e_tc_act_vlan_add_rewrite_action(struct mlx5e_priv *priv, int namespace,

				     const struct flow_action_entry *act,

				     struct mlx5e_tc_flow_parse_attr *parse_attr,

				     struct pedit_headers_action *hdrs,

				     u32 *action, struct netlink_ext_ack *extack);



#endif /* __MLX5_EN_TC_ACT_VLAN_H__ */