Commit 7f2fd0a5 authored by Paul Blakey's avatar Paul Blakey Committed by Saeed Mahameed
Browse files

net/mlx5e: Disallow inserting vxlan/vlan egress rules without decap/pop 



Currently, rules on tunnel devices can be offloaded without decap action
when a vlan pop action exists. Similarly, the driver will offload rules
on vlan interfaces with no pop action when a decap action exists.

Disallow the faulty behavior by checking that vlan egress rules do pop or
drop and vxlan egress rules do decap, as intended.

Signed-off-by: default avatarPaul Blakey <paulb@mellanox.com>
Reviewed-by: default avatarOz Shlomo <ozsh@mellanox.com>
Reviewed-by: default avatarMark Bloch <markb@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent ea4cd837

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

+15 −5
Original line number Diff line number Diff line
@@ -2675,6 +2675,8 @@ static bool actions_match_supported(struct mlx5e_priv *priv, 
				    struct mlx5e_tc_flow *flow,

				    struct netlink_ext_ack *extack)

{

	struct net_device *filter_dev = parse_attr->filter_dev;

	bool drop_action, decap_action, pop_action;

	u32 actions;



	if (mlx5e_is_eswitch_flow(flow))
@@ -2682,11 +2684,19 @@ static bool actions_match_supported(struct mlx5e_priv *priv, 
	else

		actions = flow->nic_attr->action;



	if (flow_flag_test(flow, EGRESS) &&

	    !((actions & MLX5_FLOW_CONTEXT_ACTION_DECAP) ||

	      (actions & MLX5_FLOW_CONTEXT_ACTION_VLAN_POP) ||

	      (actions & MLX5_FLOW_CONTEXT_ACTION_DROP)))

	drop_action = actions & MLX5_FLOW_CONTEXT_ACTION_DROP;

	decap_action = actions & MLX5_FLOW_CONTEXT_ACTION_DECAP;

	pop_action = actions & MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;



	if (flow_flag_test(flow, EGRESS) && !drop_action) {

		/* If no drop, we must decap (vxlan) or pop (vlan) */

		if (mlx5e_get_tc_tun(filter_dev) && !decap_action)

			return false;

		else if (is_vlan_dev(filter_dev) && !pop_action)

			return false;

		else

			return false; /* Sanity */

	}



	if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)

		return modify_header_match_supported(&parse_attr->spec,

CRA Git | Maintained and supported by SUSTech CRA and CCSE