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

net/mlx5: Clear VF's configuration on disabling SRIOV 



When setting number of VFs to 0 (disable SRIOV), clear VF's
configuration.

Signed-off-by: default avatarAya Levin <ayal@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 32680da7

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

+12 −1
Original line number Diff line number Diff line
@@ -1831,6 +1831,15 @@ static void mlx5_eswitch_event_handlers_unregister(struct mlx5_eswitch *esw) 
	flush_workqueue(esw->work_queue);

}



static void mlx5_eswitch_clear_vf_vports_info(struct mlx5_eswitch *esw)

{

	struct mlx5_vport *vport;

	int i;



	mlx5_esw_for_each_vf_vport(esw, i, vport, esw->esw_funcs.num_vfs)

		memset(&vport->info, 0, sizeof(vport->info));

}



/* Public E-Switch API */

#define ESW_ALLOWED(esw) ((esw) && MLX5_ESWITCH_MANAGER((esw)->dev))
@@ -1923,7 +1932,7 @@ abort: 
	return err;

}



void mlx5_eswitch_disable(struct mlx5_eswitch *esw)

void mlx5_eswitch_disable(struct mlx5_eswitch *esw, bool clear_vf)

{

	int old_mode;
@@ -1952,6 +1961,8 @@ void mlx5_eswitch_disable(struct mlx5_eswitch *esw) 
		mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);

		mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_ETH);

	}

	if (clear_vf)

		mlx5_eswitch_clear_vf_vports_info(esw);

}



int mlx5_eswitch_init(struct mlx5_core_dev *dev)

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

+2 −2
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ int mlx5_esw_modify_vport_rate(struct mlx5_eswitch *esw, u16 vport_num, 
int mlx5_eswitch_init(struct mlx5_core_dev *dev);

void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw);

int mlx5_eswitch_enable(struct mlx5_eswitch *esw, int mode);

void mlx5_eswitch_disable(struct mlx5_eswitch *esw);

void mlx5_eswitch_disable(struct mlx5_eswitch *esw, bool clear_vf);

int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,

			       u16 vport, u8 mac[ETH_ALEN]);

int mlx5_eswitch_set_vport_state(struct mlx5_eswitch *esw,
@@ -603,7 +603,7 @@ void mlx5_eswitch_disable_pf_vf_vports(struct mlx5_eswitch *esw); 
static inline int  mlx5_eswitch_init(struct mlx5_core_dev *dev) { return 0; }

static inline void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw) {}

static inline int  mlx5_eswitch_enable(struct mlx5_eswitch *esw, int mode) { return 0; }

static inline void mlx5_eswitch_disable(struct mlx5_eswitch *esw) {}

static inline void mlx5_eswitch_disable(struct mlx5_eswitch *esw, bool clear_vf) {}

static inline bool mlx5_esw_lag_prereq(struct mlx5_core_dev *dev0, struct mlx5_core_dev *dev1) { return true; }

static inline bool mlx5_eswitch_is_funcs_handler(struct mlx5_core_dev *dev) { return false; }

static inline const u32 *mlx5_esw_query_functions(struct mlx5_core_dev *dev)

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

+2 −2
Original line number Diff line number Diff line
@@ -1370,7 +1370,7 @@ static int esw_offloads_start(struct mlx5_eswitch *esw, 
		return -EINVAL;

	}



	mlx5_eswitch_disable(esw);

	mlx5_eswitch_disable(esw, false);

	mlx5_eswitch_update_num_of_vfs(esw, esw->dev->priv.sriov.num_vfs);

	err = mlx5_eswitch_enable(esw, MLX5_ESWITCH_OFFLOADS);

	if (err) {
@@ -2196,7 +2196,7 @@ static int esw_offloads_stop(struct mlx5_eswitch *esw, 
{

	int err, err1;



	mlx5_eswitch_disable(esw);

	mlx5_eswitch_disable(esw, false);

	err = mlx5_eswitch_enable(esw, MLX5_ESWITCH_LEGACY);

	if (err) {

		NL_SET_ERR_MSG_MOD(extack, "Failed setting eswitch to legacy");

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

+5 −5
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ enable_vfs_hca: 
	return 0;

}



static void mlx5_device_disable_sriov(struct mlx5_core_dev *dev)

static void mlx5_device_disable_sriov(struct mlx5_core_dev *dev, bool clear_vf)

{

	struct mlx5_core_sriov *sriov = &dev->priv.sriov;

	int num_vfs = pci_num_vf(dev->pdev);
@@ -127,7 +127,7 @@ static void mlx5_device_disable_sriov(struct mlx5_core_dev *dev) 
	}



	if (MLX5_ESWITCH_MANAGER(dev))

		mlx5_eswitch_disable(dev->priv.eswitch);

		mlx5_eswitch_disable(dev->priv.eswitch, clear_vf);



	if (mlx5_wait_for_pages(dev, &dev->priv.vfs_pages))

		mlx5_core_warn(dev, "timeout reclaiming VFs pages\n");
@@ -147,7 +147,7 @@ static int mlx5_sriov_enable(struct pci_dev *pdev, int num_vfs) 
	err = pci_enable_sriov(pdev, num_vfs);

	if (err) {

		mlx5_core_warn(dev, "pci_enable_sriov failed : %d\n", err);

		mlx5_device_disable_sriov(dev);

		mlx5_device_disable_sriov(dev, true);

	}

	return err;

}
@@ -157,7 +157,7 @@ static void mlx5_sriov_disable(struct pci_dev *pdev) 
	struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);



	pci_disable_sriov(pdev);

	mlx5_device_disable_sriov(dev);

	mlx5_device_disable_sriov(dev, true);

}



int mlx5_core_sriov_configure(struct pci_dev *pdev, int num_vfs)
@@ -192,7 +192,7 @@ void mlx5_sriov_detach(struct mlx5_core_dev *dev) 
	if (!mlx5_core_is_pf(dev))

		return;



	mlx5_device_disable_sriov(dev);

	mlx5_device_disable_sriov(dev, false);

}



static u16 mlx5_get_max_vfs(struct mlx5_core_dev *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE