[net,V3,13/14] net/mlx5e: Fix VLAN create flow

Message ID	20201002180654.262800-14-saeed@kernel.org
State	Accepted
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: saeed@kernel.org To: "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org> Cc: netdev@vger.kernel.org, Aya Levin <ayal@nvidia.com>, Moshe Shemesh <moshe@nvidia.com>, Saeed Mahameed <saeedm@nvidia.com> Subject: [net V3 13/14] net/mlx5e: Fix VLAN create flow Date: Fri, 2 Oct 2020 11:06:53 -0700 Message-Id: <20201002180654.262800-14-saeed@kernel.org> In-Reply-To: <20201002180654.262800-1-saeed@kernel.org> References: <20201002180654.262800-1-saeed@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[net,V3,01/14] net/mlx5: Fix a race when moving command interface to polling mode \| expand [net,V3,01/14] net/mlx5: Fix a race when moving command interface to polling mode [net,V3,02/14] net/mlx5: Avoid possible free of command entry while timeout comp handler [net,V3,03/14] net/mlx5: poll cmd EQ in case of command timeout [net,V3,04/14] net/mlx5: Add retry mechanism to the command entry index allocation [net,V3,05/14] net/mlx5: cmdif, Avoid skipping reclaim pages if FW is not accessible [net,V3,06/14] net/mlx5: Fix request_irqs error flow [net,V3,07/14] net/mlx5e: Fix error path for RQ alloc [net,V3,08/14] net/mlx5e: Add resiliency in Striding RQ mode for packets larger than MTU [net,V3,09/14] net/mlx5e: CT, Fix coverity issue [net,V3,10/14] net/mlx5e: Fix driver's declaration to support GRE offload [net,V3,11/14] net/mlx5e: Fix return status when setting unsupported FEC mode [net,V3,12/14] net/mlx5e: Fix VLAN cleanup flow [net,V3,13/14] net/mlx5e: Fix VLAN create flow [net,V3,14/14] net/mlx5e: Fix race condition on nhe->n pointer in neigh update

Message ID

20201002180654.262800-14-saeed@kernel.org

State

Accepted

Delegated to:

David Miller

Headers

From: saeed@kernel.org
To: "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, Aya Levin <ayal@nvidia.com>,
        Moshe Shemesh <moshe@nvidia.com>,
        Saeed Mahameed <saeedm@nvidia.com>
Subject: [net V3 13/14] net/mlx5e: Fix VLAN create flow
Date: Fri,  2 Oct 2020 11:06:53 -0700
Message-Id: <20201002180654.262800-14-saeed@kernel.org>
In-Reply-To: <20201002180654.262800-1-saeed@kernel.org>
References: <20201002180654.262800-1-saeed@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[net,V3,01/14] net/mlx5: Fix a race when moving command interface to polling mode | expand

Commit Message

Saeed Mahameed Oct. 2, 2020, 6:06 p.m. UTC

From: Aya Levin <ayal@nvidia.com>

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: 9df30601c843 ("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>
---
 drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
index 55a4c3adaa05..1f48f99c0997 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
@@ -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);
 }

[net,V3,13/14] net/mlx5e: Fix VLAN create flow

Commit Message

Patch