Commit 14fe2471 authored by Maor Dickman's avatar Maor Dickman Committed by Saeed Mahameed
Browse files

net/mlx5: Lag, change multipath and bonding to be mutually exclusive 



Both multipath and bonding events are changing the HW LAG state
independently.
Handling one of the features events while the other is already
enabled can cause unwanted behavior, for example handling
bonding event while multipath enabled will disable the lag and
cause multipath to stop working.

Fix it by ignoring bonding event while in multipath and ignoring FIB
events while in bonding mode.

Fixes: 544fe7c2 ("net/mlx5e: Activate HW multipath and handle port affinity based on FIB events")
Signed-off-by: default avatarMaor Dickman <maord@nvidia.com>
Reviewed-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 4225fea1

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#include "en_tc.h"

#include "rep/tc.h"

#include "rep/neigh.h"

#include "lag.h"

#include "lag_mp.h"



struct mlx5e_tc_tun_route_attr {

	struct net_device *out_dev;

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

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
#include "lib/fs_chains.h"

#include "diag/en_tc_tracepoint.h"

#include <asm/div64.h>

#include "lag.h"

#include "lag_mp.h"



#define nic_chains(priv) ((priv)->fs.tc.chains)

#define MLX5_MH_ACT_SZ MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto)

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

+4 −0
Original line number Diff line number Diff line
@@ -442,6 +442,10 @@ static void mlx5_do_bond(struct mlx5_lag *ldev) 
	if (!mlx5_lag_is_ready(ldev)) {

		do_bond = false;

	} else {

		/* VF LAG is in multipath mode, ignore bond change requests */

		if (mlx5_lag_is_multipath(dev0))

			return;



		tracker = ldev->tracker;



		do_bond = tracker.is_bonded && mlx5_lag_check_prereq(ldev);

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

+8 −5
Original line number Diff line number Diff line
@@ -9,20 +9,23 @@ 
#include "eswitch.h"

#include "lib/mlx5.h"



static bool __mlx5_lag_is_multipath(struct mlx5_lag *ldev)

{

	return !!(ldev->flags & MLX5_LAG_FLAG_MULTIPATH);

}



static bool mlx5_lag_multipath_check_prereq(struct mlx5_lag *ldev)

{

	if (!mlx5_lag_is_ready(ldev))

		return false;



	if (__mlx5_lag_is_active(ldev) && !__mlx5_lag_is_multipath(ldev))

		return false;



	return mlx5_esw_multipath_prereq(ldev->pf[MLX5_LAG_P1].dev,

					 ldev->pf[MLX5_LAG_P2].dev);

}



static bool __mlx5_lag_is_multipath(struct mlx5_lag *ldev)

{

	return !!(ldev->flags & MLX5_LAG_FLAG_MULTIPATH);

}



bool mlx5_lag_is_multipath(struct mlx5_core_dev *dev)

{

	struct mlx5_lag *ldev;

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

+2 −0
Original line number Diff line number Diff line
@@ -24,12 +24,14 @@ struct lag_mp { 
void mlx5_lag_mp_reset(struct mlx5_lag *ldev);

int mlx5_lag_mp_init(struct mlx5_lag *ldev);

void mlx5_lag_mp_cleanup(struct mlx5_lag *ldev);

bool mlx5_lag_is_multipath(struct mlx5_core_dev *dev);



#else /* CONFIG_MLX5_ESWITCH */



static inline void mlx5_lag_mp_reset(struct mlx5_lag *ldev) {};

static inline int mlx5_lag_mp_init(struct mlx5_lag *ldev) { return 0; }

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

bool mlx5_lag_is_multipath(struct mlx5_core_dev *dev) { return false; }



#endif /* CONFIG_MLX5_ESWITCH */

#endif /* __MLX5_LAG_MP_H__ */