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

Commit 66958ed9 authored by Hadar Hen Zion's avatar Hadar Hen Zion Committed by David S. Miller
Browse files

net/mlx5: Support encap id when setting new steering entry 



In order to support steering rules which add encapsulation headers,
encap_id parameter is needed.

Add new mlx5_flow_act struct which holds action related parameter:
action, flow_tag and encap_id. Use mlx5_flow_act struct when adding a new
steering rule.
This patch doesn't change any functionality.

Signed-off-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c9f1b073

drivers/infiniband/hw/mlx5/main.c

+5 −5
Original line number Diff line number Diff line
@@ -1877,10 +1877,10 @@ static struct mlx5_ib_flow_handler *create_flow_rule(struct mlx5_ib_dev *dev, 
{

	struct mlx5_flow_table	*ft = ft_prio->flow_table;

	struct mlx5_ib_flow_handler *handler;

	struct mlx5_flow_act flow_act = {0};

	struct mlx5_flow_spec *spec;

	const void *ib_flow = (const void *)flow_attr + sizeof(*flow_attr);

	unsigned int spec_index;

	u32 action;

	int err = 0;



	if (!is_valid_attr(flow_attr))
@@ -1905,11 +1905,11 @@ static struct mlx5_ib_flow_handler *create_flow_rule(struct mlx5_ib_dev *dev, 
	}



	spec->match_criteria_enable = get_match_criteria_enable(spec->match_criteria);

	action = dst ? MLX5_FLOW_CONTEXT_ACTION_FWD_DEST :

	flow_act.action = dst ? MLX5_FLOW_CONTEXT_ACTION_FWD_DEST :

		MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO;

	flow_act.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG;

	handler->rule = mlx5_add_flow_rules(ft, spec,

					   action,

					   MLX5_FS_DEFAULT_FLOW_TAG,

					    &flow_act,

					    dst, 1);



	if (IS_ERR(handler->rule)) {

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

+12 −5
Original line number Diff line number Diff line
@@ -174,6 +174,11 @@ static int arfs_add_default_rule(struct mlx5e_priv *priv, 
				 enum arfs_type type)

{

	struct arfs_table *arfs_t = &priv->fs.arfs.arfs_tables[type];

	struct mlx5_flow_act flow_act = {

		.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

		.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG,

		.encap_id = 0,

	};

	struct mlx5_flow_destination dest;

	struct mlx5e_tir *tir = priv->indir_tir;

	struct mlx5_flow_spec *spec;
@@ -206,8 +211,7 @@ static int arfs_add_default_rule(struct mlx5e_priv *priv, 
	}



	arfs_t->default_rule = mlx5_add_flow_rules(arfs_t->ft.t, spec,

						   MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

						   MLX5_FS_DEFAULT_FLOW_TAG,

						   &flow_act,

						   &dest, 1);

	if (IS_ERR(arfs_t->default_rule)) {

		err = PTR_ERR(arfs_t->default_rule);
@@ -465,6 +469,11 @@ static struct arfs_table *arfs_get_table(struct mlx5e_arfs_tables *arfs, 
static struct mlx5_flow_handle *arfs_add_rule(struct mlx5e_priv *priv,

					      struct arfs_rule *arfs_rule)

{

	struct mlx5_flow_act flow_act = {

		.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

		.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG,

		.encap_id = 0,

	};

	struct mlx5e_arfs_tables *arfs = &priv->fs.arfs;

	struct arfs_tuple *tuple = &arfs_rule->tuple;

	struct mlx5_flow_handle *rule = NULL;
@@ -544,9 +553,7 @@ static struct mlx5_flow_handle *arfs_add_rule(struct mlx5e_priv *priv, 
	}

	dest.type = MLX5_FLOW_DESTINATION_TYPE_TIR;

	dest.tir_num = priv->direct_tir[arfs_rule->rxq].tirn;

	rule = mlx5_add_flow_rules(ft, spec, MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

				   MLX5_FS_DEFAULT_FLOW_TAG,

				   &dest, 1);

	rule = mlx5_add_flow_rules(ft, spec, &flow_act, &dest, 1);

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);

		netdev_err(priv->netdev, "%s: add rule(filter id=%d, rq idx=%d) failed, err=%d\n",

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

+18 −11
Original line number Diff line number Diff line
@@ -158,6 +158,11 @@ static int __mlx5e_add_vlan_rule(struct mlx5e_priv *priv, 
				 enum mlx5e_vlan_rule_type rule_type,

				 u16 vid, struct mlx5_flow_spec *spec)

{

	struct mlx5_flow_act flow_act = {

		.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

		.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG,

		.encap_id = 0,

	};

	struct mlx5_flow_table *ft = priv->fs.vlan.ft.t;

	struct mlx5_flow_destination dest;

	struct mlx5_flow_handle **rule_p;
@@ -187,10 +192,7 @@ static int __mlx5e_add_vlan_rule(struct mlx5e_priv *priv, 
		break;

	}



	*rule_p = mlx5_add_flow_rules(ft, spec,

				      MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

				      MLX5_FS_DEFAULT_FLOW_TAG,

				      &dest, 1);

	*rule_p = mlx5_add_flow_rules(ft, spec, &flow_act, &dest, 1);



	if (IS_ERR(*rule_p)) {

		err = PTR_ERR(*rule_p);
@@ -623,6 +625,11 @@ mlx5e_generate_ttc_rule(struct mlx5e_priv *priv, 
			u16 etype,

			u8 proto)

{

	struct mlx5_flow_act flow_act = {

		.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

		.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG,

		.encap_id = 0,

	};

	struct mlx5_flow_handle *rule;

	struct mlx5_flow_spec *spec;

	int err = 0;
@@ -644,10 +651,7 @@ mlx5e_generate_ttc_rule(struct mlx5e_priv *priv, 
		MLX5_SET(fte_match_param, spec->match_value, outer_headers.ethertype, etype);

	}



	rule = mlx5_add_flow_rules(ft, spec,

				   MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

				   MLX5_FS_DEFAULT_FLOW_TAG,

				   dest, 1);

	rule = mlx5_add_flow_rules(ft, spec, &flow_act, dest, 1);

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);

		netdev_err(priv->netdev, "%s: add rule failed\n", __func__);
@@ -810,6 +814,11 @@ static void mlx5e_del_l2_flow_rule(struct mlx5e_priv *priv, 
static int mlx5e_add_l2_flow_rule(struct mlx5e_priv *priv,

				  struct mlx5e_l2_rule *ai, int type)

{

	struct mlx5_flow_act flow_act = {

		.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

		.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG,

		.encap_id = 0,

	};

	struct mlx5_flow_table *ft = priv->fs.l2.ft.t;

	struct mlx5_flow_destination dest;

	struct mlx5_flow_spec *spec;
@@ -848,9 +857,7 @@ static int mlx5e_add_l2_flow_rule(struct mlx5e_priv *priv, 
		break;

	}



	ai->rule = mlx5_add_flow_rules(ft, spec,

				       MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

				       MLX5_FS_DEFAULT_FLOW_TAG, &dest, 1);

	ai->rule = mlx5_add_flow_rules(ft, spec, &flow_act, &dest, 1);

	if (IS_ERR(ai->rule)) {

		netdev_err(priv->netdev, "%s: add l2 rule(mac:%pM) failed\n",

			   __func__, mv_dmac);

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

+5 −5
Original line number Diff line number Diff line
@@ -290,10 +290,10 @@ add_ethtool_flow_rule(struct mlx5e_priv *priv, 
		      struct ethtool_rx_flow_spec *fs)

{

	struct mlx5_flow_destination *dst = NULL;

	struct mlx5_flow_act flow_act = {0};

	struct mlx5_flow_spec *spec;

	struct mlx5_flow_handle *rule;

	int err = 0;

	u32 action;



	spec = mlx5_vzalloc(sizeof(*spec));

	if (!spec)
@@ -304,7 +304,7 @@ add_ethtool_flow_rule(struct mlx5e_priv *priv, 
		goto free;



	if (fs->ring_cookie == RX_CLS_FLOW_DISC) {

		action = MLX5_FLOW_CONTEXT_ACTION_DROP;

		flow_act.action = MLX5_FLOW_CONTEXT_ACTION_DROP;

	} else {

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

		if (!dst) {
@@ -314,12 +314,12 @@ add_ethtool_flow_rule(struct mlx5e_priv *priv, 


		dst->type = MLX5_FLOW_DESTINATION_TYPE_TIR;

		dst->tir_num = priv->direct_tir[fs->ring_cookie].tirn;

		action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

		flow_act.action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

	}



	spec->match_criteria_enable = (!outer_header_zero(spec->match_criteria));

	rule = mlx5_add_flow_rules(ft, spec, action,

				   MLX5_FS_DEFAULT_FLOW_TAG, dst, 1);

	flow_act.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG;

	rule = mlx5_add_flow_rules(ft, spec, &flow_act, dst, 1);

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);

		netdev_err(priv->netdev, "%s: failed to add ethtool steering rule: %d\n",

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

+6 −3
Original line number Diff line number Diff line
@@ -61,6 +61,11 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 
{

	struct mlx5_core_dev *dev = priv->mdev;

	struct mlx5_flow_destination dest = { 0 };

	struct mlx5_flow_act flow_act = {

		.action = action,

		.flow_tag = flow_tag,

		.encap_id = 0,

	};

	struct mlx5_fc *counter = NULL;

	struct mlx5_flow_handle *rule;

	bool table_created = false;
@@ -95,9 +100,7 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 
	}



	spec->match_criteria_enable = MLX5_MATCH_OUTER_HEADERS;

	rule = mlx5_add_flow_rules(priv->fs.tc.t, spec,

				   action, flow_tag,

				   &dest, 1);

	rule = mlx5_add_flow_rules(priv->fs.tc.t, spec, &flow_act, &dest, 1);



	if (IS_ERR(rule))

		goto err_add_rule;