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

Commit a69f0d54 authored by Or Gerlitz's avatar Or Gerlitz Committed by Greg Kroah-Hartman
Browse files

net/mlx5: E-Switch, Re-enable RoCE on mode change only after FDB destroy 




[ Upstream commit 5bae8c031053c69b4aa74b7f1ba15d4ec8426208 ]

We must re-enable RoCE on the e-switch management port (PF) only after destroying
the FDB in its switchdev/offloaded mode. Otherwise, when encapsulation is supported,
this re-enablement will fail.

Also, it's more natural and symmetric to disable RoCE on the PF before we create
the FDB under switchdev mode, so do that as well and revert if getting into error
during the mode change later.

Fixes: 9da34cd34e85 ('net/mlx5: Disable RoCE on the e-switch management [..]')
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 22cccef1

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

+18 −11
Original line number Diff line number Diff line
@@ -651,9 +651,14 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int nvports) 
	int vport;

	int err;



	/* disable PF RoCE so missed packets don't go through RoCE steering */

	mlx5_dev_list_lock();

	mlx5_remove_dev_by_protocol(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);

	mlx5_dev_list_unlock();



	err = esw_create_offloads_fdb_table(esw, nvports);

	if (err)

		return err;

		goto create_fdb_err;



	err = esw_create_offloads_table(esw);

	if (err)
@@ -673,11 +678,6 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int nvports) 
			goto err_reps;

	}



	/* disable PF RoCE so missed packets don't go through RoCE steering */

	mlx5_dev_list_lock();

	mlx5_remove_dev_by_protocol(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);

	mlx5_dev_list_unlock();



	return 0;



err_reps:
@@ -694,6 +694,13 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int nvports) 


create_ft_err:

	esw_destroy_offloads_fdb_table(esw);



create_fdb_err:

	/* enable back PF RoCE */

	mlx5_dev_list_lock();

	mlx5_add_dev_by_protocol(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);

	mlx5_dev_list_unlock();



	return err;

}
@@ -701,11 +708,6 @@ static int esw_offloads_stop(struct mlx5_eswitch *esw) 
{

	int err, err1, num_vfs = esw->dev->priv.sriov.num_vfs;



	/* enable back PF RoCE */

	mlx5_dev_list_lock();

	mlx5_add_dev_by_protocol(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);

	mlx5_dev_list_unlock();



	mlx5_eswitch_disable_sriov(esw);

	err = mlx5_eswitch_enable_sriov(esw, num_vfs, SRIOV_LEGACY);

	if (err) {
@@ -715,6 +717,11 @@ static int esw_offloads_stop(struct mlx5_eswitch *esw) 
			esw_warn(esw->dev, "Failed setting eswitch back to offloads, err %d\n", err);

	}



	/* enable back PF RoCE */

	mlx5_dev_list_lock();

	mlx5_add_dev_by_protocol(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);

	mlx5_dev_list_unlock();



	return err;

}