You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
82 lines
3.0 KiB
82 lines
3.0 KiB
From 6c4177e30dbf47b63c1b16076e4de28345fba9f6 Mon Sep 17 00:00:00 2001
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
Date: Tue, 19 May 2020 07:49:17 -0400
|
|
Subject: [PATCH 255/312] [netdrv] net/mlx5e: Fix rejecting all egress rules
|
|
not on vlan
|
|
|
|
Message-id: <20200519074934.6303-47-ahleihel@redhat.com>
|
|
Patchwork-id: 310561
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.3 BZ 1663246 46/63] net/mlx5e: Fix rejecting all egress rules not on vlan
|
|
Bugzilla: 1663246
|
|
RH-Acked-by: Marcelo Leitner <mleitner@redhat.com>
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
RH-Acked-by: John Linville <linville@redhat.com>
|
|
RH-Acked-by: Ivan Vecera <ivecera@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1663246
|
|
Upstream: v5.7-rc1
|
|
|
|
commit d0645b3780954b7133d9a908009d166ae686bd2a
|
|
Author: Roi Dayan <roid@mellanox.com>
|
|
Date: Tue Mar 3 11:18:53 2020 +0200
|
|
|
|
net/mlx5e: Fix rejecting all egress rules not on vlan
|
|
|
|
The original condition rejected all egress rules that
|
|
are not on tunnel device.
|
|
Also, the whole point of this egress reject was to disallow bad
|
|
rules because of egdev which doesn't exists today, so remove
|
|
this check entirely.
|
|
|
|
Fixes: 0a7fcb78cc21 ("net/mlx5e: Support inner header rewrite with goto action")
|
|
Signed-off-by: Roi Dayan <roid@mellanox.com>
|
|
Reviewed-by: Oz Shlomo <ozsh@mellanox.com>
|
|
Reviewed-by: Vlad Buslov <vladbu@mellanox.com>
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
|
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
|
---
|
|
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 15 +--------------
|
|
1 file changed, 1 insertion(+), 14 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
|
index 48e4d7a5f7b8..e66a1e970196 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
|
@@ -3045,8 +3045,7 @@ 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, pop_action, ct_flow;
|
|
+ bool ct_flow;
|
|
u32 actions;
|
|
|
|
ct_flow = flow_flag_test(flow, CT);
|
|
@@ -3065,18 +3064,6 @@ static bool actions_match_supported(struct mlx5e_priv *priv,
|
|
actions = flow->nic_attr->action;
|
|
}
|
|
|
|
- drop_action = actions & MLX5_FLOW_CONTEXT_ACTION_DROP;
|
|
- pop_action = actions & MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;
|
|
-
|
|
- if (flow_flag_test(flow, EGRESS) && !drop_action) {
|
|
- /* We only support filters on tunnel device, or on vlan
|
|
- * devices if they have pop/drop action
|
|
- */
|
|
- if (!mlx5e_get_tc_tun(filter_dev) ||
|
|
- (is_vlan_dev(filter_dev) && !pop_action))
|
|
- return false;
|
|
- }
|
|
-
|
|
if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
|
|
return modify_header_match_supported(&parse_attr->spec,
|
|
flow_action, actions,
|
|
--
|
|
2.13.6
|
|
|