[PATCH net-next 17/18] net/mlx5e: Lock device state in set features
From: Saeed Mahameed <hidden>
Date: 2016-06-17 14:49:21
Subsystem:
mellanox ethernet driver (mlx5e), mellanox mlx5 core vpi driver, networking drivers, the rest · Maintainers:
Saeed Mahameed, Tariq Toukan, Mark Bloch, Leon Romanovsky, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Maor Gottlieb <redacted> Lock device state in mlx5e_set_features, rather than make each set feature handler lock it itself. Signed-off-by: Maor Gottlieb <redacted> Signed-off-by: Saeed Mahameed <redacted> --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 982f852..94d6f60 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c@@ -2247,7 +2247,6 @@ static int set_feature_lro(struct net_device *netdev, bool enable) bool was_opened = test_bit(MLX5E_STATE_OPENED, &priv->state); int err; - mutex_lock(&priv->state_lock); if (was_opened && (priv->params.rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST)) mlx5e_close_locked(priv->netdev);
@@ -2262,8 +2261,6 @@ static int set_feature_lro(struct net_device *netdev, bool enable) if (was_opened && (priv->params.rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST)) mlx5e_open_locked(priv->netdev); - mutex_unlock(&priv->state_lock); - return err; }
@@ -2305,15 +2302,11 @@ static int set_feature_rx_vlan(struct net_device *netdev, bool enable) struct mlx5e_priv *priv = netdev_priv(netdev); int err; - mutex_lock(&priv->state_lock); - priv->params.vlan_strip_disable = !enable; err = mlx5e_modify_rqs_vsd(priv, !enable); if (err) priv->params.vlan_strip_disable = enable; - mutex_unlock(&priv->state_lock); - return err; }
@@ -2358,8 +2351,11 @@ static int mlx5e_handle_feature(struct net_device *netdev, static int mlx5e_set_features(struct net_device *netdev, netdev_features_t features) { + struct mlx5e_priv *priv = netdev_priv(netdev); int err; + mutex_lock(&priv->state_lock); + err = mlx5e_handle_feature(netdev, features, NETIF_F_LRO, set_feature_lro); err |= mlx5e_handle_feature(netdev, features,
@@ -2376,6 +2372,8 @@ static int mlx5e_set_features(struct net_device *netdev, set_feature_arfs); #endif + mutex_unlock(&priv->state_lock); + return err ? -EINVAL : 0; }
--
2.8.0