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

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
...@@ -2675,6 +2675,8 @@ static bool actions_match_supported(struct mlx5e_priv *priv, ...@@ -2675,6 +2675,8 @@ static bool actions_match_supported(struct mlx5e_priv *priv,
struct mlx5e_tc_flow *flow, struct mlx5e_tc_flow *flow,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct net_device *filter_dev = parse_attr->filter_dev;
bool drop_action, decap_action, pop_action;
u32 actions; u32 actions;
if (mlx5e_is_eswitch_flow(flow)) if (mlx5e_is_eswitch_flow(flow))
...@@ -2682,11 +2684,19 @@ static bool actions_match_supported(struct mlx5e_priv *priv, ...@@ -2682,11 +2684,19 @@ static bool actions_match_supported(struct mlx5e_priv *priv,
else else
actions = flow->nic_attr->action; actions = flow->nic_attr->action;
if (flow_flag_test(flow, EGRESS) && drop_action = actions & MLX5_FLOW_CONTEXT_ACTION_DROP;
!((actions & MLX5_FLOW_CONTEXT_ACTION_DECAP) || decap_action = actions & MLX5_FLOW_CONTEXT_ACTION_DECAP;
(actions & MLX5_FLOW_CONTEXT_ACTION_VLAN_POP) || pop_action = actions & MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;
(actions & MLX5_FLOW_CONTEXT_ACTION_DROP)))
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; return false;
else
return false; /* Sanity */
}
if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
return modify_header_match_supported(&parse_attr->spec, return modify_header_match_supported(&parse_attr->spec,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment