Commit 1afbd1e2 authored by Liu, Changcheng's avatar Liu, Changcheng Committed by Saeed Mahameed
Browse files

net/mlx5: Lag, correct get the port select mode str 



mode & mode_flags is updated at the end of mlx5_activate_lag which
may not reflect the actual mode as shown in below logic:
    mlx5_activate_lag(struct mlx5_lag *ldev,
    |-- unsigned long flags = 0;
    |-- err = mlx5_lag_set_flags(ldev, mode, tracker, shared_fdb, &flags);
    |-- err = mlx5_create_lag(ldev, tracker, mode, flags);
              |-- mlx5_get_str_port_sel_mode(ldev);
    |-- ldev->mode = mode;
    |-- ldev->mode_flags = flags;
Use mode & flag as parameters to get port select mode info.

Fixes: 94db3317 ("net/mlx5: Support multiport eswitch mode")
Signed-off-by: default avatarLiu, Changcheng <jerrliu@nvidia.com>
Reviewed-by: default avatarEli Cohen <elic@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 0c9d8765

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static int port_sel_mode_show(struct seq_file *file, void *priv) 
	ldev = dev->priv.lag;

	mutex_lock(&ldev->lock);

	if (__mlx5_lag_is_active(ldev))

		mode = mlx5_get_str_port_sel_mode(ldev);

		mode = mlx5_get_str_port_sel_mode(ldev->mode, ldev->mode_flags);

	else

		ret = -EINVAL;

	mutex_unlock(&ldev->lock);

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

+3 −3
Original line number Diff line number Diff line
@@ -487,9 +487,9 @@ static int mlx5_lag_set_flags(struct mlx5_lag *ldev, enum mlx5_lag_mode mode, 
	return 0;

}



char *mlx5_get_str_port_sel_mode(struct mlx5_lag *ldev)

char *mlx5_get_str_port_sel_mode(enum mlx5_lag_mode mode, unsigned long flags)

{

	int port_sel_mode = get_port_sel_mode(ldev->mode, ldev->mode_flags);

	int port_sel_mode = get_port_sel_mode(mode, flags);



	switch (port_sel_mode) {

	case MLX5_LAG_PORT_SELECT_MODE_QUEUE_AFFINITY: return "queue_affinity";
@@ -513,7 +513,7 @@ static int mlx5_create_lag(struct mlx5_lag *ldev, 
	if (tracker)

		mlx5_lag_print_mapping(dev0, ldev, tracker, flags);

	mlx5_core_info(dev0, "shared_fdb:%d mode:%s\n",

		       shared_fdb, mlx5_get_str_port_sel_mode(ldev));

		       shared_fdb, mlx5_get_str_port_sel_mode(mode, flags));



	err = mlx5_cmd_create_lag(dev0, ldev->v2p_map, mode, flags);

	if (err) {

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

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ bool mlx5_shared_fdb_supported(struct mlx5_lag *ldev); 
void mlx5_lag_del_mpesw_rule(struct mlx5_core_dev *dev);

int mlx5_lag_add_mpesw_rule(struct mlx5_core_dev *dev);



char *mlx5_get_str_port_sel_mode(struct mlx5_lag *ldev);

char *mlx5_get_str_port_sel_mode(enum mlx5_lag_mode mode, unsigned long flags);

void mlx5_infer_tx_enabled(struct lag_tracker *tracker, u8 num_ports,

			   u8 *ports, int *num_enabled);