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

Commit 35a605db authored by Eli Britstein's avatar Eli Britstein Committed by Saeed Mahameed
Browse files

net/mlx5e: Offload TC e-switch rules with ingress VLAN device 



Offload TC rule on a VLAN device by matching the VLAN properties
of the VLAN device and emulating vlan pop actions.

Signed-off-by: default avatarEli Britstein <elibr@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 278748a9

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

+2 −1
Original line number Diff line number Diff line
@@ -795,7 +795,8 @@ static int mlx5e_nic_rep_netdevice_event(struct notifier_block *nb, 
	struct mlx5e_priv *priv = netdev_priv(rpriv->netdev);

	struct net_device *netdev = netdev_notifier_info_to_dev(ptr);



	if (!mlx5e_tc_tun_device_to_offload(priv, netdev))

	if (!mlx5e_tc_tun_device_to_offload(priv, netdev) &&

	    !is_vlan_dev(netdev))

		return NOTIFY_OK;



	switch (event) {

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

+42 −4
Original line number Diff line number Diff line
@@ -1541,11 +1541,23 @@ static int __parse_cls_flower(struct mlx5e_priv *priv, 
		if (match.mask->n_proto)

			*match_level = MLX5_MATCH_L2;

	}



	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_VLAN)) {

	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_VLAN) ||

	    is_vlan_dev(filter_dev)) {

		struct flow_dissector_key_vlan filter_dev_mask;

		struct flow_dissector_key_vlan filter_dev_key;

		struct flow_match_vlan match;



		if (is_vlan_dev(filter_dev)) {

			match.key = &filter_dev_key;

			match.key->vlan_id = vlan_dev_vlan_id(filter_dev);

			match.key->vlan_tpid = vlan_dev_vlan_proto(filter_dev);

			match.key->vlan_priority = 0;

			match.mask = &filter_dev_mask;

			memset(match.mask, 0xff, sizeof(*match.mask));

			match.mask->vlan_priority = 0;

		} else {

			flow_rule_match_vlan(rule, &match);

		}

		if (match.mask->vlan_id ||

		    match.mask->vlan_priority ||

		    match.mask->vlan_tpid) {
@@ -2252,7 +2264,8 @@ static bool actions_match_supported(struct mlx5e_priv *priv, 
		actions = flow->nic_attr->action;



	if (flow->flags & MLX5E_TC_FLOW_EGRESS &&

	    !(actions & MLX5_FLOW_CONTEXT_ACTION_DECAP))

	    !((actions & MLX5_FLOW_CONTEXT_ACTION_DECAP) ||

	      (actions & MLX5_FLOW_CONTEXT_ACTION_VLAN_POP)))

		return false;



	if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
@@ -2608,6 +2621,25 @@ static int add_vlan_push_action(struct mlx5e_priv *priv, 
	return err;

}



static int add_vlan_pop_action(struct mlx5e_priv *priv,

			       struct mlx5_esw_flow_attr *attr,

			       u32 *action)

{

	int nest_level = vlan_get_encap_level(attr->parse_attr->filter_dev);

	struct flow_action_entry vlan_act = {

		.id = FLOW_ACTION_VLAN_POP,

	};

	int err = 0;



	while (nest_level--) {

		err = parse_tc_vlan_action(priv, &vlan_act, attr, action);

		if (err)

			return err;

	}



	return err;

}



static int parse_tc_fdb_actions(struct mlx5e_priv *priv,

				struct flow_action *flow_action,

				struct mlx5e_tc_flow *flow,
@@ -2695,6 +2727,12 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, 
					if (err)

						return err;

				}

				if (is_vlan_dev(parse_attr->filter_dev)) {

					err = add_vlan_pop_action(priv, attr,

								  &action);

					if (err)

						return err;

				}



				if (!mlx5e_eswitch_rep(out_dev))

					return -EOPNOTSUPP;