Commit 7bef147a authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

net/mlx5: Don't skip vport check 



Users of mlx5_eswitch_get_vport() are required to check return value
prior to passing mlx5_vport further. Fix all the places to do not skip
that check.

Reviewed-by: default avatarEli Cohen <elic@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 34bb9751

drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u1 
	struct mlx5_vport *vport;



	vport = mlx5_eswitch_get_vport(esw, vport_num);

	return vport->dl_port;

	return IS_ERR(vport) ? ERR_CAST(vport) : vport->dl_port;

}



int mlx5_esw_devlink_sf_port_register(struct mlx5_eswitch *esw, struct devlink_port *dl_port,

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

+6 −0
Original line number Diff line number Diff line
@@ -1141,6 +1141,8 @@ int mlx5_esw_modify_vport_rate(struct mlx5_eswitch *esw, u16 vport_num, 
	struct mlx5_vport *vport;



	vport = mlx5_eswitch_get_vport(esw, vport_num);

	if (IS_ERR(vport))

		return PTR_ERR(vport);



	if (!vport->qos.enabled)

		return -EOPNOTSUPP;
@@ -1279,6 +1281,8 @@ int mlx5_esw_vport_enable(struct mlx5_eswitch *esw, u16 vport_num, 
	int ret;



	vport = mlx5_eswitch_get_vport(esw, vport_num);

	if (IS_ERR(vport))

		return PTR_ERR(vport);



	mutex_lock(&esw->state_lock);

	WARN_ON(vport->enabled);
@@ -1326,6 +1330,8 @@ void mlx5_esw_vport_disable(struct mlx5_eswitch *esw, u16 vport_num) 
	struct mlx5_vport *vport;



	vport = mlx5_eswitch_get_vport(esw, vport_num);

	if (IS_ERR(vport))

		return;



	mutex_lock(&esw->state_lock);

	if (!vport->enabled)

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

+6 −0
Original line number Diff line number Diff line
@@ -2554,6 +2554,9 @@ static int esw_create_uplink_offloads_acl_tables(struct mlx5_eswitch *esw) 
	struct mlx5_vport *vport;



	vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_UPLINK);

	if (IS_ERR(vport))

		return PTR_ERR(vport);



	return esw_vport_create_offloads_acl_tables(esw, vport);

}
@@ -2562,6 +2565,9 @@ static void esw_destroy_uplink_offloads_acl_tables(struct mlx5_eswitch *esw) 
	struct mlx5_vport *vport;



	vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_UPLINK);

	if (IS_ERR(vport))

		return;



	esw_vport_destroy_offloads_acl_tables(esw, vport);

}