Commit 90538d23 authored by Chris Mi's avatar Chris Mi Committed by Jakub Kicinski
Browse files

net/mlx5: E-switch, Fix error handling for enabling roce 



The cited commit assumes enabling roce always succeeds. But it is
not true. Add error handling for it.

Fixes: 80f09dfc ("net/mlx5: Eswitch, enable RoCE loopback traffic")
Signed-off-by: default avatarChris Mi <cmi@nvidia.com>
Reviewed-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarMaor Gottlieb <maorg@nvidia.com>
Signed-off-by: default avatarMark Bloch <mbloch@nvidia.com>
Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Link: https://patch.msgid.link/20250423083611.324567-6-mbloch@nvidia.com


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

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

+4 −1
Original line number Diff line number Diff line
@@ -3533,7 +3533,9 @@ int esw_offloads_enable(struct mlx5_eswitch *esw) 
	int err;



	mutex_init(&esw->offloads.termtbl_mutex);

	mlx5_rdma_enable_roce(esw->dev);

	err = mlx5_rdma_enable_roce(esw->dev);

	if (err)

		goto err_roce;



	err = mlx5_esw_host_number_init(esw);

	if (err)
@@ -3594,6 +3596,7 @@ int esw_offloads_enable(struct mlx5_eswitch *esw) 
	esw_offloads_metadata_uninit(esw);

err_metadata:

	mlx5_rdma_disable_roce(esw->dev);

err_roce:

	mutex_destroy(&esw->offloads.termtbl_mutex);

	return err;

}

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

+5 −4
Original line number Diff line number Diff line
@@ -140,17 +140,17 @@ void mlx5_rdma_disable_roce(struct mlx5_core_dev *dev) 
	mlx5_nic_vport_disable_roce(dev);

}



void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev)

int mlx5_rdma_enable_roce(struct mlx5_core_dev *dev)

{

	int err;



	if (!MLX5_CAP_GEN(dev, roce))

		return;

		return 0;



	err = mlx5_nic_vport_enable_roce(dev);

	if (err) {

		mlx5_core_err(dev, "Failed to enable RoCE: %d\n", err);

		return;

		return err;

	}



	err = mlx5_rdma_add_roce_addr(dev);
@@ -165,10 +165,11 @@ void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev) 
		goto del_roce_addr;

	}



	return;

	return err;



del_roce_addr:

	mlx5_rdma_del_roce_addr(dev);

disable_roce:

	mlx5_nic_vport_disable_roce(dev);

	return err;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ 


#ifdef CONFIG_MLX5_ESWITCH



void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev);

int mlx5_rdma_enable_roce(struct mlx5_core_dev *dev);

void mlx5_rdma_disable_roce(struct mlx5_core_dev *dev);



#else /* CONFIG_MLX5_ESWITCH */



static inline void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev) {}

static inline int mlx5_rdma_enable_roce(struct mlx5_core_dev *dev) { return 0; }

static inline void mlx5_rdma_disable_roce(struct mlx5_core_dev *dev) {}



#endif /* CONFIG_MLX5_ESWITCH */