Commit f9c195bf authored Sep 13, 2020 by Aya Levin Committed by Greg Kroah-Hartman Oct 14, 2020

net/mlx5e: Fix VLAN create flow



[ Upstream commit d4a16052bccdd695982f89d815ca075825115821 ]

When interface is attached while in promiscuous mode and with VLAN
filtering turned off, both configurations are not respected and VLAN
filtering is performed.
There are 2 flows which add the any-vid rules during interface attach:
VLAN creation table and set rx mode. Each is relaying on the other to
add any-vid rules, eventually non of them does.

Fix this by adding any-vid rules on VLAN creation regardless of
promiscuous mode.

Fixes: 9df30601 ("net/mlx5e: Restore vlan filter after seamless reset")
Signed-off-by: Aya Levin <ayal@nvidia.com>
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 7a592c67

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -217,6 +217,9 @@ static int __mlx5e_add_vlan_rule(struct mlx5e_priv *priv,
		break;
		}

		if (WARN_ONCE(*rule_p, "VLAN rule already exists type %d", rule_type))
		return 0;

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

		if (IS_ERR(*rule_p)) {
		@@ -397,8 +400,7 @@ static void mlx5e_add_vlan_rules(struct mlx5e_priv *priv)
		for_each_set_bit(i, priv->fs.vlan.active_svlans, VLAN_N_VID)
		mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_STAG_VID, i);

		if (priv->fs.vlan.cvlan_filter_disabled &&
		!(priv->netdev->flags & IFF_PROMISC))
		if (priv->fs.vlan.cvlan_filter_disabled)
		mlx5e_add_any_vid_rules(priv);
		}