Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daa21560 authored by Tariq Toukan's avatar Tariq Toukan Committed by David S. Miller
Browse files

net/mlx5e: Replace async events spinlock with synchronize_irq() 



We only need to flush the irq handler to make sure it does not
queue a work into the global work queue after we start to flush it.
So using synchronize_irq() is more appropriate than a spin lock.

Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f25a111

drivers/net/ethernet/mellanox/mlx5/core/en.h

+0 −1
Original line number Diff line number Diff line
@@ -555,7 +555,6 @@ struct mlx5e_priv { 
	struct mlx5e_vxlan_db      vxlan;



	struct mlx5e_params        params;

	spinlock_t                 async_events_spinlock; /* sync hw events */

	struct work_struct         update_carrier_work;

	struct work_struct         set_rx_mode_work;

	struct delayed_work        update_stats_work;

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

+8 −16
Original line number Diff line number Diff line
@@ -275,9 +275,14 @@ static void mlx5e_update_stats_work(struct work_struct *work) 
	mutex_unlock(&priv->state_lock);

}



static void __mlx5e_async_event(struct mlx5e_priv *priv,

				enum mlx5_dev_event event)

static void mlx5e_async_event(struct mlx5_core_dev *mdev, void *vpriv,

			      enum mlx5_dev_event event, unsigned long param)

{

	struct mlx5e_priv *priv = vpriv;



	if (!test_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLE, &priv->state))

		return;



	switch (event) {

	case MLX5_DEV_EVENT_PORT_UP:

	case MLX5_DEV_EVENT_PORT_DOWN:
@@ -289,17 +294,6 @@ static void __mlx5e_async_event(struct mlx5e_priv *priv, 
	}

}



static void mlx5e_async_event(struct mlx5_core_dev *mdev, void *vpriv,

			      enum mlx5_dev_event event, unsigned long param)

{

	struct mlx5e_priv *priv = vpriv;



	spin_lock(&priv->async_events_spinlock);

	if (test_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLE, &priv->state))

		__mlx5e_async_event(priv, event);

	spin_unlock(&priv->async_events_spinlock);

}



static void mlx5e_enable_async_events(struct mlx5e_priv *priv)

{

	set_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLE, &priv->state);
@@ -307,9 +301,8 @@ static void mlx5e_enable_async_events(struct mlx5e_priv *priv) 


static void mlx5e_disable_async_events(struct mlx5e_priv *priv)

{

	spin_lock_irq(&priv->async_events_spinlock);

	clear_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLE, &priv->state);

	spin_unlock_irq(&priv->async_events_spinlock);

	synchronize_irq(mlx5_get_msix_vec(priv->mdev, MLX5_EQ_VEC_ASYNC));

}



#define MLX5E_HW2SW_MTU(hwmtu) (hwmtu - (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN))
@@ -2290,7 +2283,6 @@ static void mlx5e_build_netdev_priv(struct mlx5_core_dev *mdev, 
	mlx5e_ets_init(priv);

#endif



	spin_lock_init(&priv->async_events_spinlock);

	mutex_init(&priv->state_lock);



	INIT_WORK(&priv->update_carrier_work, mlx5e_update_carrier_work);

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

+5 −0
Original line number Diff line number Diff line
@@ -442,6 +442,11 @@ int mlx5_destroy_unmap_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq) 
}

EXPORT_SYMBOL_GPL(mlx5_destroy_unmap_eq);



u32 mlx5_get_msix_vec(struct mlx5_core_dev *dev, int vecidx)

{

	return dev->priv.msix_arr[MLX5_EQ_VEC_ASYNC].vector;

}



int mlx5_eq_init(struct mlx5_core_dev *dev)

{

	int err;

drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ int mlx5_core_enable_hca(struct mlx5_core_dev *dev, u16 func_id); 
int mlx5_core_disable_hca(struct mlx5_core_dev *dev, u16 func_id);

int mlx5_wait_for_vf_pages(struct mlx5_core_dev *dev);

cycle_t mlx5_read_internal_timer(struct mlx5_core_dev *dev);

u32 mlx5_get_msix_vec(struct mlx5_core_dev *dev, int vecidx);



void mlx5e_init(void);

void mlx5e_cleanup(void);