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

Commit 2f4fe4ca authored by Or Gerlitz's avatar Or Gerlitz Committed by Saeed Mahameed
Browse files

net/mlx5e: Add offloading of NIC TC pedit (header re-write) actions 



This includes calling the parsing code that translates from pedit
speak to the HW API, allocation (deallocation) of a modify header
context and setting the modify header id associated with this
context to the FTE of that flow.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent d79b6df6

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

+35 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
struct mlx5_nic_flow_attr {

	u32 action;

	u32 flow_tag;

	u32 mod_hdr_id;

};



enum {
@@ -97,10 +98,12 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 
		.action = attr->action,

		.flow_tag = attr->flow_tag,

		.encap_id = 0,

		.modify_id = attr->mod_hdr_id,

	};

	struct mlx5_fc *counter = NULL;

	struct mlx5_flow_handle *rule;

	bool table_created = false;

	int err;



	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {

		dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;
@@ -114,6 +117,18 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 
		dest.counter = counter;

	}



	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {

		err = mlx5_modify_header_alloc(dev, MLX5_FLOW_NAMESPACE_KERNEL,

					       parse_attr->num_mod_hdr_actions,

					       parse_attr->mod_hdr_actions,

					       &attr->mod_hdr_id);

		kfree(parse_attr->mod_hdr_actions);

		if (err) {

			rule = ERR_PTR(err);

			goto err_create_mod_hdr_id;

		}

	}



	if (IS_ERR_OR_NULL(priv->fs.tc.t)) {

		priv->fs.tc.t =

			mlx5_create_auto_grouped_flow_table(priv->fs.ns,
@@ -146,6 +161,10 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 
		priv->fs.tc.t = NULL;

	}

err_create_ft:

	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)

		mlx5_modify_header_dealloc(priv->mdev,

					   attr->mod_hdr_id);

err_create_mod_hdr_id:

	mlx5_fc_destroy(dev, counter);



	return rule;
@@ -164,6 +183,10 @@ static void mlx5e_tc_del_nic_flow(struct mlx5e_priv *priv, 
		mlx5_destroy_flow_table(priv->fs.tc.t);

		priv->fs.tc.t = NULL;

	}



	if (flow->nic_attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)

		mlx5_modify_header_dealloc(priv->mdev,

					   flow->nic_attr->mod_hdr_id);

}



static void mlx5e_detach_encap(struct mlx5e_priv *priv,
@@ -955,6 +978,7 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv, struct tcf_exts *exts, 
	struct mlx5_nic_flow_attr *attr = flow->nic_attr;

	const struct tc_action *a;

	LIST_HEAD(actions);

	int err;



	if (tc_no_actions(exts))

		return -EINVAL;
@@ -976,6 +1000,17 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv, struct tcf_exts *exts, 
			continue;

		}



		if (is_tcf_pedit(a)) {

			err = parse_tc_pedit_action(priv, a, MLX5_FLOW_NAMESPACE_KERNEL,

						    parse_attr);

			if (err)

				return err;



			attr->action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR |

					MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

			continue;

		}



		if (is_tcf_skbedit_mark(a)) {

			u32 mark = tcf_skbedit_mark(a);