Commit bd7b9f83 authored by Shay Drory's avatar Shay Drory Committed by Jakub Kicinski
Browse files

net/mlx5: LAG, disable MPESW in lag_disable_change() 



mlx5_lag_disable_change() unconditionally called mlx5_disable_lag() when
LAG was active, which is incorrect for MLX5_LAG_MODE_MPESW.
Hnece, call mlx5_disable_mpesw() when running in MPESW mode.

Fixes: a32327a3 ("net/mlx5: Lag, Control MultiPort E-Switch single FDB mode")
Signed-off-by: default avatarShay Drory <shayd@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20260224114652.1787431-3-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2700b7e6

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

+6 −2
Original line number Diff line number Diff line
@@ -1869,8 +1869,12 @@ void mlx5_lag_disable_change(struct mlx5_core_dev *dev) 
	mutex_lock(&ldev->lock);



	ldev->mode_changes_in_progress++;

	if (__mlx5_lag_is_active(ldev))

	if (__mlx5_lag_is_active(ldev)) {

		if (ldev->mode == MLX5_LAG_MODE_MPESW)

			mlx5_lag_disable_mpesw(ldev);

		else

			mlx5_disable_lag(ldev);

	}



	mutex_unlock(&ldev->lock);

	mlx5_devcom_comp_unlock(dev->priv.hca_devcom_comp);

drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c

+4 −4
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int mlx5_mpesw_metadata_set(struct mlx5_lag *ldev) 
	return err;

}



static int enable_mpesw(struct mlx5_lag *ldev)

static int mlx5_lag_enable_mpesw(struct mlx5_lag *ldev)

{

	struct mlx5_core_dev *dev0;

	int err;
@@ -126,7 +126,7 @@ static int enable_mpesw(struct mlx5_lag *ldev) 
	return err;

}



static void disable_mpesw(struct mlx5_lag *ldev)

void mlx5_lag_disable_mpesw(struct mlx5_lag *ldev)

{

	if (ldev->mode == MLX5_LAG_MODE_MPESW) {

		mlx5_mpesw_metadata_cleanup(ldev);
@@ -152,9 +152,9 @@ static void mlx5_mpesw_work(struct work_struct *work) 
	}



	if (mpesww->op == MLX5_MPESW_OP_ENABLE)

		mpesww->result = enable_mpesw(ldev);

		mpesww->result = mlx5_lag_enable_mpesw(ldev);

	else if (mpesww->op == MLX5_MPESW_OP_DISABLE)

		disable_mpesw(ldev);

		mlx5_lag_disable_mpesw(ldev);

unlock:

	mutex_unlock(&ldev->lock);

	mlx5_devcom_comp_unlock(devcom);

drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.h

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ int mlx5_lag_mpesw_do_mirred(struct mlx5_core_dev *mdev, 
bool mlx5_lag_is_mpesw(struct mlx5_core_dev *dev);

void mlx5_lag_mpesw_disable(struct mlx5_core_dev *dev);

int mlx5_lag_mpesw_enable(struct mlx5_core_dev *dev);

#ifdef CONFIG_MLX5_ESWITCH

void mlx5_lag_disable_mpesw(struct mlx5_lag *ldev);

#else

static inline void mlx5_lag_disable_mpesw(struct mlx5_lag *ldev) {}

#endif /* CONFIG_MLX5_ESWITCH */



#ifdef CONFIG_MLX5_ESWITCH

void mlx5_mpesw_speed_update_work(struct work_struct *work);