Commit c85a6b8f authored by Aya Levin's avatar Aya Levin Committed by Saeed Mahameed
Browse files

net/mlx5: Block switchdev mode while devlink traps are active 



Since switchdev mode can't support  devlink traps, verify there are
no active devlink traps before moving eswitch to switchdev mode. If
there are active traps, prevent the switchdev mode configuration.

Fixes: eb3862a0 ("net/mlx5e: Enable traps according to link state")
Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 8ba3e4c8

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

+11 −3
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include "lib/fs_chains.h"

#include "en_tc.h"

#include "en/mapping.h"

#include "devlink.h"



#define mlx5_esw_for_each_rep(esw, i, rep) \

	xa_for_each(&((esw)->offloads.vport_reps), i, rep)
@@ -3001,12 +3002,19 @@ int mlx5_devlink_eswitch_mode_set(struct devlink *devlink, u16 mode, 
	if (cur_mlx5_mode == mlx5_mode)

		goto unlock;



	if (mode == DEVLINK_ESWITCH_MODE_SWITCHDEV)

	if (mode == DEVLINK_ESWITCH_MODE_SWITCHDEV) {

		if (mlx5_devlink_trap_get_num_active(esw->dev)) {

			NL_SET_ERR_MSG_MOD(extack,

					   "Can't change mode while devlink traps are active");

			err = -EOPNOTSUPP;

			goto unlock;

		}

		err = esw_offloads_start(esw, extack);

	else if (mode == DEVLINK_ESWITCH_MODE_LEGACY)

	} else if (mode == DEVLINK_ESWITCH_MODE_LEGACY) {

		err = esw_offloads_stop(esw, extack);

	else

	} else {

		err = -EINVAL;

	}



unlock:

	mlx5_esw_unlock(esw);